Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Update babel, fix CI build due to breaking changes (#3754)
Browse files Browse the repository at this point in the history
* Update babel to latest version

* Re-add circular deps plugin

* Bump for build

* Fixes for babel build
  • Loading branch information
jacogr committed Dec 9, 2016
1 parent e1ad347 commit f9a24f3
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 194 deletions.
1 change: 1 addition & 0 deletions js/.babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"transform-runtime",
"transform-decorators-legacy",
"transform-class-properties",
"transform-object-rest-spread",
"lodash"
],
"retainLines": true,
Expand Down
11 changes: 6 additions & 5 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/test.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// test script 4
// test script 6
9 changes: 4 additions & 5 deletions js/src/api/contract/contract.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down

This file was deleted.

28 changes: 0 additions & 28 deletions js/src/views/Status/components-compositors/Animated/Animated.js

This file was deleted.

63 changes: 0 additions & 63 deletions js/src/views/Status/components-compositors/Animated/children.js

This file was deleted.

17 changes: 0 additions & 17 deletions js/src/views/Status/components-compositors/Animated/index.js

This file was deleted.

31 changes: 12 additions & 19 deletions js/src/views/Status/components/Calls/Calls.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

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';
Expand Down Expand Up @@ -73,13 +72,11 @@ export default class Calls extends Component {
}

return (
<AnimateChildren>
<div { ...this._test('empty-wrapper') }>
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
Fire up some calls and the results will be here.
</h3>
</div>
</AnimateChildren>
<div { ...this._test('empty-wrapper') }>
<h3 className={ styles.historyInfo } { ...this._test('empty') }>
Fire up some calls and the results will be here.
</h3>
</div>
);
}

Expand All @@ -90,17 +87,13 @@ export default class Calls extends Component {
return;
}

return (
<AnimateChildren>
{ calls.map((call, idx) => (
<Call
key={ calls.length - idx }
call={ call }
setActiveCall={ this.setActiveCall }
/>
)) }
</AnimateChildren>
);
return calls.map((call, idx) => (
<Call
key={ calls.length - idx }
call={ call }
setActiveCall={ this.setActiveCall }
/>
));
}

clearActiveCall = () => {
Expand Down
8 changes: 7 additions & 1 deletion js/webpack/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit f9a24f3

Please sign in to comment.