webpack-merge - npm Package Compare versions

Comparing version 0.15.0 to 0.16.0

CHANGELOG.md

@@ -0,5 +1,10 @@
+0.16.0 / 2016-11-14
+===================
+
+  * Feature: Add support for webpack 2 at `merge.smart`. It should pick up `module.rules` as you might expect now. #35
+
 0.15.0 / 2016-10-18
 ===================
 
-  * Breaking - Rework `merge.smart` so that it **appends** loaders instead of **prepending** them. This is the logical thing to do as it allows you to specify behavior better as you `merge`. #32
+  * Breaking: Rework `merge.smart` so that it **appends** loaders instead of **prepending** them. This is the logical thing to do as it allows you to specify behavior better as you `merge`. #32
 
@@ -6,0 +11,0 @@ 0.14.1 / 2016-07-25

lib/index.js

@@ -72,2 +72,9 @@ 'use strict';
 
+    // webpack 2 support
+    if (foundLoader.rules) {
+      var newRules = loaderConfig.loader ? [loaderConfig.loader] : loaderConfig.rules || [];
+
+      foundLoader.rules = mergeLoaders(newRules, foundLoader.rules);
+    }
+
     if (loaderConfig.include) {
@@ -130,3 +137,3 @@ foundLoader.include = loaderConfig.include;
 function isLoader(key) {
-  return ['preLoaders', 'loaders', 'postLoaders'].indexOf(key) >= 0;
+  return ['preLoaders', 'loaders', 'postLoaders', 'rules'].indexOf(key) >= 0;
 }

package.json

@@ -5,9 +5,8 @@ {
   "author": "Juho Vepsalainen <[e-mail]>",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "scripts": {
     "build": "babel src -d lib",
-    "watch": "babel src --watch -d lib",
+    "watch": "npm-watch",
     "test": "mocha ./test",
     "test:lint": "eslint . ---cache",
-    "watch:test": "mocha ./test --watch",
     "preversion": "npm run test:lint && npm run build && npm test && git commit --allow-empty -am \"Update lib\""
@@ -28,3 +27,4 @@ },
     "git-prepush-hook": "^1.0.1",
-    "mocha": "^2.2.5"
+    "mocha": "^2.2.5",
+    "npm-watch": "^0.1.6"
   },
@@ -48,3 +48,21 @@ "repository": {
     "test"
-  ]
+  ],
+  "watch": {
+    "build": {
+      "patterns": [
+        "src/**/*.js"
+      ]
+    },
+    "test": {
+      "patterns": [
+        "test.js"
+      ]
+    },
+    "test:lint": {
+      "patterns": [
+        "src/**/*.js",
+        "test.js"
+      ]
+    }
+  }
 }

README.md

@@ -77,4 +77,6 @@ [![build status](https://secure.travis-ci.org/survivejs/webpack-merge.svg)](http://travis-ci.org/survivejs/webpack-merge)
 
-Note that you can override existing arrays/objects like this:
+### Empty Arrays and Objects Override
 
+You can override existing arrays/objects like this:
+
 ```javascript
@@ -98,2 +100,4 @@ var common = {
 
+Note that the logic picks up webpack 2 `rules` kind of syntax as well. The examples below have been written in webpack 1 syntax.
+
 **Loader string values `loader: 'babel'` override each other.**
@@ -217,2 +221,9 @@
 
+## Development
+
+1. `npm i`
+2. `npm run watch`
+
+Before contributing, please open an issue where to discuss.
+
 ## Contributors
@@ -219,0 +230,0 @@

src/index.js

@@ -64,2 +64,9 @@ const isArray = Array.isArray;
 
+    // webpack 2 support
+    if (foundLoader.rules) {
+      const newRules = loaderConfig.loader ? [loaderConfig.loader] : loaderConfig.rules || [];
+
+      foundLoader.rules = mergeLoaders(newRules, foundLoader.rules);
+    }
+
     if (loaderConfig.include) {
@@ -126,3 +133,3 @@ foundLoader.include = loaderConfig.include;
 function isLoader(key) {
-  return ['preLoaders', 'loaders', 'postLoaders'].indexOf(key) >= 0;
+  return ['preLoaders', 'loaders', 'postLoaders', 'rules'].indexOf(key) >= 0;
 }

test.js

@@ -11,2 +11,3 @@ /* eslint-env mocha */
   normalMergeTests(merge, 'postLoaders');
+  normalMergeTests(merge, 'rules');
   mergeTests(merge);
@@ -22,2 +23,3 @@ });
   smartMergeTests(merge, 'postLoaders');
+  smartMergeTests(merge, 'rules');
   mergeTests(merge);
@@ -24,0 +26,0 @@ });

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

39375

increased by3.11%

Lines of code

1042

increased by1.17%

Number of lines in readme file

242

increased by4.76%

Worsened metrics

Dev dependency count

7

increased by16.67%

No dependency changes