fix: prioritize .vue rules in plugin (fix #1246)

vuejs · Apr 24, 2018 · bffacd5 · bffacd5
1 parent 4359bf3
commit bffacd5
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -9,17 +9,23 @@ module.exports = class VueLoaderPlugin {
     // use webpack's RuleSet utility to normalize user rules
     const rawNormalizedRules = new RuleSet(rawRules).rules
 
-    // find the rule that applies to vue files
-    const vueRuleIndex = rawRules.findIndex((rule, i) => {
+    const createMatcher = fakeFile => (rule, i) => {
       // #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, {}, '')
-      return !rule.enforce && normalized.resource && (
-        normalized.resource(`foo.vue`) ||
-        normalized.resource(`foo.vue.html`)
+      return (
+        !rule.enforce &&
+        normalized.resource &&
+        normalized.resource(fakeFile)
       )
-    })
+    }
+
+    // find the rule that applies to vue files
+    let vueRuleIndex = rawRules.findIndex(createMatcher(`foo.vue`))
+    if (vueRuleIndex < 0) {
+      vueRuleIndex = rawRules.findIndex(createMatcher(`foo.vue.html`))
+    }
     const vueRule = rawRules[vueRuleIndex]
 
     if (!vueRule) {