diff --git a/js/src/api/api.js b/js/src/api/api.js index 526ecbf1b..9a208ade9 100644 --- a/js/src/api/api.js +++ b/js/src/api/api.js @@ -23,7 +23,8 @@ import { Db, Eth, Parity, Net, Personal, Shh, Signer, Trace, Web3 } from './rpc' import Subscriptions from './subscriptions'; import util from './util'; import { isFunction } from './util/types'; -import { LocalAccountsMiddleware } from './local'; + +import LocalAccountsMiddleware from '~/api/local'; export default class Api extends EventEmitter { constructor (transport, allowSubscriptions = true) { @@ -50,7 +51,7 @@ export default class Api extends EventEmitter { } // Doing a request here in test env would cause an error - if (process.env.NODE_ENV !== 'test') { + if (LocalAccountsMiddleware && process.env.NODE_ENV !== 'test') { const middleware = this.parity .nodeKind() .then((nodeKind) => { diff --git a/js/src/api/local/index.js b/js/src/api/local/index.js index cc7b27e68..190a38ea4 100644 --- a/js/src/api/local/index.js +++ b/js/src/api/local/index.js @@ -14,8 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -if (process.env.NODE_ENV !== 'test') { - process.browser = true; -} - -export LocalAccountsMiddleware from './localAccountsMiddleware'; +export default null; diff --git a/js/webpack/app.js b/js/webpack/app.js index d6ee0f285..4a8b129a2 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -138,9 +138,9 @@ module.exports = { resolve: { alias: { + '~/api/local': path.resolve(__dirname, '../src/api/local/localAccountsMiddleware.js'), '~': path.resolve(__dirname, '../src'), - 'keythereum': path.resolve(__dirname, '../node_modules/keythereum/dist/keythereum'), - 'vertx': 'empty-module' + 'keythereum': path.resolve(__dirname, '../node_modules/keythereum/dist/keythereum') }, modules: [ path.join(__dirname, '../node_modules') diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index 936612553..11623e947 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -41,10 +41,7 @@ module.exports = { resolve: { alias: { - '~': path.resolve(__dirname, '../src'), - 'keythereum': 'empty-module', - 'secp256k1': 'empty-module', - 'vertx': 'empty-module' + '~': path.resolve(__dirname, '../src') } }, diff --git a/js/webpack/npm.js b/js/webpack/npm.js index 342cbd375..58e78e3ce 100644 --- a/js/webpack/npm.js +++ b/js/webpack/npm.js @@ -75,10 +75,7 @@ module.exports = { }, resolve: { alias: { - '~': path.resolve(__dirname, '../src'), - 'keythereum': 'empty-module', - 'secp256k1': 'empty-module', - 'vertx': 'empty-module' + '~': path.resolve(__dirname, '../src') }, modules: [ path.resolve('./src'),