From 08dadefb0a1ceef3e2d81166e7e539875e6804ba Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 6 Nov 2016 17:42:25 +0100 Subject: [PATCH 1/2] Fix /parity-utils/{web3,parity}.js webpack errors (#3221) * Don't override library builds * Don't override libraries on build * Enhance working blockNumber display --- js/package.json | 6 +++--- js/src/dev.parity.html | 25 ++++++++++++++++++++++++- js/src/dev.web3.html | 27 ++++++++++++++++++++++++++- js/webpack.config.js | 4 ---- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/js/package.json b/js/package.json index 2b575efe79d..7f8e0f9cf08 100644 --- a/js/package.json +++ b/js/package.json @@ -23,16 +23,16 @@ "Promise" ], "scripts": { - "build": "npm run build:dll && npm run build:app && npm run build:lib", + "build": "npm run build:lib && npm run build:dll && npm run build:app", "build:app": "webpack --progress", "build:lib": "webpack --config webpack.libraries --progress", "build:dll": "webpack --config webpack.vendor --progress", - "ci:build": "npm run ci:build:dll && npm run ci:build:app && npm run ci:build:lib", + "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app", "ci:build:app": "NODE_ENV=production webpack", "ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries", "ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor", "ci:build:npm": "NODE_ENV=production webpack --config webpack.npm", - "start": "npm install && npm run build:dll && npm run start:app", + "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app", "start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000", "clean": "rm -rf ./build ./coverage", "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info", diff --git a/js/src/dev.parity.html b/js/src/dev.parity.html index 9cfe5ac18ef..504dfbb7079 100644 --- a/js/src/dev.parity.html +++ b/js/src/dev.parity.html @@ -6,8 +6,31 @@ dev::Parity.js + + - +
+ best block #unknown +
+ diff --git a/js/src/dev.web3.html b/js/src/dev.web3.html index 93faba8e55a..f4006160a03 100644 --- a/js/src/dev.web3.html +++ b/js/src/dev.web3.html @@ -6,8 +6,33 @@ dev::Web3 + + - +
+ best block #unknown +
+ diff --git a/js/webpack.config.js b/js/webpack.config.js index 41da9aa25a0..a85fefa9fb4 100644 --- a/js/webpack.config.js +++ b/js/webpack.config.js @@ -41,10 +41,6 @@ module.exports = { 'registry': ['./dapps/registry.js'], 'signaturereg': ['./dapps/signaturereg.js'], 'tokenreg': ['./dapps/tokenreg.js'], - // library - 'inject': ['./web3.js'], - 'web3': ['./web3.js'], - 'parity': ['./parity.js'], // app 'index': ['./index.js'] }, From 0c25060c6e44bf8b88c70e9d93c4087872f5b719 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 6 Nov 2016 17:42:50 +0100 Subject: [PATCH 2/2] Don't push empty tags to input (#3222) --- js/src/modals/EditMeta/editMeta.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js index ad893aa174e..7f0a061e2f8 100644 --- a/js/src/modals/EditMeta/editMeta.js +++ b/js/src/modals/EditMeta/editMeta.js @@ -99,11 +99,10 @@ export default class EditMeta extends Component { renderTags () { const { meta } = this.state; - const { tags } = meta || []; return (