From 14a4ddef671fd530bcd6ae4fc66338b1bb2c6590 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 9 Dec 2016 01:24:07 +0100 Subject: [PATCH 1/4] Update babel to latest version --- js/package.json | 7 +++---- js/scripts/test.js | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/package.json b/js/package.json index 62bf37b49de..a85c027f507 100644 --- a/js/package.json +++ b/js/package.json @@ -48,7 +48,7 @@ }, "devDependencies": { "babel-cli": "6.18.0", - "babel-core": "6.18.2", + "babel-core": "6.20.0", "babel-eslint": "7.1.1", "babel-loader": "6.2.8", "babel-plugin-lodash": "3.2.10", @@ -56,15 +56,14 @@ "babel-plugin-transform-decorators-legacy": "1.3.4", "babel-plugin-transform-react-remove-prop-types": "0.2.11", "babel-plugin-transform-runtime": "6.15.0", - "babel-polyfill": "6.16.0", + "babel-polyfill": "6.20.0", "babel-preset-es2015": "6.18.0", - "babel-preset-es2015-rollup": "1.2.0", "babel-preset-es2016": "6.16.0", "babel-preset-es2017": "6.16.0", "babel-preset-react": "6.16.0", "babel-preset-stage-0": "6.16.0", "babel-register": "6.18.0", - "babel-runtime": "6.18.0", + "babel-runtime": "6.20.0", "chai": "3.5.0", "chai-enzyme": "0.6.1", "copy-webpack-plugin": "4.0.1", diff --git a/js/scripts/test.js b/js/scripts/test.js index 318fd7c8465..d5c92c0c01f 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script 4 +// test script 5 From adb436905f075377285d16a4f79e37cc9633d28a Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 9 Dec 2016 01:37:32 +0100 Subject: [PATCH 2/4] Re-add circular deps plugin --- js/package.json | 1 + js/webpack/shared.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index a85c027f507..f92bab35188 100644 --- a/js/package.json +++ b/js/package.json @@ -66,6 +66,7 @@ "babel-runtime": "6.20.0", "chai": "3.5.0", "chai-enzyme": "0.6.1", + "circular-dependency-plugin": "2.0.0", "copy-webpack-plugin": "4.0.1", "core-js": "2.4.1", "coveralls": "2.11.15", diff --git a/js/webpack/shared.js b/js/webpack/shared.js index 8887c41fb6d..8b6807b2a0e 100644 --- a/js/webpack/shared.js +++ b/js/webpack/shared.js @@ -23,6 +23,7 @@ const postcssImport = require('postcss-import'); const postcssNested = require('postcss-nested'); const postcssVars = require('postcss-simple-vars'); const rucksack = require('rucksack-css'); +const CircularDependencyPlugin = require('circular-dependency-plugin'); const ENV = process.env.NODE_ENV || 'development'; const isProd = ENV === 'production'; @@ -102,7 +103,12 @@ function getPlugins (_isProd = isProd) { } }), - new webpack.optimize.OccurrenceOrderPlugin(!_isProd) + new webpack.optimize.OccurrenceOrderPlugin(!_isProd), + + new CircularDependencyPlugin({ + exclude: /node_modules/, + failOnError: true + }) ]; if (_isProd) { From 21e32b1be7f3db965a4963da85299ddecf6d4815 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 9 Dec 2016 01:39:11 +0100 Subject: [PATCH 3/4] Bump for build --- js/scripts/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/scripts/test.js b/js/scripts/test.js index d5c92c0c01f..78f2f99bd1a 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script 5 +// test script 6 From e171c8ea43cbe1e45a1e284fd768bf8e96ae88d2 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 9 Dec 2016 02:29:32 +0100 Subject: [PATCH 4/4] Fixes for babel build --- js/.babelrc | 1 + js/package.json | 3 +- js/src/api/contract/contract.js | 9 ++- .../Animated/AnimateChildren.css | 55 ---------------- .../Animated/Animated.js | 28 --------- .../Animated/children.js | 63 ------------------- .../components-compositors/Animated/index.js | 17 ----- js/src/views/Status/components/Calls/Calls.js | 31 ++++----- 8 files changed, 19 insertions(+), 188 deletions(-) delete mode 100644 js/src/views/Status/components-compositors/Animated/AnimateChildren.css delete mode 100644 js/src/views/Status/components-compositors/Animated/Animated.js delete mode 100644 js/src/views/Status/components-compositors/Animated/children.js delete mode 100644 js/src/views/Status/components-compositors/Animated/index.js diff --git a/js/.babelrc b/js/.babelrc index 2298d98c0d6..8147da4354c 100644 --- a/js/.babelrc +++ b/js/.babelrc @@ -7,6 +7,7 @@ "transform-runtime", "transform-decorators-legacy", "transform-class-properties", + "transform-object-rest-spread", "lodash" ], "retainLines": true, diff --git a/js/package.json b/js/package.json index f17f1955855..4cbac5a75d4 100644 --- a/js/package.json +++ b/js/package.json @@ -52,8 +52,9 @@ "babel-eslint": "7.1.1", "babel-loader": "6.2.8", "babel-plugin-lodash": "3.2.10", - "babel-plugin-transform-class-properties": "6.19.0", + "babel-plugin-transform-class-properties": "6.18.0", "babel-plugin-transform-decorators-legacy": "1.3.4", + "babel-plugin-transform-object-rest-spread": "6.20.2", "babel-plugin-transform-react-remove-prop-types": "0.2.11", "babel-plugin-transform-runtime": "6.15.0", "babel-polyfill": "6.20.0", diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js index ed922a02ccf..1185199e100 100644 --- a/js/src/api/contract/contract.js +++ b/js/src/api/contract/contract.js @@ -262,12 +262,11 @@ export default class Contract { } const options = this._getFilterOptions(event, _options); + options.fromBlock = 0; + options.toBlock = 'latest'; + return this._api.eth - .getLogs({ - fromBlock: 0, - toBlock: 'latest', - ...options - }) + .getLogs(options) .then((logs) => this.parseEventLogs(logs)); } diff --git a/js/src/views/Status/components-compositors/Animated/AnimateChildren.css b/js/src/views/Status/components-compositors/Animated/AnimateChildren.css deleted file mode 100644 index 5d7b5b39ae4..00000000000 --- a/js/src/views/Status/components-compositors/Animated/AnimateChildren.css +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2015, 2016 Ethcore (UK) Ltd. -/* This file is part of Parity. -/* -/* Parity is free software: you can redistribute it and/or modify -/* it under the terms of the GNU General Public License as published by -/* the Free Software Foundation, either version 3 of the License, or -/* (at your option) any later version. -/* -/* Parity is distributed in the hope that it will be useful, -/* but WITHOUT ANY WARRANTY; without even the implied warranty of -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -/* GNU General Public License for more details. -/* -/* You should have received a copy of the GNU General Public License -/* along with Parity. If not, see . -*/ -/* todo [adgo] - make local */ -:global .transition-appear { - opacity: 0.01; -} - -:global .transition-appear.transition-appear-active { - opacity: 1; - transition: opacity .3s ease-in-out; -} - -:global .transition-enter { - opacity: 0.01; -} - -:global .transition-enter.transition-enter-active { - opacity: 1; - transition: opacity .3s ease-in-out; -} - -:global .transition-leave { - opacity: 1; -} - -:global .transition-leave.transition-leave-active { - opacity: 0.01; - transition: opacity .3s ease-in-out; -} - -:global .absoluteAnimationContainer { - position: relative; -} - -:global .absoluteAnimationContainer > .transition-leave { - position: absolute; - top: 0; - left: 0; - right: 0; - width: 100%; -} diff --git a/js/src/views/Status/components-compositors/Animated/Animated.js b/js/src/views/Status/components-compositors/Animated/Animated.js deleted file mode 100644 index c22344c0150..00000000000 --- a/js/src/views/Status/components-compositors/Animated/Animated.js +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -import React, { Component } from 'react'; -import AnimateChildren from './children'; - -export default Wrapped => class Animated extends Component { - render () { - return ( - - - - ); - } -}; diff --git a/js/src/views/Status/components-compositors/Animated/children.js b/js/src/views/Status/components-compositors/Animated/children.js deleted file mode 100644 index be7f910bfec..00000000000 --- a/js/src/views/Status/components-compositors/Animated/children.js +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -import React, { Component, PropTypes } from 'react'; -import { isReactComponent } from '../../util/react'; -import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; -import './AnimateChildren.css'; - -export default class AnimateChildren extends Component { - render () { - const className = this.props.absolute ? 'absoluteAnimationContainer' : ''; - return ( - - { this.renderChildren() } - - ); - } - - renderChildren () { - const { children, isView } = this.props; - - if (isView) { - return React.cloneElement(this.props.children, { - key: this.props.pathname - }); - } - - if (isReactComponent(children)) { - return React.cloneElement(this.props.children, { ...this.props }); - } - - return children; - } - - static propTypes = { - children: PropTypes.any.isRequired, - pathname: PropTypes.string, - isView: PropTypes.bool, - absolute: PropTypes.bool - } - -} diff --git a/js/src/views/Status/components-compositors/Animated/index.js b/js/src/views/Status/components-compositors/Animated/index.js deleted file mode 100644 index ee48d0704a3..00000000000 --- a/js/src/views/Status/components-compositors/Animated/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -export default from './Animated'; diff --git a/js/src/views/Status/components/Calls/Calls.js b/js/src/views/Status/components/Calls/Calls.js index 7734104ec81..1115ec63235 100644 --- a/js/src/views/Status/components/Calls/Calls.js +++ b/js/src/views/Status/components/Calls/Calls.js @@ -15,7 +15,6 @@ // along with Parity. If not, see . import React, { Component, PropTypes } from 'react'; -import AnimateChildren from '../../components-compositors/Animated/children'; import Call from '../Call'; import CallsToolbar from '../CallsToolbar'; import styles from './Calls.css'; @@ -73,13 +72,11 @@ export default class Calls extends Component { } return ( - -
-

- Fire up some calls and the results will be here. -

-
- +
+

+ Fire up some calls and the results will be here. +

+
); } @@ -90,17 +87,13 @@ export default class Calls extends Component { return; } - return ( - - { calls.map((call, idx) => ( - - )) } - - ); + return calls.map((call, idx) => ( + + )); } clearActiveCall = () => {