diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-12-10 21:51:33 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-12-10 21:51:33 +0100 |
| commit | 0469abd4a9c9270a1fdc962969e36e63699af8b4 (patch) | |
| tree | f9864d4a4148621378958794cbbfdc2393733283 /node_modules/webpack-merge | |
| parent | 6947e79bbc258f7bc96af424ddb71a511f0c15a3 (diff) | |
| download | wallet-core-0469abd4a9c9270a1fdc962969e36e63699af8b4.tar.xz | |
upgrade dependencies
Diffstat (limited to 'node_modules/webpack-merge')
| -rw-r--r-- | node_modules/webpack-merge/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | node_modules/webpack-merge/README.md | 29 | ||||
| -rw-r--r-- | node_modules/webpack-merge/package.json | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/node_modules/webpack-merge/CHANGELOG.md b/node_modules/webpack-merge/CHANGELOG.md index 2f9060f62..3050cc3bb 100644 --- a/node_modules/webpack-merge/CHANGELOG.md +++ b/node_modules/webpack-merge/CHANGELOG.md @@ -1,3 +1,8 @@ +4.1.1 / 2017-11-01 +================== + + * Docs - Add `customizeArray` and `customizeObject` examples. #93 + 4.1.0 / 2017-03-16 ================== diff --git a/node_modules/webpack-merge/README.md b/node_modules/webpack-merge/README.md index 4aaa7da1f..af4fbb180 100644 --- a/node_modules/webpack-merge/README.md +++ b/node_modules/webpack-merge/README.md @@ -51,6 +51,35 @@ var output = merge( } )(object1, object2, object3, ...); ``` +For example, if the previous code was invoked with only `object1` and `object2` +with `object1` as: +``` +{ + foo1: ['object1'], + foo2: ['object1'], + bar1: { object1: {} }, + bar2: { object1: {} }, +} +``` +and `object2` as: +``` +{ + foo1: ['object2'], + foo2: ['object2'], + bar1: { object2: {} }, + bar2: { object2: {} }, +} +``` +then `customizeArray` will be invoked for each property of `Array` type, i.e: +``` +customizeArray(['object1'], ['object2'], 'foo1'); +customizeArray(['object1'], ['object2'], 'foo2'); +``` +and `customizeObject` will be invoked for each property of `Object` type, i.e: +``` +customizeObject({ object1: {} }, { object2: {} }, bar1); +customizeObject({ object1: {} }, { object2: {} }, bar2); +``` ### **`merge.unique(<field>, <fields>, field => field)`** diff --git a/node_modules/webpack-merge/package.json b/node_modules/webpack-merge/package.json index 7916a8c5f..2a6545e18 100644 --- a/node_modules/webpack-merge/package.json +++ b/node_modules/webpack-merge/package.json @@ -2,7 +2,7 @@ "name": "webpack-merge", "description": "Variant of merge that's useful for webpack configuration", "author": "Juho Vepsalainen <bebraw@gmail.com>", - "version": "4.1.0", + "version": "4.1.1", "scripts": { "build": "babel src -d lib", "watch": "npm-watch", |