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

docs: Update version

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

chore: Drop unused import

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

4.2.0

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

Update lib

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

docs: Update changelog

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

fix(merge): Clone arrays correctly if only one exists

Closes #106.

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

Merge pull request #111 from desfero/master

Add support for `oneOf`

320ff68d3ea8cad2c649d46cf1131e1153eb98ab authored almost 6 years ago by Juho Vepsäläinen <[email protected]>

Add support for oneOf

49a6d5504d32cdae7b56279a36233e0099e452e4 authored almost 6 years ago by Paweł Lula <[email protected]>

4.1.5

2c98a8d437b8a08516609837d21231f3ddf65769 authored about 6 years ago by Juho Vepsalainen <[email protected]>

Update lib

a4b75fe899160f091ffd16dfb1d4644f7881d0e6 authored about 6 years ago by Juho Vepsalainen <[email protected]>

chore: Add @adrienharnay to contributors

ea4d003faab47b50e69922b1641ae801fcdfcd90 authored about 6 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #108 from adrienharnay/patch-1

Update README to comply to new Webpack API

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

Update README to comply to new Webpack API

module.loaders has been renamed to module.rules

e2d85c2c377af4d629dd14ddb77ddf1698dcc789 authored about 6 years ago by Adrien HARNAY <[email protected]>

Merge pull request #105 from escapedcat/patch-1

chore(docs): add build info #104

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

chore(docs): add build info #104

https://github.com/survivejs/webpack-merge/issues/104

661ecb2a9718cee0a21720b76d08f78bb022e9be authored over 6 years ago by hannes <[email protected]>

4.1.4

91c9ab55dda4cc642b127c2441c589ef8dac34c8 authored over 6 years ago by Juho Vepsalainen <[email protected]>

Update lib

271703474ea0a0a8d0025a746053f85573e57d99 authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore(docs): Add changelog for 4.1.4

34e7546a5fa85cf11681547a01e9856ba86a6f96 authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore: Add @DanielRuf to contributors

073c16ff40406e84beb323374fdb4e229738ce4d authored over 6 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #102 from DanielRuf/chore/remove-bithound

chore: remove bitHound

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

chore: remove bitHound

a60a9209d87c1770026193152c17ad51e8972604 authored over 6 years ago by Daniel Ruf <[email protected]>

4.1.3

3b9d9a7bf7c437a0a7232b74b0abd5295f18f07b authored over 6 years ago by Juho Vepsalainen <[email protected]>

Update lib

9cb3e6acfb95344f1119ffc60570165997d9e892 authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore: Fix typo

37e3fa22b84512e8916bd0308b5b736549fc00e1 authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore: Update Travis

ef3ae5fc7f89a98b81862b748d17e25b8ca72be1 authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore: Update contributors

6e2bf521512afc1ffe95128c321e6bb57dd2e4ac authored over 6 years ago by Juho Vepsalainen <[email protected]>

chore: Update changelog

c7900e78c6bfe90a47a0daf1ed47c6c643ce50ae authored over 6 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #101 from Amy-Lynn/fix/loader

fix: smart merge should maintain existing loader order

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

fix: smart merge should maintain existing loader order

In a situation where loader order is specified in a
previous config, one of those loaders being ...

7d6a0387225dd4f3db4b235ab426b7eec6b71fe3 authored over 6 years ago by Amy Lynn <[email protected]>

Update lib

8867fcfd1790cafc430963d697c559b4bdf3936b authored almost 7 years ago by Juho Vepsalainen <[email protected]>

4.1.2

26b6de50aec5288834e8696652f021b1a984125f authored almost 7 years ago by Juho Vepsalainen <[email protected]>

chore: Add package lock

267f89df6fa31fe75f01d9c48624bbcdc94db3cf authored almost 7 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #98 from flaviorocks/master

Updated lodash.

Fixes #97.

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

Updated lodash.

