fix: handle rule.merge({ resolve })

neutrinojs · Jun 30, 2020 · 7287fdb · 7287fdb
1 parent 1295efa
commit 7287fdb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/Rule.js b/src/Rule.js
@@ -112,6 +112,10 @@ const Rule = Orderable(
         );
       }
 
+      if (!omit.includes('resolve') && 'resolve' in obj) {
+        this.resolve.merge(obj.resolve);
+      }
+
       if (!omit.includes('test') && 'test' in obj) {
         this.test(
           obj.test instanceof RegExp || typeof obj.test === 'function'
@@ -127,6 +131,7 @@ const Rule = Orderable(
         'use',
         'rules',
         'oneOf',
+        'resolve',
         'test',
       ]);
     }

diff --git a/test/Rule.js b/test/Rule.js
@@ -425,6 +425,29 @@ test('merge with include and exclude not of array type', () => {
   });
 });
 
+test('merge with resolve', () => {
+  const rule = new Rule();
+
+  rule.merge({
+    resolve: {
+      alias: { foo: 'bar' },
+    },
+  });
+
+  rule.merge({
+    resolve: {
+      extensions: ['.js', '.mjs'],
+    }
+  })
+
+  expect(rule.toConfig()).toStrictEqual({
+    resolve: {
+      alias: { foo: 'bar' },
+      extensions: ['.js', '.mjs'],
+    },
+  });
+});
+
 test('ordered rules', () => {
   const rule = new Rule();
   rule