webpack-merge - npm Package Compare versions

Comparing version 0.12.0 to 0.13.0

CHANGELOG.md

@@ -0,5 +1,10 @@
+0.13.0 / 2016-05-24
+===================
+
+  * Bug fix: Allow `merge.smart` to merge configuration if `include` is defined. Thanks to @blackrabbit99. #20.
+
 0.12.0 / 2016-04-19
 ===================
 
-  * Feature: Support `include/exclude` at `smart.merge` for `loader` definition too. Thanks to @Whoaa512. #16.
+  * Feature: Support `include/exclude` at `merge.smart` for `loader` definition too. Thanks to @Whoaa512. #16.
 
@@ -9,3 +14,3 @@ 0.11.0 / 2016-04-18
 
-  * Feature: Support `include/exclude` at `smart.merge` when its set only in a parent. #15.
+  * Feature: Support `include/exclude` at `merge.smart` when its set only in a parent. #15.
 
@@ -15,3 +20,3 @@ 0.10.0 / 2016-04-10
 
-  * Feature: Support `include/exclude` at `smart.merge`. Thanks to @siready. #14.
+  * Feature: Support `include/exclude` at `merge.smart`. Thanks to @siready. #14.
 
@@ -18,0 +23,0 @@ 0.9.0 / 2016-04-08

package.json

@@ -5,3 +5,3 @@ {
   "author": "Juho Vepsalainen <[e-mail]>",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "scripts": {
@@ -8,0 +8,0 @@ "build": "babel src -d lib",

README.md

@@ -222,2 +222,3 @@ [![build status](https://secure.travis-ci.org/survivejs/webpack-merge.png)](http://travis-ci.org/survivejs/webpack-merge)
 * [C.J. Winslow](https://github.com/Whoaa512) - Make `merge.smart` `include/exclude` to work correctly with `loader`.
+* [Artem Zakharchenko](https://github.com/blackrabbit99) - Fix `merge.smart` duplication so that if `include` exists, it will merge.
 
@@ -224,0 +225,0 @@ ## License

test.js

@@ -291,2 +291,23 @@ /* eslint-env mocha */
 
+  it('should override loaders with props include ' + loadersKey, function () {
+    const a = {};
+    a[loadersKey] = [{
+      test: /\.js$/,
+      loaders: ['a'],
+      include: './path'
+    }];
+    const b = {};
+    b[loadersKey] = [{
+      test: /\.js$/,
+      loaders: ['a', 'b']
+    }];
+    const result = {};
+    result[loadersKey] = [{
+      test: /\.js$/,
+      loaders: ['a', 'b'],
+      include: './path'
+    }];
+    assert.deepEqual(merge(a, b), result);
+  });
+
   it('should override query options for the same loader with ' + loadersKey, function () {
@@ -293,0 +314,0 @@ const a = {};

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

32603

increased by2.38%

Lines of code

893

increased by2.29%

Number of lines in readme file

227

increased by0.44%

No dependency changes