Skip to content

Commit 3df7955

Browse files
committedOct 4, 2017
chore: upgrade dependencies and finally make webpack 3 work with hmr
1 parent cb97e89 commit 3df7955

File tree

5 files changed

+705
-662
lines changed

5 files changed

+705
-662
lines changed
 

‎build/lib/webpack.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export default entry => {
5454
'process.env': {
5555
NODE_ENV: JSON.stringify(entry.env || 'production')
5656
}
57-
})
57+
}),
58+
new webpack.optimize.ModuleConcatenationPlugin()
5859
]
5960
}
6061

‎build/local/client.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
import 'eventsource-polyfill'
22
import hotClient from 'webpack-hot-middleware/client?noInfo=true&reload=true'
33

4-
hotClient.subscribe((event) => {
5-
if (event.action === 'reload') {
6-
window.location.reload()
7-
}
8-
})
4+
hotClient.subscribe()

‎build/local/webpack.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { config, resolvePath } from '../config'
77
const componentExampleLoader = require.resolve('./loaders/component-example-loader')
88

99
export default {
10-
devtool: '#eval-source-map',
10+
devtool: '#cheap-module-eval-source-map',
1111
entry: {
1212
docs: [
1313
'./docs/app/index.js',
@@ -77,7 +77,6 @@ export default {
7777
}),
7878
new webpack.WatchIgnorePlugin([resolvePath('node_modules')]),
7979
new webpack.HotModuleReplacementPlugin(),
80-
new webpack.NoEmitOnErrorsPlugin(),
8180
new webpack.NamedModulesPlugin(),
8281
new HtmlWebpackPlugin({
8382
filename: 'index.html',

‎package.json

+23-24
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
"dependencies": {
4141
"deepmerge": "^1.5.2",
4242
"popper.js": "^1.12.5",
43-
"raf": "^3.3.2",
43+
"raf": "^3.4.0",
4444
"vue": "^2.4.4"
4545
},
4646
"devDependencies": {
4747
"autoprefixer": "^7.1.4",
48-
"avoriaz": "^4.2.0",
48+
"avoriaz": "^6.0.0",
4949
"axios": "^0.16.2",
5050
"babel-cli": "^6.26.0",
5151
"babel-core": "^6.26.0",
52-
"babel-eslint": "^8.0.0",
52+
"babel-eslint": "^8.0.1",
5353
"babel-loader": "^7.1.2",
5454
"babel-plugin-syntax-dynamic-import": "^6.18.0",
5555
"babel-preset-env": "^1.6.0",
@@ -60,51 +60,50 @@
6060
"commitizen": "^2.9.6",
6161
"concat": "^1.0.3",
6262
"connect-history-api-fallback": "^1.3.0",
63-
"conventional-changelog": "^1.1.5",
63+
"conventional-changelog": "^1.1.6",
6464
"conventional-changelog-vue-material": "^0.0.1",
6565
"css-loader": "^0.28.7",
6666
"css-mqpacker": "^6.0.1",
6767
"cssnano": "^3.10.0",
6868
"cz-conventional-changelog": "^2.0.0",
69-
"eslint": "^4.6.1",
69+
"eslint": "^4.8.0",
7070
"eslint-config-standard": "^10.2.1",
7171
"eslint-friendly-formatter": "^3.0.0",
7272
"eslint-loader": "^1.9.0",
7373
"eslint-plugin-import": "^2.7.0",
74-
"eslint-plugin-jest": "^21.1.0",
75-
"eslint-plugin-node": "^5.1.1",
74+
"eslint-plugin-jest": "^21.2.0",
75+
"eslint-plugin-node": "^5.2.0",
7676
"eslint-plugin-promise": "^3.5.0",
7777
"eslint-plugin-standard": "^3.0.1",
7878
"eslint-plugin-vue": "^3.13.0",
7979
"eventsource-polyfill": "^0.9.6",
80-
"express": "^4.15.4",
81-
"extract-text-webpack-plugin": "2.1.2",
82-
"file-loader": "^0.11.2",
80+
"express": "^4.16.1",
81+
"extract-text-webpack-plugin": "^3.0.1",
82+
"file-loader": "^1.1.4",
8383
"friendly-errors-webpack-plugin": "^1.6.1",
8484
"github-release-cli": "^0.3.0",
8585
"highlight.js": "^9.12.0",
8686
"html-webpack-plugin": "^2.30.1",
87-
"jest": "^21.1.0",
87+
"jest": "^21.2.1",
8888
"jest-css-modules": "^1.1.0",
89-
"jest-vue": "^0.5.3",
89+
"jest-vue": "^0.7.0",
9090
"node-sass": "^4.5.3",
91-
"optimize-css-assets-webpack-plugin": "^3.1.1",
91+
"optimize-css-assets-webpack-plugin": "^3.2.0",
9292
"optimize-js-plugin": "^0.0.4",
9393
"ora": "^1.3.0",
94-
"postcss": "^6.0.11",
94+
"postcss": "^6.0.13",
9595
"sass-loader": "^6.0.6",
9696
"shelljs": "^0.7.8",
97-
"sinon": "^3.2.1",
98-
"url-loader": "^0.5.9",
99-
"vue-i18n": "^7.2.0",
100-
"vue-loader": "^13.0.4",
97+
"sinon": "^4.0.1",
98+
"url-loader": "^0.6.2",
99+
"vue-i18n": "^7.3.1",
100+
"vue-loader": "^13.0.5",
101101
"vue-router": "^2.7.0",
102-
"vue-style-loader": "^3.0.2",
103-
"vue-template-compiler": "^2.4.3",
104-
"vue-test-utils": "https://github.com/vuejs/vue-test-utils",
105-
"vuex": "^2.4.0",
106-
"vuex-router-sync": "^4.3.1",
107-
"webpack": "2.7.0",
102+
"vue-style-loader": "^3.0.3",
103+
"vue-template-compiler": "^2.4.4",
104+
"vuex": "^2.4.1",
105+
"vuex-router-sync": "^4.3.2",
106+
"webpack": "^3.6.0",
108107
"webpack-bundle-analyzer": "^2.9.0",
109108
"webpack-dev-middleware": "^1.12.0",
110109
"webpack-hot-middleware": "^2.19.1",

0 commit comments

Comments
 (0)