diff --git a/js/package-lock.json b/js/package-lock.json index f855743a9..1dfb4e5d2 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -45,11 +45,11 @@ } }, "@parity/dapp-accounts": { - "version": "github:paritytech/dapp-accounts#b4b7113ba8ea25d11dfc0ed6d6c93b85c8a7fac8", + "version": "github:paritytech/dapp-accounts#3b75c86f1a6e2486f9934089fa214c419923812d", "requires": { "@parity/api": "github:paritytech/js-api#ade4a6750292a2918676039ea53eea20c4c728bc", "@parity/dapp-vaults": "github:paritytech/dapp-vaults#c86131351e20be678e470704aa6f1fa7b610ee84", - "@parity/shared": "github:paritytech/js-shared#9bb1d291d8752a827613889498e380fcd3afa8da", + "@parity/shared": "github:paritytech/js-shared#32d6709cb2ee267553aa4292a482cd787af3df81", "@parity/ui": "github:paritytech/js-ui#037782bd16e8abf1c169143aa61749a44b94489b", "file-saver": "1.3.3", "react": "15.6.1", @@ -58,28 +58,6 @@ "react-router": "3.0.0", "react-tap-event-plugin": "2.0.1", "recharts": "0.15.2" - }, - "dependencies": { - "@parity/shared": { - "version": "github:paritytech/js-shared#9bb1d291d8752a827613889498e380fcd3afa8da", - "requires": { - "@parity/ledger": "github:paritytech/js-ledger#c363adfb9192aa56b7b498b0ad90bc4032bcd6ab", - "loglevel": "1.4.1", - "mobx": "2.6.4", - "mobx-react": "4.0.3", - "promise-worker": "1.1.1", - "push.js": "0.0.11", - "react-redux": "4.4.6", - "redux": "3.6.0", - "redux-actions": "1.1.0", - "redux-thunk": "2.1.0", - "scryptsy": "2.0.0", - "serviceworker-webpack-plugin": "0.2.0", - "solc": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818", - "worker-loader": "0.8.1", - "yargs": "6.6.0" - } - } } }, "@parity/dapp-vaults": { @@ -149,7 +127,7 @@ } }, "@parity/shared": { - "version": "github:paritytech/js-shared#438912f286ca09209e53fda5808205fca2c62940", + "version": "github:paritytech/js-shared#32d6709cb2ee267553aa4292a482cd787af3df81", "requires": { "@parity/ledger": "github:paritytech/js-ledger#c363adfb9192aa56b7b498b0ad90bc4032bcd6ab", "loglevel": "1.4.1", @@ -164,6 +142,7 @@ "scryptsy": "2.0.0", "serviceworker-webpack-plugin": "0.2.0", "solc": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818", + "sw-toolbox": "3.6.0", "worker-loader": "0.8.1", "yargs": "6.6.0" } @@ -13619,6 +13598,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/serviceworker-webpack-plugin/-/serviceworker-webpack-plugin-0.2.0.tgz", "integrity": "sha1-beneyC7RRMdUxvFbND57h2SsWyg=", + "optional": true, "requires": { "minimatch": "3.0.4" } diff --git a/js/package.json b/js/package.json index cc76ef30b..2a8e21e9a 100644 --- a/js/package.json +++ b/js/package.json @@ -133,7 +133,6 @@ "react-hot-loader": "3.0.0-beta.6", "react-intl-aggregate-webpack-plugin": "0.0.1", "script-ext-html-webpack-plugin": "1.7.1", - "serviceworker-webpack-plugin": "0.2.0", "sinon": "1.17.7", "sinon-as-promised": "4.0.2", "sinon-chai": "2.8.0", @@ -154,8 +153,8 @@ }, "dependencies": { "@parity/api": "paritytech/js-api#ade4a6750292a2918676039ea53eea20c4c728bc", - "@parity/dapp-accounts": "paritytech/dapp-accounts#b4b7113ba8ea25d11dfc0ed6d6c93b85c8a7fac8", - "@parity/shared": "paritytech/js-shared#c2d2d76934d49b0433518f023fdbfa19e4d827cd", + "@parity/dapp-accounts": "paritytech/dapp-accounts#3b75c86f1a6e2486f9934089fa214c419923812d", + "@parity/shared": "paritytech/js-shared#32d6709cb2ee267553aa4292a482cd787af3df81", "@parity/ui": "paritytech/js-ui#037782bd16e8abf1c169143aa61749a44b94489b", "es6-error": "4.0.0", "es6-promise": "4.0.5", @@ -181,7 +180,6 @@ "redux-actions": "1.1.0", "redux-thunk": "2.1.0", "store": "1.3.20", - "sw-toolbox": "^3.6.0", "useragent.js": "0.5.6", "utf8": "2.1.2", "web3": "0.17.0-beta", diff --git a/js/webpack/app.js b/js/webpack/app.js index 431f93b5d..29f1629a9 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -22,7 +22,6 @@ const flatten = require('lodash.flatten'); const WebpackErrorNotificationPlugin = require('webpack-error-notification'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); -const ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin'); const rulesEs6 = require('./rules/es6'); const rulesParity = require('./rules/parity'); @@ -200,10 +199,6 @@ module.exports = { chunks: [ 'index' ] }), - new ServiceWorkerWebpackPlugin({ - entry: path.join(__dirname, '../node_modules/@parity/shared/serviceWorker.js') - }), - new CopyWebpackPlugin( flatten([ {