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

Fix up linting errors

736f7ddec35f56f8f3dc9740fa61c33707d206b4 authored over 8 years ago by Lucretiel <[email protected]>

Add basic test for object merge

891432b7d36d7ae3e4be2f1e63775e0e152b0bac authored over 8 years ago by Lucretiel <[email protected]>

Improve package description

Closes #23.

46adeca8bacbba89c919d36cc7f4625de0ae0b5a authored over 8 years ago by Juho Vepsalainen <[email protected]>

0.14.0

39065a8c5efb5fc290ffe34e127ae030ed52e732 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

eec2183f08d570b76b9c5c02ee961345b95afdd2 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update changelog

2e8c0c2cf0a66b2ba033e660b8c5d040c9035594 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Add @mshwery to contributors

90a32b8f7ee01a2c6cc2de29c5f10f63dca1a671 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #22 from mshwery/master

Check for `include/exclude` equality for smarter merging

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

use array slice instead of Array.from

a458cc831f272fffd3188e27f7a17d472e8245de authored over 8 years ago by Matt Shwery <[email protected]>

add test case for smart merges with identical include/exclude, and make it pass

a578608f10d76e9ee11ff98aebfc4fb9dc65ed0f authored over 8 years ago by Matt Shwery <[email protected]>

add lodash.isequal to package.json

6dc8c632808d2810e659b84c768aed550316296e authored over 8 years ago by Matt Shwery <[email protected]>

Update lib

e42597a5afcf5ec90e75fa07f131a3c11a9a734c authored over 8 years ago by Juho Vepsalainen <[email protected]>

0.13.0

0a6f245cdfe4abcf42ff2c2b9dcced955ae0c1a1 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update changelog and credits

71edb8816827cd214241b3792b1cec9d6457a6f2 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #20 from blackrabbit99/master

Fix duplicating if prop include exists

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

Clean code

90cfcb29b2815b4831eee5468a7dea6bc78e12d3 authored over 8 years ago by Artem Zakharchenko <[email protected]>

Fix eslint rules

0200f9e648fcc70bf178adfe65a3408bf2b1c228 authored over 8 years ago by Artem Zakharchenko <[email protected]>

update tests

6c349169df22dcb47fc1487bf2611a0d9d526a81 authored over 8 years ago by Artem Zakharchenko <[email protected]>

fix issue with hard concatanation if prop include exist

afa5cfc3979a9218d0e78211568cc3771bba40af authored over 8 years ago by Artem Zakharchenko <[email protected]>

0.12.0

8ab97133dca88435bff0c2e454c00f31d81c3994 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

4841a4b601632fafae61284d687e7b20c737fb65 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Add @Whoaa512 to contributors

9c823810ad2956979d39fa12661bc11b4630fb53 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update changelog

02d346bb082126756704d4c4d9230c0dbcba2344 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #16 from Whoaa512/retain-include-exclude

Decouple the include/exclude from foundLoader.loaders

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

Decouple the include/exclude from foundLoader.loaders

Add test

4c08198b47c4f98759b99f8beaa1d3485984a46d authored over 8 years ago by C.J. Winslow <[email protected]>

Update lib

83cbd4c63eaf69f6361b736b919ef3dc585d9100 authored over 8 years ago by Juho Vepsalainen <[email protected]>

0.11.0

47aa00568e1f0f2ad9d64d8c1c679be4de1f1f13 authored over 8 years ago by Juho Vepsalainen <[email protected]>

Support `include/exclude` at `smart.merge` parent

Closes #15.

26b4238b3cea0aed6cb97d22d68a78cea2fda39a authored over 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

c796484cca15a36313b0fd9287fa83f506917af9 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.10.0

47c4c4637179d03f171c1f26017e4ce24a3a28be authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

178b466c2b3403b47ce6ccf3e310bc54b800db54 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update README to reflect current state

aab9d79fd6185a8e2d596dfb3fa8fedc7211b202 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #14 from siready/master

Allow smart merging loaders with loader string values and include/exclude

Closes #9.

30e4658f06a7cadcd392db523147af40cb3e964a authored almost 9 years ago by Juho Vepsäläinen <[email protected]>

