update config for latest webpack 2.0 changes

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
-    })
-  ]
+  }
 }

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')

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"
   }