Skip to content

Commit 378f8e7

Browse files
committed
2 parents 3846dea + 6ea71ba commit 378f8e7

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"aspnet-prerendering": "3.0.1",
1616
"vue": "^2.5.13",
1717
"vue-server-renderer": "^2.5.13",
18-
"vue-loader": "^14.2.1",
18+
"vue-loader": "^15.2.4",
1919
"vue-template-compiler": "^2.5.13",
2020
"vue-router": "^3.0.1",
2121
"vuex": "^3.0.1",

webpack.config.js

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const path = require('path')
22

3+
const VueLoaderPlugin = require('vue-loader/lib/plugin')
34
// using webpack-merge so we don't have to repeat common configuration attributes twice
45
const merge = require('webpack-merge')
56

@@ -22,14 +23,43 @@ module.exports = (env) => {
2223
test: /\.js$/,
2324
loader: 'babel-loader',
2425
include: __dirname,
25-
exclude: /node_modules/
26+
exclude: file => (
27+
/node_modules/.test(file) &&
28+
!/\.vue\.js/.test(file)
29+
)
2630
},
2731
{
2832
test: /\.css$/,
29-
loader: 'style-loader!css-loader'
33+
oneOf: [
34+
// this matches `<style module>`
35+
{
36+
resourceQuery: /module/,
37+
use: [
38+
'vue-style-loader',
39+
{
40+
loader: 'css-loader',
41+
options: {
42+
modules: true,
43+
localIdentName: '[local]_[hash:base64:5]'
44+
}
45+
}
46+
]
47+
},
48+
// this matches plain `<style>` or `<style scoped>`
49+
{
50+
use: [
51+
'vue-style-loader',
52+
'css-loader'
53+
]
54+
}
55+
]
56+
3057
}
3158
]
32-
}
59+
},
60+
plugins: [
61+
new VueLoaderPlugin()
62+
]
3363
})
3464

3565
const clientBundleConfig = merge(sharedConfig(), {

0 commit comments

Comments
 (0)