diff --git a/js/.babelrc b/js/.babelrc
index 2298d98c0..8147da435 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 a758936f2..4cbac5a75 100644
--- a/js/package.json
+++ b/js/package.json
@@ -48,25 +48,26 @@
},
"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",
- "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.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",
+ "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/scripts/test.js b/js/scripts/test.js
index 318fd7c84..78f2f99bd 100644
--- a/js/scripts/test.js
+++ b/js/scripts/test.js
@@ -1 +1 @@
-// test script 4
+// test script 6
diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
index 2ef24c685..873dac38c 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 5d7b5b39a..000000000
--- 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 c22344c01..000000000
--- 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 be7f910bf..000000000
--- 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 ee48d0704..000000000
--- 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 7734104ec..1115ec632 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 = () => {
diff --git a/js/webpack/shared.js b/js/webpack/shared.js
index 8887c41fb..8b6807b2a 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) {