update config for latest webpack 2.0 changes

yyx990803 · yyx990803 · commit 7a932e9f17fa · 2016-10-13T04:34:52.000-04:00
diff --git a/build/webpack.base.config.js b/build/webpack.base.config.js
@@ -14,10 +14,11 @@ module.exports = {
     filename: 'client-bundle.js'
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue',
+        options: vueConfig
       },
       {
         test: /\.js$/,
@@ -27,16 +28,11 @@ module.exports = {
       {
         test: /\.(png|jpg|gif|svg)$/,
         loader: 'url',
-        query: {
+        options: {
           limit: 10000,
           name: '[name].[ext]?[hash]'
         }
       }
     ]
-  },
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      vue: vueConfig
-    })
-  ]
+  }
 }
diff --git a/build/webpack.client.config.js b/build/webpack.client.config.js
@@ -3,7 +3,7 @@ const base = require('./webpack.base.config')
 const vueConfig = require('./vue-loader.config')
 
 const config = Object.assign({}, base, {
-  plugins: base.plugins.concat([
+  plugins: (base.plugins || []).concat([
     // strip comments in Vue code
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.2",
     "url-loader": "^0.5.7",
-    "vue-loader": "^9.5.0",
-    "webpack": "^2.1.0-beta.20",
+    "vue-loader": "^9.7.0",
+    "webpack": "^2.1.0-beta.25",
     "webpack-dev-middleware": "^1.6.1",
     "webpack-hot-middleware": "^2.12.2"
   }

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@ module.exports = {`
`14`	`14`	`filename: 'client-bundle.js'`
`15`	`15`	`},`
`16`	`16`	`module: {`
`17`		`- loaders: [`
	`17`	`+ rules: [`
`18`	`18`	`{`
`19`	`19`	`test: /\.vue$/,`
`20`		`- loader: 'vue'`
	`20`	`+ loader: 'vue',`
	`21`	`+ options: vueConfig`
`21`	`22`	`},`
`22`	`23`	`{`
`23`	`24`	`test: /\.js$/,`
`@@ -27,16 +28,11 @@ module.exports = {`
`27`	`28`	`{`
`28`	`29`	`test: /\.(png\|jpg\|gif\|svg)$/,`
`29`	`30`	`loader: 'url',`
`30`		`- query: {`
	`31`	`+ options: {`
`31`	`32`	`limit: 10000,`
`32`	`33`	`name: '[name].[ext]?[hash]'`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`]`
`36`		`- },`
`37`		`- plugins: [`
`38`		`- new webpack.LoaderOptionsPlugin({`
`39`		`- vue: vueConfig`
`40`		`- })`
`41`		`- ]`
	`37`	`+ }`
`42`	`38`	`}`