grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update JS dependencies (#3710)

Browse Source 
* Minor Versions NPM updates

* Remove unused packages

* No longer relevant JS test

* Update some major versions // Revert Rechartjs

* Update Redux/React-{Ace, RouterRedux}

* Updated React Tooltips

* Update mock-socket // Update tests to pass

* Updated React Router

* Removed `history` module that isn't necessary (instead of updating it)

* Updated redux-actions

* Removed commented hot store reload
This commit is contained in:
Nicolas Gotchac 2016-12-05 11:48:43 +01:00 committed by Jaco Greeff
parent 52b4ce0dd7
commit 9a43e6d6c8
6 changed files with 121 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/.npmrc
View File

@ -1 +1 @@
save-prefix='~' save-prefix=''

231
js/package.json
View File

@ -47,132 +47,127 @@
"prepush": "npm run lint:cached" "prepush": "npm run lint:cached"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "~6.18.0", "babel-cli": "6.18.0",
"babel-core": "~6.18.2", "babel-core": "6.18.2",
"babel-eslint": "~7.1.0", "babel-eslint": "7.1.1",
"babel-loader": "~6.2.3", "babel-loader": "6.2.8",
"babel-plugin-lodash": "~3.2.2", "babel-plugin-lodash": "3.2.10",
"babel-plugin-transform-class-properties": "~6.19.0", "babel-plugin-transform-class-properties": "6.19.0",
"babel-plugin-transform-decorators-legacy": "~1.3.4", "babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-plugin-transform-react-remove-prop-types": "~0.2.9", "babel-plugin-transform-react-remove-prop-types": "0.2.11",
"babel-plugin-transform-runtime": "~6.15.0", "babel-plugin-transform-runtime": "6.15.0",
"babel-polyfill": "~6.16.0", "babel-polyfill": "6.16.0",
"babel-preset-es2015": "~6.18.0", "babel-preset-es2015": "6.18.0",
"babel-preset-es2015-rollup": "~1.2.0", "babel-preset-es2015-rollup": "1.2.0",
"babel-preset-es2016": "~6.16.0", "babel-preset-es2016": "6.16.0",
"babel-preset-es2017": "~6.16.0", "babel-preset-es2017": "6.16.0",
"babel-preset-react": "~6.16.0", "babel-preset-react": "6.16.0",
"babel-preset-stage-0": "~6.16.0", "babel-preset-stage-0": "6.16.0",
"babel-register": "6.18.0", "babel-register": "6.18.0",
"babel-runtime": "~6.18.0", "babel-runtime": "6.18.0",
"chai": "~3.5.0", "chai": "3.5.0",
"chai-enzyme": "0.4.2", "chai-enzyme": "0.6.1",
"cheerio": "0.20.0", "copy-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "~4.0.0", "core-js": "2.4.1",
"core-js": "~2.4.1", "coveralls": "2.11.15",
"coveralls": "~2.11.11", "css-loader": "0.26.1",
"css-loader": "~0.26.0", "ejs-loader": "0.3.0",
"ejs-loader": "~0.3.0", "enzyme": "2.6.0",
"enzyme": "2.3.0", "eslint": "3.11.1",
"eslint": "~3.10.2", "eslint-config-semistandard": "7.0.0",
"eslint-config-semistandard": "~7.0.0", "eslint-config-standard": "6.2.1",
"eslint-config-standard": "~6.2.1", "eslint-config-standard-react": "4.2.0",
"eslint-config-standard-react": "~4.2.0", "eslint-plugin-promise": "3.4.0",
"eslint-plugin-promise": "~3.4.0", "eslint-plugin-react": "6.7.1",
"eslint-plugin-react": "~6.7.1", "eslint-plugin-standard": "2.0.1",
"eslint-plugin-standard": "~2.0.0", "express": "4.14.0",
"express": "~4.14.0",
"extract-loader": "0.1.0", "extract-loader": "0.1.0",
"extract-text-webpack-plugin": "~2.0.0-beta.4", "extract-text-webpack-plugin": "2.0.0-beta.4",
"file-loader": "~0.9.0", "file-loader": "0.9.0",
"fs-extra": "~0.30.0", "happypack": "3.0.0",
"happypack": "~3.0.0", "html-loader": "0.4.4",
"history": "~2.0.0", "html-webpack-plugin": "2.24.1",
"html-loader": "~0.4.4", "http-proxy-middleware": "0.17.2",
"html-webpack-plugin": "~2.24.1", "husky": "0.11.9",
"http-proxy-middleware": "~0.17.2", "ignore-styles": "5.0.1",
"husky": "~0.11.9", "image-webpack-loader": "3.0.0",
"ignore-styles": "2.0.0", "istanbul": "1.0.0-alpha.2",
"image-webpack-loader": "~3.0.0", "jsdom": "9.8.3",
"istanbul": "~1.0.0-alpha.2", "json-loader": "0.5.4",
"jsdom": "9.2.1", "mocha": "3.2.0",
"json-loader": "~0.5.4",
"mocha": "~3.0.0-1",
"mock-local-storage": "1.0.2", "mock-local-storage": "1.0.2",
"mock-socket": "~3.0.1", "mock-socket": "6.0.3",
"nock": "~8.0.0", "nock": "9.0.2",
"postcss-import": "8.1.0", "postcss-import": "8.1.0",
"postcss-loader": "~1.1.1", "postcss-loader": "1.1.1",
"postcss-nested": "~1.0.0", "postcss-nested": "1.0.0",
"postcss-simple-vars": "~3.0.0", "postcss-simple-vars": "3.0.0",
"progress": "~1.1.8", "progress": "1.1.8",
"raw-loader": "~0.5.1", "raw-loader": "0.5.1",
"react-addons-perf": "~15.4.1", "react-addons-perf": "15.4.1",
"react-addons-test-utils": "~15.4.1", "react-addons-test-utils": "15.4.1",
"react-hot-loader": "~3.0.0-beta.6", "react-hot-loader": "3.0.0-beta.6",
"rucksack-css": "~0.8.6", "rucksack-css": "0.9.1",
"sinon": "~1.17.4", "sinon": "1.17.6",
"sinon-as-promised": "~4.0.2", "sinon-as-promised": "4.0.2",
"sinon-chai": "~2.8.0", "sinon-chai": "2.8.0",
"style-loader": "~0.13.0", "style-loader": "0.13.1",
"url-loader": "~0.5.7", "url-loader": "0.5.7",
"webpack": "~2.1.0-beta.27", "webpack": "2.1.0-beta.27",
"webpack-dev-middleware": "~1.8.4", "webpack-dev-middleware": "1.8.4",
"webpack-error-notification": "0.1.6", "webpack-error-notification": "0.1.6",
"webpack-hot-middleware": "~2.13.2", "webpack-hot-middleware": "2.13.2",
"websocket": "~1.0.23" "websocket": "1.0.23"
}, },
"dependencies": { "dependencies": {
"bignumber.js": "~2.3.0", "bignumber.js": "3.0.1",
"blockies": "0.0.2", "blockies": "0.0.2",
"brace": "~0.9.0", "brace": "0.9.0",
"bytes": "~2.4.0", "bytes": "2.4.0",
"chart.js": "~2.3.0", "es6-error": "4.0.0",
"es6-error": "~4.0.0", "es6-promise": "4.0.5",
"es6-promise": "~3.2.1", "ethereumjs-tx": "1.1.4",
"ethereumjs-tx": "~1.1.2", "eventemitter3": "2.0.2",
"eventemitter3": "~2.0.2", "file-saver": "1.3.3",
"file-saver": "~1.3.3", "format-json": "1.0.3",
"format-json": "~1.0.3", "format-number": "2.0.1",
"format-number": "~2.0.1", "geopattern": "1.2.3",
"geopattern": "~1.2.3", "isomorphic-fetch": "2.2.1",
"isomorphic-fetch": "~2.2.1", "js-sha3": "0.5.5",
"js-sha3": "~0.5.2", "lodash": "4.17.2",
"lodash": "~4.11.1", "marked": "0.3.6",
"marked": "~0.3.6", "material-ui": "0.16.4",
"material-ui": "~0.16.4", "material-ui-chip-input": "0.11.1",
"material-ui-chip-input": "~0.11.1", "mobx": "2.6.4",
"mobx": "~2.6.1", "mobx-react": "4.0.3",
"mobx-react": "~3.5.8", "mobx-react-devtools": "4.2.10",
"mobx-react-devtools": "~4.2.9", "moment": "2.17.0",
"moment": "~2.14.1", "phoneformat.js": "1.0.3",
"phoneformat.js": "~1.0.3", "qs": "6.3.0",
"qs": "~6.3.0", "react": "15.4.1",
"react": "~15.4.1", "react-ace": "4.1.0",
"react-ace": "~4.0.0", "react-addons-css-transition-group": "15.4.1",
"react-addons-css-transition-group": "~15.4.1", "react-copy-to-clipboard": "4.2.3",
"react-chartjs-2": "~1.5.0", "react-dom": "15.4.1",
"react-copy-to-clipboard": "~4.2.3", "react-dropzone": "3.7.3",
"react-dom": "~15.4.1", "react-redux": "4.4.6",
"react-dropzone": "~3.7.3", "react-router": "3.0.0",
"react-redux": "~4.4.5", "react-router-redux": "4.0.7",
"react-router": "~2.6.1", "react-tap-event-plugin": "2.0.1",
"react-router-redux": "~4.0.5", "react-tooltip": "3.2.2",
"react-tap-event-plugin": "~2.0.1", "recharts": "0.15.2",
"react-tooltip": "~2.0.3", "redux": "3.6.0",
"recharts": "~0.15.2", "redux-actions": "1.1.0",
"redux": "~3.5.2", "redux-thunk": "2.1.0",
"redux-actions": "~0.10.1", "rlp": "2.0.0",
"redux-thunk": "~2.1.0", "scryptsy": "2.0.0",
"rlp": "~2.0.0",
"scryptsy": "~2.0.0",
"solc": "ngotchac/solc-js", "solc": "ngotchac/solc-js",
"store": "~1.3.20", "store": "1.3.20",
"utf8": "~2.1.1", "utf8": "2.1.2",
"valid-url": "~1.0.9", "valid-url": "1.0.9",
"validator": "~5.7.0", "validator": "6.2.0",
"web3": "~0.17.0-beta", "web3": "0.17.0-beta",
"whatwg-fetch": "~1.0.0", "whatwg-fetch": "2.0.1",
"worker-loader": "~0.7.1" "worker-loader": "0.7.1"
} }
} }

