Skip to content

Commit 860b660

Browse files
committed
feat: v15 support experimental inline match resource
1 parent a9ccf7e commit 860b660

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

test/advanced.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ test('expose file basename as __file in production when exposeFilename enabled',
8787
)
8888
})
8989

90-
9190
test('extract CSS', done => {
9291
bundle({
9392
entry: 'extract-css.vue',

test/edgeCases.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ test('test-less oneOf rules', done => {
5656
config.module.rules = [
5757
{
5858
test: /\.vue$/,
59-
use: [DEFAULT_VUE_USE],
59+
use: [DEFAULT_VUE_USE]
6060
},
6161
{
6262
oneOf: [
@@ -98,7 +98,7 @@ test('normalize multiple use + options', done => {
9898
modify: config => {
9999
config.module.rules[0] = {
100100
test: /\.vue$/,
101-
use: [DEFAULT_VUE_USE],
101+
use: [DEFAULT_VUE_USE]
102102
}
103103
}
104104
}, () => done(), true)

test/style.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ test('CSS Modules Extend', async () => {
202202
config.module.rules = [
203203
{
204204
test: /\.vue$/,
205-
use: [DEFAULT_VUE_USE],
205+
use: [DEFAULT_VUE_USE]
206206
},
207207
{
208208
test: /\.css$/,

test/utils.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const VueLoaderPlugin = require('../lib/plugin')
1212
const DEFAULT_VUE_USE = {
1313
loader: 'vue-loader',
1414
options: {
15-
experimentalInlineMatchResource: Boolean(process.env.INLINE_MATCH_RESOURCE),
16-
},
15+
experimentalInlineMatchResource: Boolean(process.env.INLINE_MATCH_RESOURCE)
16+
}
1717
}
1818

1919
const baseConfig = {
@@ -56,7 +56,7 @@ function bundle (options, cb, wontThrowError) {
5656
if (!options.experiments || !options.experiments.css) {
5757
config.module && config.module.rules && config.module.rules.push({
5858
test: /\.css$/,
59-
use: ['vue-style-loader', 'css-loader'],
59+
use: ['vue-style-loader', 'css-loader']
6060
})
6161
}
6262
if (config.vue) {
@@ -65,7 +65,7 @@ function bundle (options, cb, wontThrowError) {
6565
experimentalInlineMatchResource: Boolean(
6666
process.env.INLINE_MATCH_RESOURCE
6767
),
68-
...options.vue,
68+
...options.vue
6969
}
7070
delete config.vue
7171
const vueIndex = config.module.rules.findIndex(r => r.test.test('.vue'))
@@ -76,12 +76,12 @@ function bundle (options, cb, wontThrowError) {
7676
// Vue usually locates at the first loader
7777
if (vueRule.use && typeof vueRule.use[0] === 'object') {
7878
vueRule.use[0] = Object.assign({}, vueRule.use[0], {
79-
options: vueOptions,
79+
options: vueOptions
8080
})
8181
}
8282
} else {
8383
config.module.rules[vueIndex] = Object.assign({}, vueRule, {
84-
options: vueOptions,
84+
options: vueOptions
8585
})
8686
}
8787
}

0 commit comments

Comments
 (0)