Moved styling from production to renderer

havefive · Dec 2, 2016 · fb26aa8 · fb26aa8
1 parent 09a36e7
commit fb26aa8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/webpack.config.base.js b/webpack.config.base.js
@@ -17,10 +17,6 @@ export default validate({
     }, {
       test: /\.json$/,
       loader: 'json-loader'
-    },
-    {
-      test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
-      loader: 'url-loader'
     }]
   },
 

diff --git a/webpack.config.production.js b/webpack.config.production.js
@@ -10,7 +10,7 @@ import merge from 'webpack-merge';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import baseConfig from './webpack.config.base';
 
-const config = validate(merge(baseConfig, {
+export default validate(merge(baseConfig, {
   devtool: 'cheap-module-source-map',
 
   entry: [
@@ -43,11 +43,18 @@ const config = validate(merge(baseConfig, {
         )
       },
 
+      // Fonts
       { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
       { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
       { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
       { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
       { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' },
+
+      // Images
+      {
+        test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
+        loader: 'url-loader'
+      }
     ]
   },
 
@@ -79,5 +86,3 @@ const config = validate(merge(baseConfig, {
   // https://github.com/chentsulin/webpack-target-electron-renderer#how-this-module-works
   target: 'electron-renderer'
 }));
-
-export default config;