github.com/survivejs/webpack-merge commits | Ecosyste.ms: OpenCollective

feat: Expose merge through default for TypeScript

This is backwards-compatible for TypeScript users.

a28224266dd22de4604eac8bd2f1d06a62bceb51 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore(deps): bump lodash from 4.17.15 to 4.17.19

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](http...

162d1665b8dbccc5c15ce64b40c7acb36b0d0a26 authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

5.0.9

8bf5d21663416091a54f115c4174e8212737a017 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Don't crash on merge() or merge([])

9e7f6ddfb2edc918618312ced096c4c65ed2dd78 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.8

968b6df76297d2f1c33d8bb7b733fabae5ec7753 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Fix changelog versioning

d523f4ad50cd912f24fb58efa9b5fca6ee60bde0 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Add support for Node 10

Closes #138.

7bdd0362173e46afd048b8e7caec22e324997e29 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Add Jest setup

aae2c4c83ac5a2b874ce6018d848e173d4c9f978 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.7

9bc18f76eeac54131ea2cfdfc9a87d85ab549e6a authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Drop tslib dependency

Looks like there's a compile flag for this.

176076a94195bdf339a7fbcdf0a0ec72afdef135 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.6

9e5a774bbc99d28a0cd99765a60de15bab79096c authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Add tslib to dependencies

This should be eliminated.

e601b5590a97178013b51fa278c1fecfd502c8a2 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Use the correct script at prepare

8696566c2f54206920bd9d9617a949c55c3ec877 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.5

cdeab2693a2d582ddc29e2512b307c937d5e5562 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

tech: Optimize build size

58567d1cb8025bb37f704e6525d9600d3258bdfe authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.4

ea85912660f71aab8d6467b7336af89063e603de authored over 4 years ago by Juho Vepsäläinen <[email protected]>

docs: Use CommonJS imports at the examples

Closes #137.

50bf401c7f2d205721e8cfa9a03ea47cf80058ec authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.3

2528245ca6b46eefc397bd28d08887253c6ec31d authored over 4 years ago by Juho Vepsäläinen <[email protected]>

docs: Improve sectioning

bc77bca21165e272a307621ccc72b0f6f359ba42 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.2

d980f1bdff1959418f01a2127088981be9c77a01 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update changelog

67032c834b036a733fb7afc5a0f69998612a6341 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.1

a435dac967f1632281c0a8c329519add6b58b261 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update dependencies

51306d4dbe63152ee5924ce89f24ed08d595e07c authored over 4 years ago by Juho Vepsäläinen <[email protected]>

docs: Improve readme

08cc5060a9dc9ea4b3b1fa10e38f6e4895256c7b authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Add typings fields to be explicit

Technically it's not needed but it's nice to have.

63fdd2317ddd707c3e78d2919314b192f22059d1 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Add thanks

88f6b3141144c5ce03583714523536ebcd8f8ec4 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix(testing): Make sure jest emits coverage information

04fa2a0758465c0c6270603f8e3ec71b5dee679c authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update version

ee4fe4a18edd44384beefe6e9c55fc78d3abaabc authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.0-beta-1

0237d1da98cde2af543ac1e87cd3491ec7a76bb2 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

5.0.0

aa5dd010ba617a8b24154c52e27b0b582563caa9 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Drop istanbul

That's not needed anymore.

cc5a2b4950549ffa267536c182d308ccb46a5bc1 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Drop mergeStrategy from the api surface + expose helpers

This is more flexible and it feels like better composition.

Closes #61.

534351d5e7dda8f4202cb90bdf6b6a43574de41f authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Bump to Node 12 minimum (lts)

32515ba9a7e34608ae202f4d11225e82accbc9a2 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Allow implicit any

0b35c267bfefb69e728b79bd8072e213a152c5a6 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix(unique): Pick the last unique match

Closes #119.

4a2d6f7a851622480a01c328884c46930422baf0 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

breaking: Drop merge.smart and variants from the API surface

That's too tricky to support with all the special cases. Regular merge
seems to be powerful enou...

1c1c2f1e4748da74854a7eec3ab5b676f56b9835 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update readme to match the current API

4e94233f90d9d569ca29a1b1f987dffd9b52eb6e authored over 4 years ago by Juho Vepsäläinen <[email protected]>

feat(strategy): Support matching by wildcard

This is useful with entries.

Closes #99.

c0654c3a6cb9e20b2f966917a8b99d1abd042ecf authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Throw an error if a Promise based configuration is passed

It's better to wrap merging within a Promise rather than to try to
support the different possibl...

a1eb9a8cacfcaea60277f3c025371c899359dfd1 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Drop dependency on lodash

1ae401bd799ec503b285f362f57cb851b16ccd94 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Use custom mergeWith at index as well

Related to #134.

366d0be9d85cf80700e34b735b1cb08140c8b464 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Replace lodash mergeWith at join-arrays with a custom one

Related to #134.

0b818650aef686c9918fc7783fb5ce2625976161 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Replace lodash cloneDeep with clone-deep

c387c39e22673676c5376287700be4f4dd8902ae authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Drop dependency on isPlainObject

Related to #134.

d2d0639edcb12363927849ffbb1bef4f6ebb4a4f authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Drop dependency on lodash isFunction

Related to #134.

23d24a47df06ba1efb26d63af7edbc52d36e4d56 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Remove lodash differenceWith from the project

Related to #134.

fa2c71fa845cf887de6417d64f7ccdc7a265457e authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Extract mergeWithCustomize and drop mergeMultiple

It's better to separate mergeWithCustomize as that's better for typing.
Now normal merge uses th...

8e07c42c961c1984242768959855325dc11372ec authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Fix the third batch of tests

168ba94c0203960cabc066d3f34a195c0e0d27d0 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Fix the second batch of tests

965179e796cc19d6f15b36e091786741042875cc authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix(unique): Check only against named entries

Closes #125.

a4dbf3d7de8ff9e3d0c8c9b1df72ed35c10d55a8 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Fix the first batch of tests

8817b11c7ecfd64249febc35e64bd5c422471b69 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Drop linting

Looks like that's broken in tsdx.

b00dbb75a0d58391e6db78ee39955b66c770a85b authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Remove redundant configuration files

27ff41c897bcba1b1c8bdf2eab26b2226044e037 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

docs: Update changelog

d9efc467bd2c0f8c7377d74b2ce28f59944cc9ad authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Initial pass at porting to TypeScript via tsdx

4b7e146ad0fa5317542ca892d96e65bab7b5882b authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Disable the broken test for now

a2683051ba0a59ca838e3ca7b2f96cc6fc93338e authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Drop npm-watch

It's not needed with Jest anymore as it's compiling everything anyhow.

cbf076a25868166d74fffaf46a1365c69fee161f authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Improve documentation

86872405bb097ce1a55c75f17965cc251451989d authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Make the test fail correctly

Looks like there's mutation that should go away.

4c43d9529e56afe039381250319b34dad6b3250a authored over 4 years ago by Juho Vepsäläinen <[email protected]>

fix: Move the test to the right place

1abd37e924a19cfd3dd9d70272a7d1c924b6cea7 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Set up a test

20d69297cbf254987ea9eb0220e22debf3ad4f5b authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update webpack

d4e2caded241d2e00d76ff9934e5ffdfc991b7de authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update copy-webpack-plugin

cce461cf63d2d9beda6827c0420bb1011fa2c062 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update Babel dependencies

6e093998aa9dc534851c529f82974c432d23e837 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Drop mocha

47df1cc059bcf9f379191a59e3691b0e6699bd3c authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Fix Babel setup

4af76df48b6aa496e313dbb20d85d3b422af9b65 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Rewrite tests to import/export form

7695177b32a6de38cba9ff0d023a9fc3b3aee499 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

refactor: Sketch out jest based testing

efea533d9898009a7aca92e80ea0b10c9345c05a authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update npm-watch

305eeb331720bd9d19923ce5b2b2ed3d3ec00270 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update eslint

5d084b86c975a7001e2863f77bd5789a552a6d0e authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Update babel-plugin-lodash

b7b3d8ff612b90ebe67f99744047443adaec5645 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Set up husky

c5050af155467487c266ef6ac9cb7c803d8c586b authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Simplify linting setup

4fbf1ef7058a8ff8dab3165f5764b56b78fc299d authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Set up prettier

f74508812c7742a6a33c073cdad0c118f5a86ea2 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore: Rename test:lint to lint

It's clearer this way.

deffb833cb076ba422c48d683da44e2b43653910 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #133 from survivejs/dependabot/npm_and_yarn/brace-expansion-1.1.11

chore(deps): bump brace-expansion from 1.1.6 to 1.1.11

966ff4b30bfa7da151a88ab8240079e4945e31af authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #132 from survivejs/dependabot/npm_and_yarn/atob-2.1.2

chore(deps): bump atob from 2.0.3 to 2.1.2

3a83f2972e623cb4c79908ea61da21d2f95a2cf9 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore(deps): bump brace-expansion from 1.1.6 to 1.1.11

Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.6 to 1.1.11.
-...

0a7190214613fd8908751c921277014a1ee83a41 authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump atob from 2.0.3 to 2.1.2

Bumps [atob](https://github.com/coolaj86/node-browser-compat) from 2.0.3 to 2.1.2.
- [Release no...

89ff629089711684b02c5b20c4b4b7bb0bc5a0c3 authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Merge pull request #131 from survivejs/dependabot/npm_and_yarn/mixin-deep-1.3.2

chore(deps): bump mixin-deep from 1.3.1 to 1.3.2

1f9c3108fddab1cdfc9bdb1ffbc4b8b2fb4fc32e authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #130 from survivejs/dependabot/npm_and_yarn/js-yaml-3.14.0

chore(deps): bump js-yaml from 3.7.0 to 3.14.0

c909eafce2b2d456e7e6b629c80bbbd4471c6ca1 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #129 from survivejs/dependabot/npm_and_yarn/eslint-4.18.2

chore(deps-dev): bump eslint from 3.19.0 to 4.18.2

329d069be47614835da79bd1b54b70aebbc8596a authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #120 from opencollective/opencollective

Activating Open Collective

62db68a855029139209f512711edf960ed94f2c9 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

chore(deps): bump mixin-deep from 1.3.1 to 1.3.2

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release ...

10f72426cb9b22f7b43106200d5b2f4ce1cb061e authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps): bump js-yaml from 3.7.0 to 3.14.0

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.7.0 to 3.14.0.
- [Release notes](https...

08f8accd9894d4958c86027cefd37507ff205c12 authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

chore(deps-dev): bump eslint from 3.19.0 to 4.18.2

Bumps [eslint](https://github.com/eslint/eslint) from 3.19.0 to 4.18.2.
- [Release notes](https:...

1dd9cd51ab7ad9940c0a3741b12ca407f75a7aaa authored over 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Merge pull request #122 from chinesedfan/patch-1

docs: add how `merge.smart` matches same loaders

02e467859063809a1dd16e5d8ba77a62e0eca619 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Merge pull request #123 from survivejs/dependabot/npm_and_yarn/handlebars-4.5.3

Bump handlebars from 4.0.6 to 4.5.3

dbf76e0982db11f348d987879ad29e54e92745b4 authored over 4 years ago by Juho Vepsäläinen <[email protected]>

Bump handlebars from 4.0.6 to 4.5.3

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.6 to 4.5.3.
- [Release note...

6ce1e5d96fbb86444a76d9dfbb8710484926a7e6 authored almost 5 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

docs: add how `merge.smart` matches same loaders

7a54239a353dad4f171d026644ee10c0ed7d39f7 authored about 5 years ago by Xianming Zhong <[email protected]>

Added financial contributors to the README

b7ff6f9613de88bd746327ae33f4eb31ef496bb2 authored about 5 years ago by Jess <[email protected]>

Create FUNDING.yml

b9d1c67fe7e9b317a064004526838d4405ad94f9 authored about 5 years ago by Juho Vepsäläinen <[email protected]>

4.2.2

d35e17631df137b033cd2c48e6193a53829a176d authored over 5 years ago by Juho Vepsalainen <[email protected]>

Update lib

a53214dbc9374cb988fbeb6e1152a19c8c050198 authored over 5 years ago by Juho Vepsalainen <[email protected]>

chore: Update changelog

ec3556728e5bc2704fd6608b4e1103497f85cdcf authored over 5 years ago by Juho Vepsalainen <[email protected]>

chore(merge): Update lodash to avoid npm audit warning

Closes #116.

a56d5cb15efda95e589ea204da87399905afcff6 authored over 5 years ago by Juho Vepsalainen <[email protected]>

docs(merge): Improve merge.unique docs

Closes #103.

ef4c0675f5763a4ba24ddbe102d8c42c2b64542a authored over 5 years ago by Juho Vepsalainen <[email protected]>

docs(readme): Add a note about precedence

Closes #115.

ad2f92af54fab16e5a5fd0cc0e522eca4824c77a authored over 5 years ago by Juho Vepsalainen <[email protected]>

chore: Add @desfero to contributors

c3a515687844ab97a416efebb2bdeadc802b0668 authored almost 6 years ago by Juho Vepsalainen <[email protected]>

4.2.1

30a328c36722b844b863f60e0ec755e539822721 authored almost 6 years ago by Juho Vepsalainen <[email protected]>