From 4000ec681f527004ed34efe4c715e558e74a01b5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 28 Jul 2017 15:37:58 +0200 Subject: [PATCH] Ui 2 js build fixes (#6176) * Update API reference * Deprecation warning * Add missing parity-reactive-ui * Add dapps to packages/dapps * Add parity.js dependency --- js/package-lock.json | 93 +++++++++++++++++---------- js/package.json | 2 +- js/packages/dapp-account/package.json | 4 +- js/packages/dapp-develop/package.json | 1 + js/packages/dapps/package.json | 2 + js/src/inject.js | 6 +- js/webpack/app.js | 2 +- js/webpack/libraries.js | 1 - 8 files changed, 70 insertions(+), 41 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 398968adb..398f44223 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -5,39 +5,64 @@ "requires": true, "dependencies": { "@parity/abi": { - "version": "github:paritytech/js-abi#a1021ca5b7550e1e24e4767a22ef3f0d95ead19a", + "version": "github:paritytech/js-abi#414765a476d88b6fb9f3398c99a946021957d07a", "requires": { "bignumber.js": "3.0.1", - "js-sha3": "0.5.5" + "js-sha3": "0.5.5", + "utf8": "2.1.2" } }, "@parity/api": { - "version": "github:paritytech/js-api#418ee49849a5361ad3c416b224fd9bb6dbabc1d1", + "version": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", "requires": { - "@parity/abi": "github:paritytech/js-abi#a1021ca5b7550e1e24e4767a22ef3f0d95ead19a", - "@parity/jsonrpc": "github:paritytech/js-jsonrpc#ac545573880212a27cf4cc6bb32a37fdab6dc26d", + "@parity/abi": "github:paritytech/js-abi#414765a476d88b6fb9f3398c99a946021957d07a", + "@parity/jsonrpc": "github:paritytech/js-jsonrpc#89a6e441370f55d8fe995e27007f60da29b6672b", + "@parity/wordlist": "1.1.0", "bignumber.js": "3.0.1", "blockies": "0.0.2", "es6-error": "4.0.0", - "ethereumjs-tx": "1.2.5", - "eventemitter3": "2.0.2", + "ethereumjs-tx": "1.3.3", + "eventemitter3": "2.0.3", + "isomorphic-fetch": "2.2.1", "js-sha3": "0.5.5", "keythereum": "0.4.6", + "lodash": "4.17.4", "node-fetch": "1.6.3", - "secp256k1": "3.2.5" + "secp256k1": "3.2.5", + "store": "2.0.12" + }, + "dependencies": { + "@parity/wordlist": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.1.0.tgz", + "integrity": "sha1-np7Tq3g39WM7WETmCjVenmPkJ64=" + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "store": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz", + "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=" + } } }, "@parity/dapp-account": { "version": "file:packages/dapp-account", "requires": { + "@parity/parity.js": "1.8.7", "oo7": "0.5.3", "oo7-parity": "0.6.8", - "oo7-react": "0.4.5" + "oo7-react": "0.4.5", + "parity-reactive-ui": "0.4.5" } }, "@parity/dapp-develop": { "version": "file:packages/dapp-develop", "requires": { + "@parity/parity.js": "1.8.7", "oo7": "0.5.3", "oo7-parity": "0.6.8", "oo7-react": "0.4.5", @@ -47,6 +72,8 @@ "@parity/dapps": { "version": "file:packages/dapps", "requires": { + "@parity/dapp-account": "file:packages/dapp-account", + "@parity/dapp-develop": "file:packages/dapp-develop", "base32.js": "0.1.0", "bytes": "2.4.0", "format-number": "2.0.1", @@ -73,7 +100,7 @@ } }, "@parity/jsonrpc": { - "version": "github:paritytech/js-jsonrpc#ac545573880212a27cf4cc6bb32a37fdab6dc26d" + "version": "github:paritytech/js-jsonrpc#89a6e441370f55d8fe995e27007f60da29b6672b" }, "@parity/ledger": { "version": "file:packages/ledger" @@ -117,7 +144,7 @@ } }, "@parity/ui": { - "version": "github:paritytech/js-ui#164c08e1aec4a009dcd559764a746b1cc06c4b22", + "version": "github:paritytech/js-ui#315bec33a621184db1bd235f115f8f24e8c63192", "requires": { "bignumber.js": "3.0.1", "brace": "0.9.0", @@ -137,14 +164,15 @@ "react-portal": "3.0.0", "react-qr-reader": "1.1.3", "recharts": "0.15.2", - "semantic-ui-css": "2.2.10", - "semantic-ui-react": "0.68.2", + "semantic-ui-css": "2.2.11", + "semantic-ui-react": "0.71.2", "zxcvbn": "4.4.1" }, "dependencies": { "babel-runtime": { "version": "6.25.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", + "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", "requires": { "core-js": "2.4.1", "regenerator-runtime": "0.10.5" @@ -152,21 +180,16 @@ }, "prop-types": { "version": "15.5.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz", + "integrity": "sha1-a3suFBCDvjjIWVqlH8VXdccZk5Q=", "requires": { "fbjs": "0.8.14" } }, - "semantic-ui-css": { - "version": "2.2.10", - "bundled": true, - "requires": { - "jquery": "3.2.1" - } - }, "semantic-ui-react": { - "version": "0.68.2", - "bundled": true, + "version": "0.71.2", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.71.2.tgz", + "integrity": "sha512-aWkmGnhhdPGwRbtWVuhQV3QQvaoO8ZOrc5g0deW9Q/6J90Le1V5MC1LZTnwrrtUfV7rnEozwaunjZGftYsmG+w==", "requires": { "babel-runtime": "6.25.0", "classnames": "2.2.5", @@ -4431,9 +4454,9 @@ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "depd": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", - "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", "dev": true }, "des.js": { @@ -5284,9 +5307,9 @@ "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=" }, "ethereumjs-tx": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.2.5.tgz", - "integrity": "sha1-7TbX/+uXvIicYe7xq3b0emE9goY=", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.3.3.tgz", + "integrity": "sha1-7OBR0+/b53GtKlGNYWMsoqt17Ls=", "requires": { "ethereum-common": "0.0.18", "ethereumjs-util": "5.1.2" @@ -5360,9 +5383,9 @@ } }, "eventemitter3": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz", - "integrity": "sha1-IM5IkZCc6fNbCIyU+rQOLJb0c6w=" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=" }, "events": { "version": "1.1.1", @@ -5484,7 +5507,7 @@ "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.2.0", - "depd": "1.1.0", + "depd": "1.1.1", "encodeurl": "1.0.1", "escape-html": "1.0.3", "etag": "1.7.0", @@ -13403,7 +13426,7 @@ "dev": true, "requires": { "debug": "2.2.0", - "depd": "1.1.0", + "depd": "1.1.1", "destroy": "1.0.4", "encodeurl": "1.0.1", "escape-html": "1.0.3", diff --git a/js/package.json b/js/package.json index 50b1ef4f5..487b2c36d 100644 --- a/js/package.json +++ b/js/package.json @@ -160,7 +160,7 @@ "yargs": "6.6.0" }, "dependencies": { - "@parity/api": "paritytech/js-api#418ee49849a5361ad3c416b224fd9bb6dbabc1d1", + "@parity/api": "paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", "@parity/dapps": "file:packages/dapps", "@parity/etherscan": "file:packages/etherscan", "@parity/ledger": "file:packages/ledger", diff --git a/js/packages/dapp-account/package.json b/js/packages/dapp-account/package.json index e0b100be9..eef3fd3f7 100644 --- a/js/packages/dapp-account/package.json +++ b/js/packages/dapp-account/package.json @@ -15,9 +15,11 @@ "scripts": {}, "devDependencies": {}, "dependencies": { + "@parity/parity.js": "1.8.7", "oo7": "0.5.3", "oo7-parity": "0.6.8", - "oo7-react": "0.4.5" + "oo7-react": "0.4.5", + "parity-reactive-ui": "0.4.5" }, "peerDependencies": {} } diff --git a/js/packages/dapp-develop/package.json b/js/packages/dapp-develop/package.json index 196a0d444..759c27e08 100644 --- a/js/packages/dapp-develop/package.json +++ b/js/packages/dapp-develop/package.json @@ -15,6 +15,7 @@ "scripts": {}, "devDependencies": {}, "dependencies": { + "@parity/parity.js": "1.8.7", "oo7": "0.5.3", "oo7-parity": "0.6.8", "oo7-react": "0.4.5", diff --git a/js/packages/dapps/package.json b/js/packages/dapps/package.json index 40f92ac57..65288c85c 100644 --- a/js/packages/dapps/package.json +++ b/js/packages/dapps/package.json @@ -15,6 +15,8 @@ "scripts": {}, "devDependencies": {}, "dependencies": { + "@parity/dapp-account": "file:../dapp-account", + "@parity/dapp-develop": "file:../dapp-develop", "base32.js": "0.1.0", "bytes": "2.4.0", "format-number": "2.0.1", diff --git a/js/src/inject.js b/js/src/inject.js index 5a19ed80e..74c4f19ef 100644 --- a/js/src/inject.js +++ b/js/src/inject.js @@ -37,12 +37,12 @@ function initProvider () { const ethereum = new Api.Provider.PostMessage(appId); - console.log(`Requesting communications token for ${appId}`); + console.log(`Requesting API communications token for ${appId}`); ethereum .requestNewToken() .then((tokenId) => { - console.log(`Received new communications token ${tokenId}`); + console.log(`Received API communications token ${tokenId}`); }) .catch((error) => { console.error('Unable to retrieve communications token', error); @@ -85,3 +85,5 @@ const ethereum = initProvider(); initWeb3(ethereum); initParity(ethereum); + +console.warn('Deprecation: Dapps should only used the exposed EthereumProvider on `window.ethereum`, the use of `window.parity` and `window.web3` will be removed in future versions of this injector'); diff --git a/js/webpack/app.js b/js/webpack/app.js index c918859b7..af53afa8f 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -153,11 +153,11 @@ module.exports = { resolve: { alias: { - '~/packages/api/local': path.resolve(__dirname, '../node_modules/@parity/api/local/localAccountsMiddleware.js'), '~': path.resolve(__dirname, '..'), '@parity/abi': path.resolve(__dirname, '../node_modules/@parity/abi'), '@parity/api': path.resolve(__dirname, '../node_modules/@parity/api'), '@parity/jsonrpc': path.resolve(__dirname, '../node_modules/@parity/jsonrpc'), + '@parity/parity.js': path.resolve(__dirname, '../node_modules/@parity/parity.js'), '@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'), diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index 964ab6477..b5226b1dd 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -42,7 +42,6 @@ module.exports = { resolve: { alias: { - '~/packages/api/local': path.resolve(__dirname, '../node_modules/@parity/api/local/index.js'), '~': path.resolve(__dirname, '..'), '@parity/abi': path.resolve(__dirname, '../node_modules/@parity/abi'), '@parity/api': path.resolve(__dirname, '../node_modules/@parity/api'),