From 49a4499d525bf146e0c6b95d31841c832b7b8bc5 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Fri, 4 Aug 2017 14:28:55 +0200
Subject: [PATCH] Update webpack

---
 js/webpack/app.js          | 13 +++++++++----
 js/webpack/libraries.js    |  9 +++++++--
 js/webpack/npm.js          | 13 ++-----------
 js/webpack/rules/es6.js    |  7 ++++++-
 js/webpack/rules/parity.js |  7 ++++++-
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/js/webpack/app.js b/js/webpack/app.js
index a33f4fc60..a7f1d901e 100644
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -68,7 +68,12 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        use: ['happypack/loader?id=babel']
+        use: [ {
+          loader: 'happypack/loader',
+          options: {
+            id: 'babel'
+          }
+        } ]
       },
       {
         test: /\.json$/,
@@ -91,7 +96,7 @@ module.exports = {
             {
               loader: 'css-loader',
               options: {
-                minimize: true
+                minimize: isProd
               }
             }
           ]
@@ -108,14 +113,14 @@ module.exports = {
               options: {
                 importLoaders: 1,
                 localIdentName: '[name]_[local]_[hash:base64:10]',
-                minimize: true,
+                minimize: isProd,
                 modules: true
               }
             },
             {
               loader: 'postcss-loader',
               options: {
-                sourceMap: true,
+                sourceMap: isProd,
                 plugins: [
                   require('postcss-import'),
                   require('postcss-nested'),
diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js
index fa3a6d740..92f318ec7 100644
--- a/js/webpack/libraries.js
+++ b/js/webpack/libraries.js
@@ -44,7 +44,7 @@ module.exports = {
 
   resolve: {
     alias: {
-      '~': path.resolve(__dirname, '..')
+
     }
   },
 
@@ -59,7 +59,12 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        use: [ 'happypack/loader?id=babel' ]
+        use: [ {
+          loader: 'happypack/loader',
+          options: {
+            id: 'babel'
+          }
+        } ]
       },
       {
         test: /\.json$/,
diff --git a/js/webpack/npm.js b/js/webpack/npm.js
index f0ab143c3..baa09cbdb 100644
--- a/js/webpack/npm.js
+++ b/js/webpack/npm.js
@@ -58,7 +58,7 @@ module.exports = {
       rulesEs6,
       {
         test: /(\.jsx|\.js)$/,
-        use: [ 'babel-loader' ],
+        use: ['babel-loader'],
         exclude: /node_modules/
       }
     ]
@@ -68,18 +68,9 @@ module.exports = {
   },
   resolve: {
     alias: {
-      '~': path.resolve(__dirname, '..'),
-      '@parity/abi': path.resolve(__dirname, '../node_modules/@parity/abi'),
-      '@parity/api': path.resolve(__dirname, '../node_modules/@parity/api'),
-      '@parity/etherscan': path.resolve(__dirname, '../node_modules/@parity/etherscan'),
-      '@parity/jsonrpc': path.resolve(__dirname, '../node_modules/@parity/jsonrpc'),
-      '@parity/shared': path.resolve(__dirname, '../node_modules/@parity/shared'),
-      '@parity/ui': path.resolve(__dirname, '../node_modules/@parity/ui'),
-      '@parity/wordlist': path.resolve(__dirname, '../node_modules/@parity/wordlist'),
-      '@parity': path.resolve(__dirname, '../packages')
+      '~': path.resolve(__dirname, '..')
     },
     modules: [
-      path.resolve('./src'),
       path.join(__dirname, '../node_modules')
     ],
     extensions: ['.json', '.js', '.jsx']
diff --git a/js/webpack/rules/es6.js b/js/webpack/rules/es6.js
index d6e7e58e6..b49d908bc 100644
--- a/js/webpack/rules/es6.js
+++ b/js/webpack/rules/es6.js
@@ -17,5 +17,10 @@
 module.exports = {
   test: /\.js$/,
   include: /node_modules\/(get-own-enumerable-property-symbols|ethereumjs-tx|stringify-object)/,
-  use: [ 'happypack/loader?id=babel' ]
+  use: [ {
+    loader: 'happypack/loader',
+    options: {
+      id: 'babel'
+    }
+  } ]
 };
diff --git a/js/webpack/rules/parity.js b/js/webpack/rules/parity.js
index 546bbc659..569bc11b0 100644
--- a/js/webpack/rules/parity.js
+++ b/js/webpack/rules/parity.js
@@ -17,5 +17,10 @@
 module.exports = {
   test: /\.js$/,
   include: /node_modules\/@parity\//,
-  use: [ 'happypack/loader?id=babel' ]
+  use: [ {
+    loader: 'happypack/loader',
+    options: {
+      id: 'babel'
+    }
+  } ]
 };