Lint fix

a7694255513a960adbec333b5b13eb390bfbcbb9 authored almost 9 years ago by siready <[email protected]>

Testing new smart merging functionality

904f333e8be86844fac289da3f38748431454452 authored almost 9 years ago by siready <[email protected]>

Allow smart merging loaders with loader string values and include/exclude options

fa69f043851cba41ff3e440cbc889d3b1b86a3b0 authored almost 9 years ago by siready <[email protected]>

0.9.0

566492f1951cd2a2880dfc3bb6567f403b5f35b9 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

19690806add34e13d708c4bd3f472763f229de88 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

17934716de5d548a09a61832b594cc5b4c24716a authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Allow objects/arrays to be emptied

If you set an empty object/array, this will override possible existing
object/array. This featur...

720567d79305a4b0fdb25016accd7e63687fe6ed authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

dcf580702067e352a97a83e8a0c67f31630fdac3 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.8.4

14d974448ceba57884f9b056baa502345279fea0 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

f26ef3a15f480251248df15ca3e2352cefef16a6 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Do not mutate arrays

Closes #12.

14855a5b425460324f4963e023aa7b2b377c3978 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

2d1dd688647e267dfca7a49b737e160e4fca0a2e authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.8.3

69a47e618826a9b982a6085ea62489dfc8545ef3 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

54e6d87e151e800b02b67d5141fefcd15435886a authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Drop `files` field

For some reason this didn't match the dist file.

5be19797477c5f0d87b308b061dd13c479b199a7 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.8.2

739b6dc1a9159e6524a2893e12dbc299d2a7146e authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

1213f75c0a339e10d70ef09176556ce981172172 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

33a0384fb25632ff96f386f45a4b5f58db4f68df authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Point to index.js directly

7aeff9676922d7200954f39c3a0d625fa9ff8fe5 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

500ea24ceeabf37895d17ce9112c57675a99a6e2 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.8.1

fcdfecf502037170ab8520965d4444c087fd8e19 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

dd1269db64d7dcbbd1af1e4b383a1c879eb5645c authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Include `lib/index.js` to distribution

c67bea93817e518ac8263e0fe3e52bea2e5b0b75 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.8.0

27c63c59184e887fa5cbffcd43306f0e0c6cfec1 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

3d9d0e22c094755a0edcfa48f94fa4d583054c54 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

28b4ead87ab557290237da9ec9f875dc43e7d459 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Prepend only loaders

This way `entry` array behavior is logical. Those get evaluated from
left to right after all.

C...

94d224859b2e2ef70a0d2ce5f836e8676fbc46bf authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Improve test naming

3e47e029bd4d587b21cbfe3765348ac889e4ef92 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Set up `files`

No need to include everything into distribution version.

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

Fix readme example

Related to #10.

ac3bdb45fd76d39874b0a86bb39ad17873292cde authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

291bfd7b5ef0a71b7dab24b1ec84e5e08635d925 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

0.7.3

ec101d3f0f218aafc460ac7478daa905bbd68afe authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

8651b805c0a156f4070d71b4568887ce3f777096 authored almost 9 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #8 from GreenGremlin/master

Fixing error: "TypeError: Cannot read property 'loaders' of undefined"

af06a565b11a3ea20b214e11066e2ece12e1bfa9 authored almost 9 years ago by Juho Vepsäläinen <[email protected]>

Fixing error "TypeError: Cannot read property 'loaders' of undefined" for smart merge

302cac64ddf61f12ffe40cf571d0239ba6d0c89c authored almost 9 years ago by Jonathan Felchlin <[email protected]>

Update lib

fa01743718c7129a56479cabe4d817bbce5d681d authored about 9 years ago by Juho Vepsalainen <[email protected]>

0.7.2

220e3e052e8d0469ff12d00e1a4104bb48dd762b authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

Closes #7.

f1708c52c14fbb0cc5aa52aff9bcdece0c6ae3b0 authored about 9 years ago by Juho Vepsalainen <[email protected]>

0.7.1

