update deps, fix webpack config

pbarbiero · May 13, 2017 · 8659f9d · 8659f9d
1 parent 86cd094
commit 8659f9d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-electron-react-boilerplate",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Minimal and modern react+electron+webpack boilerplate",
   "author": "Phillip Barbiero",
   "homepage": "https://github.com/pbarbiero/basic-electron-react-boilerplate",
@@ -19,20 +19,20 @@
     "postpackage": "electron-packager ./ --out=./builds"
   },
   "devDependencies": {
-    "babel-core": "^6.23.1",
+    "babel-core": "^6.24.1",
     "babel-loader": "^6.4.0",
-    "babel-preset-react": "^6.23.0",
+    "babel-preset-react": "^6.24.1",
     "babili-webpack-plugin": "^0.0.11",
-    "css-loader": "^0.26.2",
-    "electron": "^1.6.1",
-    "electron-packager": "^8.5.2",
+    "css-loader": "^0.28.1",
+    "electron": "^1.6.7",
+    "electron-packager": "^8.7.0",
     "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
+    "file-loader": "^0.11.1",
     "html-webpack-plugin": "^2.28.0",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "style-loader": "^0.13.2",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.4.1"
+    "style-loader": "^0.17.0",
+    "webpack": "^2.5.1",
+    "webpack-dev-server": "^2.4.5"
   }
 }
diff --git a/webpack.build.config.js b/webpack.build.config.js
@@ -8,7 +8,7 @@ const SRC_DIR = path.resolve(__dirname, 'src');
 const OUTPUT_DIR = path.resolve(__dirname, 'dist');
 
 // Any directories you will be adding code/files into, need to be added to this array so webpack will pick them up
-const defaultInclude = [ SRC_DIR ];
+const defaultInclude = [SRC_DIR];
 
 module.exports = {
   entry: SRC_DIR + '/index.js',
@@ -19,26 +19,37 @@ module.exports = {
   },
   module: {
     rules: [
-      { test: /\.css$/, use: ExtractTextPlugin.extract({
-        fallback: "style-loader",
-        use: "css-loader"
-      }), include: defaultInclude },
-      { test: /\.js?$/, use: [
-        { loader: 'babel-loader' }
-      ], include: defaultInclude },
-      { test: /\.(jpe?g|png|gif)$/, use: [
-        { loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]' }
-      ], include: defaultInclude },
-      { test: /\.(eot|svg|ttf|woff|woff2)$/, use: [
-        { loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]' }
-      ], include: defaultInclude }
+      {
+        test: /\.css$/,
+        use: ExtractTextPlugin.extract({
+          fallback: 'style-loader',
+          use: 'css-loader'
+        }),
+        include: defaultInclude
+      },
+      {
+        test: /\.js?$/,
+        use: [{ loader: 'babel-loader' }],
+        include: defaultInclude
+      },
+      {
+        test: /\.(jpe?g|png|gif)$/,
+        use: [{ loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]' }],
+        include: defaultInclude
+      },
+      {
+        test: /\.(eot|svg|ttf|woff|woff2)$/,
+        use: [{ loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]' }],
+        include: defaultInclude
+      }
     ]
   },
+  target: 'electron-renderer',
   plugins: [
-    new ExtractTextPlugin("bundle.css"),
+    new ExtractTextPlugin('bundle.css'),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('production')
-		}),
+    }),
     new BabiliPlugin()
   ],
   stats: {

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -7,7 +7,7 @@ const SRC_DIR = path.resolve(__dirname, 'src');
 const OUTPUT_DIR = path.resolve(__dirname, 'dist');
 
 // Any directories you will be adding code/files into, need to be added to this array so webpack will pick them up
-const defaultInclude = [ SRC_DIR ];
+const defaultInclude = [SRC_DIR];
 
 module.exports = {
   entry: SRC_DIR + '/index.js',
@@ -18,28 +18,36 @@ module.exports = {
   },
   module: {
     rules: [
-      { test: /\.css$/, use: [
-        { loader: 'style-loader' },
-        { loader: 'css-loader' }
-      ], include: defaultInclude },
-      { test: /\.js?$/, use: [
-        { loader: 'babel-loader' }
-      ], include: defaultInclude },
-      { test: /\.(jpe?g|png|gif)$/, use: [
-        { loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]' }
-      ], include: defaultInclude },
-      { test: /\.(eot|svg|ttf|woff|woff2)$/, use: [
-        { loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]' }
-      ], include: defaultInclude }
+      {
+        test: /\.css$/,
+        use: [{ loader: 'style-loader' }, { loader: 'css-loader' }],
+        include: defaultInclude
+      },
+      {
+        test: /\.js?$/,
+        use: [{ loader: 'babel-loader' }],
+        include: defaultInclude
+      },
+      {
+        test: /\.(jpe?g|png|gif)$/,
+        use: [{ loader: 'file-loader?name=img/[name]__[hash:base64:5].[ext]' }],
+        include: defaultInclude
+      },
+      {
+        test: /\.(eot|svg|ttf|woff|woff2)$/,
+        use: [{ loader: 'file-loader?name=font/[name]__[hash:base64:5].[ext]' }],
+        include: defaultInclude
+      }
     ]
   },
+  target: 'electron-renderer',
   plugins: [
     new HtmlWebpackPlugin(),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('development')
-		}),
+    })
   ],
-  devtool: "cheap-source-map",
+  devtool: 'cheap-source-map',
   devServer: {
     contentBase: OUTPUT_DIR,
     stats: {