Skip to content

Commit 1c54dc4

Browse files
committed
fix: pass correct args to RuleSet.normalizeRule (fix #1210)
1 parent b860b24 commit 1c54dc4

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

Diff for: lib/plugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = class VueLoaderPlugin {
1414
// #1201 we need to skip the `include` check when locating the vue rule
1515
const clone = Object.assign({}, rule)
1616
delete clone.include
17-
const normalized = RuleSet.normalizeRule(clone)
17+
const normalized = RuleSet.normalizeRule(clone, {}, '')
1818
return !rule.enforce && normalized.resource && normalized.resource(`foo.vue`)
1919
})
2020
const vueRule = rawRules[vueRuleIndex]

Diff for: test/edgeCases.spec.js

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const {
2+
bundle,
23
mockRender,
34
mockBundleAndRun
45
} = require('./utils')
@@ -58,7 +59,7 @@ test('test-less oneOf rules', done => {
5859
})
5960

6061
test('babel-loader inline options', done => {
61-
mockBundleAndRun({
62+
bundle({
6263
entry: 'basic.vue',
6364
module: {
6465
rules: [
@@ -74,5 +75,23 @@ test('babel-loader inline options', done => {
7475
}
7576
]
7677
}
77-
}, res => assertComponent(res, done))
78+
}, () => done(), true)
79+
})
80+
81+
// #1210
82+
test('normalize multiple use + options', done => {
83+
bundle({
84+
entry: 'basic.vue',
85+
modify: config => {
86+
config.module.rules[0] = {
87+
test: /\.vue$/,
88+
use: [
89+
{
90+
loader: 'vue-loader',
91+
options: {}
92+
}
93+
]
94+
}
95+
}
96+
}, () => done(), true)
7897
})

0 commit comments

Comments
 (0)