Merge pull request sohelamin#6 from HalbergM/master

Updated packages and webpack.config.js
mcicolella · Jun 12, 2017 · 924719b · 924719b
2 parents 659c787 + 53551ca
commit 924719b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -21,16 +21,16 @@
         "vue-router": "^2.0.0"
     },
     "devDependencies": {
-        "electron-packager": "^8.1.0",
-        "electron-reload": "^1.0.2",
         "babel-core": "^6.16.0",
         "babel-loader": "^6.2.5",
         "babel-preset-es2015": "^6.16.0",
         "cross-env": "^3.1.1",
         "css-loader": "^0.25.0",
+        "electron-packager": "^8.1.0",
+        "electron-reload": "^1.0.2",
         "file-loader": "^0.9.0",
         "vue-loader": "^9.5.1",
-        "webpack": "2.1.0-beta.22",
-        "webpack-dev-server": "^2.1.0-beta.0"
+        "webpack": "^2.6.1",
+        "webpack-dev-server": "^2.4.5"
     }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -18,11 +18,11 @@ module.exports = {
         loaders: [
             {
                 test: /\.vue$/,
-                loader: 'vue'
+                loader: 'vue-loader'
             },
             {
                 test: /\.js$/,
-                loader: 'babel',
+                loader: 'babel-loader',
                 exclude: /node_modules/
             },
             {