From 0d9e849162baae82b458e4d258e59229828b8278 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Thu, 20 Apr 2017 10:34:23 +0200
Subject: [PATCH] Build with @parity/(abi|api) packages

---
 js/package.json         | 2 ++
 js/webpack/app.js       | 8 +++++++-
 js/webpack/libraries.js | 8 +++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/js/package.json b/js/package.json
index ac1731b91..64d2a24cf 100644
--- a/js/package.json
+++ b/js/package.json
@@ -158,6 +158,8 @@
     "yargs": "6.6.0"
   },
   "dependencies": {
+    "@parity/abi": "file:src/abi",
+    "@parity/api": "file:src/api",
     "@parity/wordlist": "1.0.1",
     "base32.js": "0.1.0",
     "bignumber.js": "3.0.1",
diff --git a/js/webpack/app.js b/js/webpack/app.js
index ded5c4468..6d61f7518 100644
--- a/js/webpack/app.js
+++ b/js/webpack/app.js
@@ -65,9 +65,15 @@ module.exports = {
         exclude: /(node_modules)/,
         use: [ 'happypack/loader?id=babel-js' ]
       },
+      // duplicated for clarity since the number of @parity modules will increase
       {
         test: /\.js$/,
-        include: /node_modules\/(material-chip-input|ethereumjs-tx|@parity\/wordlist)/,
+        include: /node_modules\/@parity\/(abi|api|wordlist)/,
+        use: 'babel-loader'
+      },
+      {
+        test: /\.js$/,
+        include: /node_modules\/(material-chip-input|ethereumjs-tx)/,
         use: 'babel-loader'
       },
       {
diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js
index 1fcb39eba..ff41132be 100644
--- a/js/webpack/libraries.js
+++ b/js/webpack/libraries.js
@@ -58,9 +58,15 @@ module.exports = {
           'babel-loader?cacheDirectory=true'
         ]
       },
+      // duplicated for clarity since the number of @parity modules will increase
       {
         test: /\.js$/,
-        include: /node_modules\/(ethereumjs-tx|@parity\/wordlist)/,
+        include: /node_modules\/@parity\/(abi|api|wordlist)/,
+        use: 'babel-loader'
+      },
+      {
+        test: /\.js$/,
+        include: /node_modules\/ethereumjs-tx/,
         use: 'babel-loader'
       },
       {