fix: Don't crash without a rule

Related to #151.
survivejs · Nov 12, 2020 · 07e21c1 · 07e21c1
1 parent 08c88c1
commit 07e21c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -87,6 +87,10 @@ function mergeWithRules(rules: Rules) {
       let currentRule: CustomizeRule | Rules = rules;
 
       key.split(".").forEach(k => {
+        if (!currentRule) {
+          return;
+        }
+
         currentRule = currentRule[k];
       });
 

diff --git a/test/merge-with-rules.test.ts b/test/merge-with-rules.test.ts
@@ -306,9 +306,7 @@ describe("Merge with rules", function() {
           }
         ]
       },
-      plugins: [
-        { name: 'StylelintPlugin' }
-      ]
+      plugins: [{ name: "StylelintPlugin" }]
     };
     const development = {
       module: {
@@ -323,9 +321,7 @@ describe("Merge with rules", function() {
           }
         ]
       },
-      plugins: [
-        { name: "MiniCssExtractPlugin" }
-      ]
+      plugins: [{ name: "MiniCssExtractPlugin" }]
     };
     const result = {
       entry: "demo",
@@ -345,10 +341,7 @@ describe("Merge with rules", function() {
           }
         ]
       },
-      plugins: [
-        { name: "StylelintPlugin" },
-        { name: "MiniCssExtractPlugin" }
-      ]
+      plugins: [{ name: "StylelintPlugin" }, { name: "MiniCssExtractPlugin" }]
     };
 
     assert.deepStrictEqual(
@@ -485,4 +478,22 @@ describe("Merge with rules", function() {
       result
     );
   });
+
+  it("should merge without rule (#151)", function() {
+    const module = {
+      rules: {
+        test: CustomizeRule.Match,
+        use: {
+          loader: CustomizeRule.Match,
+          options: CustomizeRule.Replace
+        }
+      }
+    };
+    const _mergeWithoutRule = mergeWithRules({
+      module
+    });
+    const config = { resolve: { extensions: [".js"] } };
+
+    expect(() => _mergeWithoutRule(config, config)).not.toThrow();
+  });
 });