fix: pass correct args to RuleSet.normalizeRule (fix #1210)

vuejs · Mar 23, 2018 · 1c54dc4 · 1c54dc4
1 parent b860b24
commit 1c54dc4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -14,7 +14,7 @@ module.exports = class VueLoaderPlugin {
       // #1201 we need to skip the `include` check when locating the vue rule
       const clone = Object.assign({}, rule)
       delete clone.include
-      const normalized = RuleSet.normalizeRule(clone)
+      const normalized = RuleSet.normalizeRule(clone, {}, '')
       return !rule.enforce && normalized.resource && normalized.resource(`foo.vue`)
     })
     const vueRule = rawRules[vueRuleIndex]

diff --git a/test/edgeCases.spec.js b/test/edgeCases.spec.js
@@ -1,4 +1,5 @@
 const {
+  bundle,
   mockRender,
   mockBundleAndRun
 } = require('./utils')
@@ -58,7 +59,7 @@ test('test-less oneOf rules', done => {
 })
 
 test('babel-loader inline options', done => {
-  mockBundleAndRun({
+  bundle({
     entry: 'basic.vue',
     module: {
       rules: [
@@ -74,5 +75,23 @@ test('babel-loader inline options', done => {
         }
       ]
     }
-  }, res => assertComponent(res, done))
+  }, () => done(), true)
+})
+
+// #1210
+test('normalize multiple use + options', done => {
+  bundle({
+    entry: 'basic.vue',
+    modify: config => {
+      config.module.rules[0] = {
+        test: /\.vue$/,
+        use: [
+          {
+            loader: 'vue-loader',
+            options: {}
+          }
+        ]
+      }
+    }
+  }, () => done(), true)
 })