08c8184bf92055b006945c3cfbe1823337846d5c authored almost 7 years ago by Flavio Moreira <[email protected]>

4.1.1

2090a41f37d03792aed3b5109cdc87a4b6ab1bd2 authored about 7 years ago by Juho Vepsalainen <[email protected]>

Update lib

232387974d1a75d3b8559010c91722af4d7028c6 authored about 7 years ago by Juho Vepsalainen <[email protected]>

chore: Update changelog

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

chore: Add @ahmehri to contributors

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

Merge pull request #93 from ahmehri/patch0

Add examples for customizeArray and customizeObject

6a21efabc36b36d3db3060f4c964cce487d4fea4 authored about 7 years ago by Juho Vepsäläinen <[email protected]>

Add examples for customizeArray and customizeObject

114ef438b7eb03954571941936216cb202da8f2b authored about 7 years ago by elmehri <[email protected]>

4.1.0

d9559b9d28deecd1d7887aeef67a41180b66eb78 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

ca835a73ac4fed8e102f9416489b6fb488fbfac1 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore: Add @herecydev to contributors

5ad8c5f2145eb465cc39ac653262bce65459bdfd authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore: Update changelog

5b643d538732a2f0bac4596e67c60302b18c9e55 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #74 from herecydev/master

Added merge multiple that outputs an array

6bf19b6eb376774beb8ff70a392a956eb7455da6 authored almost 8 years ago by Juho Vepsäläinen <[email protected]>

Added multiple merging to readme

9e21275c65b3c457f190d9cf45facb79c6c5351d authored almost 8 years ago by herecydev <[email protected]>

Formatting fixes

8b9d376d7d5bf816c461918c090fda49fab96d39 authored almost 8 years ago by herecydev <[email protected]>

Added more tests to cover upsert

f62d69f484573323efa23c9ba4acaa7db54e34f0 authored almost 8 years ago by herecydev <[email protected]>

Added merge multiple that outputs an array

237117cd8d91a98f2a5bf1bc30a5afdf50cea6ec authored almost 8 years ago by herecydev <[email protected]>

4.0.0

c3cd11da2d440b1a3f8c9bb6d4732259e65a09a6 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

da293a85b2eaf7e778c0106e902e894f9f5d7a85 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Update changelog

e17dfd1a90f3722302d9702d103b1bd5c539809d authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Fix a typo

b1d5906d010f5c349749c350f2c0dc556e1ece75 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #70 from aaronjensen/cannot-change-order

Cannot prepend loader with merge.smart

1a859ece31fbe1d80ad4096756275c474f020113 authored almost 8 years ago by Juho Vepsäläinen <[email protected]>

Respect order of new entries with merge.smart

b8e1515f318f9c1e7a57407b2f6042a1f42bcfc7 authored almost 8 years ago by Aaron Jensen <[email protected]>

3.0.0

9443326dbcaa78032ce80c83c1b01b3b0737c34a authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

e21d1e01b4e593b03f2b20de8b27493ecf2ff892 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Update changelog

480d95d51db57b9e00d40173372bb8ad9f673122 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #69 from survivejs/fix-68

Closes #68.

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

fix - Fix #68