f66dddc048eb0366c8975259edb5399e1c8c5ba9 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

1151ba3b1996fa49f7006398aedf7bfd65ef2b60 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

2a2f85acfe83218e02e91f320cdb2ba93f11a411 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update build

e8fd8dbd5014aea62e5f247eb39a614a98f3e024 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update build before testing on `preversion`

This way actual errors might be caught on time.

04b32ab49f511786118333eb65e5e511f0a3425a authored about 9 years ago by Juho Vepsalainen <[email protected]>

Lint code on Travis

35dea75bed07d0f3717b72f04d53be7fb92e22e6 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Make sure lib/ gets built before testing on Travis

132310ce2c7d19d69d78c732089970078c0e6419 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Add @davegomez to contributors

2f7c868ca3faeab925163e693bc642edd2669cd2 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #6 from davegomez/perf-improvement

Performance and cosmetic improvements

794ad669a1e31197a98f3a8e47db460c291b7c75 authored about 9 years ago by Juho Vepsäläinen <[email protected]>

remove the unnecessary foundLoader validation

5210478ab5849ae8afea2ce0d6bafcc3f07ed718 authored about 9 years ago by David Gomez <[email protected]>

extract function for readability and possible reuse

67656a50d4a7b9d59056b6c2b3a2a32f71fedbb2 authored about 9 years ago by David Gomez <[email protected]>

use concat instead of spread operator

The use of the new ES6 spread operator could hurt significantly the application performance, so ...

c13607c9c1ab078518d095a2415c87f444c217cd authored about 9 years ago by David Gomez <[email protected]>

Fix formatting (`` -> **)

d4103cf7aa8ba5d8a137051208d9ed8b523a2a32 authored about 9 years ago by Juho Vepsalainen <[email protected]>

0.7.0

1889a3df2305a5a721c9d1604a0d591cb58a66c4 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

7c16aeb9e5174f0e4104fedf86a8446abd5a6a8a authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

a8c21b6b53e9b3be6c28cb04888ce0bab5a63f94 authored about 9 years ago by Juho Vepsalainen <[email protected]>

smart merge - Do not merge if there is `exclude`

This could differ so it's safer to skip.

1cf231be2aee1daee4c37023217c1a1834a374ff authored about 9 years ago by Juho Vepsalainen <[email protected]>

smart merge - Do not merge if there is `include`

That could differ so it's safer just to skip it.

c3bc1c029c7d3308f4ce83ae5b7e47487f531631 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Merge arrays in reverse order

Given Webpack evaluates loader arrays from bottom to top, this is a
better convention to have. T...

88b5b30eacb49db5cd92edf299f18f71078ab3c6 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Clarify test naming

bfdb7217eb47a479937c3c4e46ad8ead69ba8ead authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

59fc6b42151ab69fee56f16682b072c0aefe845f authored about 9 years ago by Juho Vepsalainen <[email protected]>

0.6.0

91b4a6b3696a3c1e43f97943572b68260e682b21 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update changelog

c746e76932d0472a0c58f6137d4d9c432deca8b6 authored about 9 years ago by Juho Vepsalainen <[email protected]>

smart merge - Prepend `loaders` instead of appending

This way latter objects can specialize. For instance, you might have
common configuration with a...

f8da52d361510c7e4704b2d074b802b71e7a1b80 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Support merging for `preLoaders` and `postLoaders`

69853b358050ee8089b04ecf1749dc39608453d6 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update lib

b81a930a6b907c029090ca96ff206807056e1dad authored about 9 years ago by Juho Vepsalainen <[email protected]>

0.5.1

7dd2e84d57c90d4371ac27c62813dcac5d17d02d authored about 9 years ago by Juho Vepsalainen <[email protected]>

Update CHANGELOG

8711b8292ade48997efe36a249a3f682d7c13ce3 authored about 9 years ago by Juho Vepsalainen <[email protected]>

Fix recursive merging (object -> array)

Missing `bind`. Tests didn't catch that so wrote one to cover this case.

45b27680898b7fa3d9bfc1fd49f8cee3b8b3a978 authored about 9 years ago by Juho Vepsalainen <[email protected]>