Skip to content

Commit 9255de1

Browse files
LinusBorgfrandiox
authored andcommitted
update to webpack 3.*, bump relevant dependencies (vuejs-templates#891)
1 parent 1866335 commit 9255de1

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

template/build/dev-server.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler, {
3535
heartbeat: 2000
3636
})
3737
// force page reload when html-webpack-plugin template changes
38-
compiler.plugin('compilation', function (compilation) {
39-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
40-
hotMiddleware.publish({ action: 'reload' })
41-
cb()
42-
})
43-
})
38+
// currently disabled until this is resolved:
39+
// https://github.com/jantimon/html-webpack-plugin/issues/680
40+
// compiler.plugin('compilation', function (compilation) {
41+
// compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
42+
// hotMiddleware.publish({ action: 'reload' })
43+
// cb()
44+
// })
45+
// })
4446

4547
// proxy api requests
4648
Object.keys(proxyTable).forEach(function (context) {

template/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
{{/lint}}
5656
"eventsource-polyfill": "^0.9.6",
5757
"express": "^4.14.1",
58-
"extract-text-webpack-plugin": "^2.0.0",
58+
"extract-text-webpack-plugin": "^3.0.0",
5959
"file-loader": "^0.11.1",
60-
"friendly-errors-webpack-plugin": "^1.1.3",
61-
"html-webpack-plugin": "^2.28.0",
60+
"friendly-errors-webpack-plugin": "^1.6.1",
61+
"html-webpack-plugin": "^2.30.1",
6262
"http-proxy-middleware": "^0.17.3",
63-
"webpack-bundle-analyzer": "^2.2.1",
63+
"webpack-bundle-analyzer": "^2.9.0",
6464
{{#unit}}
6565
"karma": "^1.4.1",
6666
"karma-coverage": "^1.1.1",
@@ -92,10 +92,10 @@
9292
"url-loader": "^0.5.8",
9393
"vue-loader": "^12.1.0",
9494
"vue-style-loader": "^3.0.1",
95-
"vue-template-compiler": "^2.4.0",
96-
"webpack": "^2.6.1",
97-
"webpack-dev-middleware": "^1.10.0",
98-
"webpack-hot-middleware": "^2.18.0",
95+
"vue-template-compiler": "^2.4.2",
96+
"webpack": "^3.5.5",
97+
"webpack-dev-middleware": "^1.12.0",
98+
"webpack-hot-middleware": "^2.18.2",
9999
"webpack-merge": "^4.1.0"
100100
},
101101
"engines": {

0 commit comments

Comments
 (0)