This changes smart merge to be more conservative in certain cases
(child is missing `include`/`e...

bb521ef2b657b76a42df03ea1c56151bb789fd34 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.6.1

bf05faeea704d7b5fb86a656c1af07efeac895a3 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

725b1c463f7b70db0c018256666bc10dcd189cb5 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

fix - `merge.smart` should not merge rules that have differing `enforce` fields

Closes #65.

814a219b9d61bdac896f3d4f1d77524d1daf17ab authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

964a7791cf65a938f32e7b253ccc2fb750d92ae7 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.6.0

362278f353bca3c1b23596d7e63a7156aa9ca93d authored almost 8 years ago by Juho Vepsalainen <[email protected]>

fix - Support `replace` mode for `merge.smartStrategy`

Closes #63.

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

2.5.0

cf7a35e7534aaf0cffa4a87cfbb44d444e63dfad authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

22ab1a1465848bc47b195233c86747f7236ba315 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

fix - Make sure `merge.smartStrategy` works with higher level nesting

Closes #64.

97588185dff2eb143c79aa8c55985877469814ba authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Clean up readme headers

b228b1f738e0554b0b106778e6a5060cbfed03d9 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.4.0

87d33d95612b60850decf6cb03da722c66130e21 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

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

fix(unique) - Drop `includes`

That doesn't work with old Node.

7b50e2b9e5ed9aeff4ef292998ae67dea7c08cbb authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update changelog

c0f3b73ffa8e7ab0eafbb918bd451d852ed4c263 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Add `merge.unique` helper

Closes #58.

13d364774ba2a19792fe8abbc1926d9077232a6e authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Simplify linting setup

3e0f8630b19cc7152b586f7bdfb132d60c457fa6 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

fix - let -> var

Node 4 crashes with let.

661678f16dc649cf55fe0aa208d816f67eb854b0 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Fix example

df47d4790b5535ed0e1cef2f3c932b672cdcbb19 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

test - Add plugin customization test

This could be better, but good enough for now.

4f9405bb57a645d0eaf67d8525b660d172cce495 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Test that keys get passed to customizers

4972585123d32fce38e47277b782d062cd969dc3 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Make sure readme example doesn't mutate

d43b6144065f872915f44b5d2cceb80592231674 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Add @sapegin to contributors

c0864c30e7352c03ba472ea00d376532283aa303 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Merge pull request #60 from sapegin/patch-1

Tweak customizeArray/customizeObject example

25404717402de9dbe12c941b6433400a430cf203 authored almost 8 years ago by Juho Vepsäläinen <[email protected]>

Tweak customizeArray/customizeObject example

5894be009c1a1f73006a65577c0af1754e100a3f authored almost 8 years ago by Artem Sapegin <[email protected]>

Drop a redundant file

79482fad13fba61caacaede3520aee004750c760 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

chore - Drop unnecessary breaks

1f5a035945f47e13507a98401fe95f6ae93f9e2c authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update dependencies

bfb3a1885fa487324f396e93085c7dfd466d396b authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Set up code coverage checking

54cf90483807100121ce89f8af73c11597819337 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.3.1

65d40058dba35bc2e73fa1c8032479d58e3940a0 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

55bfb071f7a784904b52ec3fc4830c43e5e0b51b authored almost 8 years ago by Juho Vepsalainen <[email protected]>

fix - Clear up `CopyWebpackPlugin` handling

Closes #56.

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

2.3.0

2d10253216a8e02035c4195a09988f457ac63746 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

5910cdd073c8881ea96912803b6e1dadbd0284db authored almost 8 years ago by Juho Vepsalainen <[email protected]>

refactor - Depend only on lodash

Depending directly on lodash packages isn't supported by lodash anymore.

Closes #52.

6708f3b626e15fc6eada46066819a7e87d705083 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.2.0

f05d86c820167b43dd563c88d7384063490d5448 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

f8d32f0e209d322321e1a4acc66b646c20bdc215 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update changelog

13c83f8f9b8e0263cb98582846f795d71631ac83 authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Revert "Improve plugin merging, add tests"

This reverts commit 4b7a0d7232d88e2e7a9b007dc37a9a2d8eccc8d7.

c22122bf841f573de2e0f437d1b9b07a25246fde authored almost 8 years ago by Juho Vepsalainen <[email protected]>

2.1.1

70303d2f8df5d96a3f4bfd1e2b8dc91f6178552e authored almost 8 years ago by Juho Vepsalainen <[email protected]>

Update lib

59912fe9f1848941b6aa0347be8d1ceebc37a4de authored almost 8 years ago by Juho Vepsalainen <[email protected]>