File tree 1 file changed +12
-6
lines changed
1 file changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -9,17 +9,23 @@ module.exports = class VueLoaderPlugin {
9
9
// use webpack's RuleSet utility to normalize user rules
10
10
const rawNormalizedRules = new RuleSet ( rawRules ) . rules
11
11
12
- // find the rule that applies to vue files
13
- const vueRuleIndex = rawRules . findIndex ( ( rule , i ) => {
12
+ const createMatcher = fakeFile => ( rule , i ) => {
14
13
// #1201 we need to skip the `include` check when locating the vue rule
15
14
const clone = Object . assign ( { } , rule )
16
15
delete clone . include
17
16
const normalized = RuleSet . normalizeRule ( clone , { } , '' )
18
- return ! rule . enforce && normalized . resource && (
19
- normalized . resource ( `foo.vue` ) ||
20
- normalized . resource ( `foo.vue.html` )
17
+ return (
18
+ ! rule . enforce &&
19
+ normalized . resource &&
20
+ normalized . resource ( fakeFile )
21
21
)
22
- } )
22
+ }
23
+
24
+ // find the rule that applies to vue files
25
+ let vueRuleIndex = rawRules . findIndex ( createMatcher ( `foo.vue` ) )
26
+ if ( vueRuleIndex < 0 ) {
27
+ vueRuleIndex = rawRules . findIndex ( createMatcher ( `foo.vue.html` ) )
28
+ }
23
29
const vueRule = rawRules [ vueRuleIndex ]
24
30
25
31
if ( ! vueRule ) {
You can’t perform that action at this time.
0 commit comments