7
js/src/dapps/basiccoin.js
View File

@ -16,8 +16,7 @@
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import React from 'react'; import React from 'react';
import { createHashHistory } from 'history'; import { Redirect, Router, Route, hashHistory } from 'react-router';
import { Redirect, Router, Route, useRouterHistory } from 'react-router';
import injectTapEventPlugin from 'react-tap-event-plugin'; import injectTapEventPlugin from 'react-tap-event-plugin';
injectTapEventPlugin(); injectTapEventPlugin();
@ -27,14 +26,12 @@ import Application from './basiccoin/Application';
import Overview from './basiccoin/Overview'; import Overview from './basiccoin/Overview';
import Transfer from './basiccoin/Transfer'; import Transfer from './basiccoin/Transfer';
const routerHistory = useRouterHistory(createHashHistory)({});
import '../../assets/fonts/Roboto/font.css'; import '../../assets/fonts/Roboto/font.css';
import '../../assets/fonts/RobotoMono/font.css'; import '../../assets/fonts/RobotoMono/font.css';
import './style.css'; import './style.css';
ReactDOM.render( ReactDOM.render(
<Router history={ routerHistory }> <Router history={ hashHistory }>
<Redirect from='/' to='/overview' /> <Redirect from='/' to='/overview' />
<Route path='/' component={ Application }> <Route path='/' component={ Application }>
<Route path='deploy' component={ Deploy } /> <Route path='deploy' component={ Deploy } />

27
js/src/index.js
View File

@ -25,8 +25,7 @@ import ReactDOM from 'react-dom';
import { AppContainer } from 'react-hot-loader'; import { AppContainer } from 'react-hot-loader';
import injectTapEventPlugin from 'react-tap-event-plugin'; import injectTapEventPlugin from 'react-tap-event-plugin';
import { createHashHistory } from 'history'; import { hashHistory } from 'react-router';
import { useRouterHistory } from 'react-router';
import qs from 'querystring'; import qs from 'querystring';
import SecureApi from './secureApi'; import SecureApi from './secureApi';
@ -74,13 +73,11 @@ store.dispatch(setApi(api));
window.secureApi = api; window.secureApi = api;
const routerHistory = useRouterHistory(createHashHistory)({});
ReactDOM.render( ReactDOM.render(
<AppContainer> <AppContainer>
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }> <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
<MainApplication <MainApplication
routerHistory={ routerHistory } routerHistory={ hashHistory }
/> />
</ContextProvider> </ContextProvider>
</AppContainer>, </AppContainer>,
@ -88,24 +85,6 @@ ReactDOM.render(
); );
if (module.hot) { if (module.hot) {
// module.hot.accept('./redux', () => {
// // redux store has a method replaceReducer
// // const newStore = initStore(api);
// console.warn('REDUX UPDATE');
// // store.replaceReducer(appReducer);
// // ReactDOM.render(
// // <AppContainer>
// // <ContextProvider api={ api } muiTheme={ muiTheme } store={ newStore }>
// // <MainApplication
// // routerHistory={ routerHistory }
// // />
// // </ContextProvider>
// // </AppContainer>,
// // document.querySelector('#container')
// // );
// });
module.hot.accept('./main.js', () => { module.hot.accept('./main.js', () => {
require('./main.js'); require('./main.js');
@ -113,7 +92,7 @@ if (module.hot) {
<AppContainer> <AppContainer>
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }> <ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
<MainApplication <MainApplication
routerHistory={ routerHistory } routerHistory={ hashHistory }
/> />
</ContextProvider> </ContextProvider>
</AppContainer>, </AppContainer>,

4
js/test/mocha.config.js
View File

@ -24,7 +24,7 @@ import 'mock-local-storage';
import chai from 'chai'; import chai from 'chai';
import chaiEnzyme from 'chai-enzyme'; import chaiEnzyme from 'chai-enzyme';
import sinonChai from 'sinon-chai'; import sinonChai from 'sinon-chai';
import { w3cwebsocket } from 'websocket'; import { WebSocket } from 'mock-socket';
import jsdom from 'jsdom'; import jsdom from 'jsdom';
chai.use(chaiEnzyme()); chai.use(chaiEnzyme());
@ -32,7 +32,7 @@ chai.use(sinonChai);
// expose expect to global so we won't have to manually import & define it in every test // expose expect to global so we won't have to manually import & define it in every test
global.expect = chai.expect; global.expect = chai.expect;
global.WebSocket = w3cwebsocket; global.WebSocket = WebSocket;
// setup jsdom // setup jsdom
global.document = jsdom.jsdom('<!doctype html><html><body></body></html>'); global.document = jsdom.jsdom('<!doctype html><html><body></body></html>');

1
js/webpack/vendor.js
View File

@ -28,7 +28,6 @@ let modules = [
'blockies', 'blockies',
'brace', 'brace',
'browserify-aes', 'browserify-aes',
'chart.js',
'ethereumjs-tx', 'ethereumjs-tx',
'lodash', 'lodash',
'material-ui', 'material-ui',