Merge pull request #111 from desfero/master

Add support for `oneOf`
survivejs · Jan 4, 2019 · 320ff68 · 320ff68
2 parents 2c98a8d + 49a6d55
commit 320ff68
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/src/join-arrays-smart.js b/src/join-arrays-smart.js
@@ -1,5 +1,5 @@
 import {
-  isEqual, mergeWith, differenceWith
+  isEqual, mergeWith, differenceWith, unionWith
 } from 'lodash';
 
 const isArray = Array.isArray;
@@ -19,17 +19,32 @@ function uniteRules(rules, key, newRule, rule) {
     return false;
   }
 
-  // newRule.loader should always override
+  // apply the same logic for oneOf
+  if (rule.oneOf && newRule.oneOf) {
+    rule.oneOf = unionWith(rule.oneOf, newRule.oneOf, uniteRules.bind(null, {}, 'oneOf'));
+
+    return true;
+  }
+
+  // newRule.loader should always override use, loaders and oneOf
   if (newRule.loader) {
     const optionsKey = newRule.options ? 'options' : newRule.query && 'query';
 
     delete rule.use;
     delete rule.loaders;
+    delete rule.oneOf;
+
     rule.loader = newRule.loader;
 
     if (optionsKey) {
       rule[optionsKey] = newRule[optionsKey];
     }
+  } else if (newRule.oneOf) {
+    delete rule.use;
+    delete rule.loaders;
+    delete rule.loader;
+
+    rule.oneOf = newRule.oneOf;
   } else if ((rule.use || rule.loaders || rule.loader) && (newRule.use || newRule.loaders)) {
     const expandEntry = loader => (
       typeof loader === 'string' ? { loader } : loader

diff --git a/tests/merge-smart-tests.js b/tests/merge-smart-tests.js
@@ -927,6 +927,64 @@ function mergeSmartTest(merge, loadersKey) {
 
     assert.deepEqual(merge(common, extractText), result);
   });
+
+  it('should merge oneOf rules for ' + loadersKey, function () {
+    const a = {
+      [loadersKey]: [{
+        oneOf: [
+          {
+            test: /\.js$/,
+            loader: 'a'
+          }
+        ]
+      }]
+    };
+
+    const result = {
+      [loadersKey]: [{
+        oneOf: [
+          {
+            test: /\.js$/,
+            loader: 'b'
+          },
+          {
+            test: /\.css$/,
+            loader: 'b'
+          }
+        ]
+      }]
+    };
+
+    assert.deepEqual(merge(a, result), result);
+  });
+
+  it('should overwrite with oneOf for ' + loadersKey, function () {
+    const a = {
+      [loadersKey]: [
+        {
+          test: /\.js$/,
+          loader: 'a'
+        }
+      ]
+    };
+    const b = {
+      [loadersKey]: [{
+        test: /\.js$/,
+        oneOf: [
+          {
+            resourceQuery: /inline/, // foo.css?inline
+            use: 'url-loader'
+          },
+          {
+            resourceQuery: /external/, // foo.css?external
+            use: 'file-loader'
+          }
+        ]
+      }]
+    };
+
+    assert.deepEqual(merge(a, b), b);
+  });
 }
 
 module.exports = mergeSmartTests;