update deps and fix config for webpack 2 updates

yyx990803 · yyx990803 · commit 958e49536e20 · 2016-09-19T23:30:04.000-04:00
diff --git a/build/vue-loader.config.js b/build/vue-loader.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  postcss: [
+    require('autoprefixer')({
+      browsers: ['last 3 versions']
+    })
+  ]
+}
diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js
@@ -1,4 +1,6 @@
 const path = require('path')
+const webpack = require('webpack')
+const vueConfig = require('./vue-loader.config')
 
 module.exports = {
   devtool: '#source-map',
@@ -11,9 +13,6 @@ module.exports = {
     publicPath: '/dist/',
     filename: 'client-bundle.js'
   },
-  resolveLoader: {
-    root: path.join(__dirname, '../node_modules'),
-  },
   module: {
     loaders: [
       {
@@ -35,11 +34,9 @@ module.exports = {
       }
     ]
   },
-  vue: {
-    postcss: [
-      require('autoprefixer')({
-        browsers: ['last 3 versions']
-      })
-    ]
-  }
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      vue: vueConfig
+    })
+  ]
 }
diff --git a/build/webpack.client.config.js b/build/webpack.client.config.js
@@ -1,8 +1,9 @@
-const base = require('./webpack.base.config')
 const webpack = require('webpack')
+const base = require('./webpack.base.config')
+const vueConfig = require('./vue-loader.config')
 
 const config = Object.assign({}, base, {
-  plugins: [
+  plugins: base.plugins.concat([
     // strip comments in Vue code
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
@@ -12,17 +13,21 @@ const config = Object.assign({}, base, {
       name: 'vendor',
       filename: 'client-vendor-bundle.js'
     })
-  ]
+  ])
 })
 
 if (process.env.NODE_ENV === 'production') {
-  // extract CSS into a single file so it's applied on initial render
+  // Use ExtractTextPlugin to extract CSS into a single file
+  // so it's applied on initial render
   const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
-  config.vue.loaders = {
+  // vueConfig is already included in the config via LoaderOptionsPlugin
+  // here we overwrite the loader config for <style lang="stylus">
+  // so they are extracted.
+  vueConfig.loaders = {
     stylus: ExtractTextPlugin.extract({
       loader: "css-loader!stylus-loader",
-      fallbackLoader: "vue-style-loader"
+      fallbackLoader: "vue-style-loader" // <- this is a dep of vue-loader
     })
   }
 
diff --git a/build/webpack.server.config.js b/build/webpack.server.config.js
@@ -3,7 +3,7 @@ const base = require('./webpack.base.config')
 
 module.exports = Object.assign({}, base, {
   target: 'node',
-  devtool: null,
+  devtool: false,
   entry: './src/server-entry.js',
   output: Object.assign({}, base.output, {
     filename: 'server-bundle.js',
diff --git a/package.json b/package.json
@@ -30,13 +30,13 @@
     "babel-preset-es2015": "^6.13.2",
     "babel-preset-stage-2": "^6.11.0",
     "cross-env": "^2.0.0",
-    "css-loader": "^0.23.1",
+    "css-loader": "^0.25.0",
     "extract-text-webpack-plugin": "^2.0.0-beta.3",
-    "file-loader": "^0.8.4",
+    "file-loader": "^0.9.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.2",
     "url-loader": "^0.5.7",
-    "vue-loader": "^9.2.2",
+    "vue-loader": "^9.5.0",
     "webpack": "^2.1.0-beta.20",
     "webpack-dev-middleware": "^1.6.1",
     "webpack-hot-middleware": "^2.12.2"
diff --git a/server.js b/server.js
@@ -51,7 +51,7 @@ app.use(favicon(resolve('./src/assets/logo.png')))
 
 app.get('*', (req, res) => {
   if (!renderer) {
-    return res.end('waiting for compilation...')
+    return res.end('waiting for compilation... refresh in a moment.')
   }
 
   var s = Date.now()

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ app.use(favicon(resolve('./src/assets/logo.png')))`
`51`	`51`
`52`	`52`	`app.get('*', (req, res) => {`
`53`	`53`	`if (!renderer) {`
`54`		`- return res.end('waiting for compilation...')`
	`54`	`+ return res.end('waiting for compilation... refresh in a moment.')`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`var s = Date.now()`