Merge pull request andev-software#20 from set321go/upgrade-webpack

Upgrade to webpack 2
lilyball · Sep 17, 2017 · 47f93bf · 47f93bf
2 parents ffd1b2a + 44c4a67
commit 47f93bf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/package.js b/package.js
@@ -95,4 +95,4 @@ function log(plat, arch) {
         if (err) return console.error(err)
         console.log(plat + '-' + arch + ' finished!')
     }
-}
+}
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "babel-core": "^6.18.2",
-    "babel-loader": "^6.2.7",
+    "babel-loader": "^6.2.10",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-class-properties": "^6.13.0",
     "babel-plugin-transform-class-properties": "^6.19.0",
@@ -67,14 +67,13 @@
     "del": "^2.2.2",
     "electron-packager": "^8.3.0",
     "express": "^4.14.0",
-    "file-loader": "^0.9.0",
+    "file-loader": "^0.10.0",
     "github-latest-release": "^0.1.1",
     "json-loader": "^0.5.4",
     "minimist": "^1.2.0",
     "node-sass": "^3.13.0",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.3",
-    "webpack-target-electron-renderer": "^0.4.0"
+    "webpack": "^2.2.1"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,5 @@
 var path = require('path')
 var webpack = require('webpack')
-var webpackTargetElectronRenderer = require('webpack-target-electron-renderer')
 
 var options = {
     // devtool: 'eval-source-map',
@@ -12,29 +11,27 @@ var options = {
             'react-router',
             'sweetalert/dist/sweetalert.css'
         ],
-        app: [
-            './src/index.jsx'
-        ]
+        app: './src/index.jsx'
     },
+    target: 'electron-renderer',
     output: {
         filename: "[name].js",
         path: './dist'
     },
     resolve: {
-        root: path.resolve(__dirname) + '/src',
-        extensions: ['', '.webpack.js', '.web.js', '.js', '.jsx']
+        modules: [
+          path.resolve(__dirname) + '/src',
+          'node_modules'
+        ],
+        extensions: ['.webpack.js', '.web.js', '.js', '.jsx']
     },
     module: {
-        loaders: [
-            {
-                test: /\.json/,
-                loader: require.resolve('json-loader')
-            },
+        rules: [
             {
                 test: /\.jsx?$/,
                 exclude: /node_modules/,
                 loader: require.resolve('babel-loader'),
-                query: {
+                options: {
                     presets: [
                         require.resolve('babel-preset-es2015'),
                         require.resolve('babel-preset-react')
@@ -49,20 +46,28 @@ var options = {
             },
             {
                 test: /\.css$/,
-                loader: "style-loader!css-loader"
+                use: [
+                  "style-loader",
+                  "css-loader"
+                ]
             },
             {
-                test: /\.png$/, loader: "url-loader?limit=100000"
+                test: /\.png$/,
+                loader: "url-loader",
+                options: {
+                  limit: '100000'
+                }
             },
             {
-                test: /\.jpg$/, loader: "file-loader"
+                test: /\.jpg$/,
+                loader: "file-loader"
             }
         ]
     },
     plugins: [
         new webpack.ContextReplacementPlugin(/moment[\\\/]locale$/, /^\.\/(en|nl)$/),
         new webpack.optimize.CommonsChunkPlugin({
-            names: ['vendor'],
+            name: 'vendor',
             filename: "[name].js"
         }),
         new webpack.ProvidePlugin({
@@ -76,6 +81,4 @@ var options = {
     ]
 }
 
-options.target = webpackTargetElectronRenderer(options)
-
 module.exports = options
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,4 +95,4 @@ function log(plat, arch) { @@
             if (err) return console.error(err)
             console.log(plat + '-' + arch + ' finished!')
         }
-    }
+    }