Update JS dependencies (#3710)
* 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
Jaco Greeff
parent
52b4ce0dd7
commit
9a43e6d6c8
231
js/package.json
231
js/package.json
|
|
@ -47,132 +47,127 @@
|
|||
"prepush": "npm run lint:cached"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "~6.18.0",
|
||||
"babel-core": "~6.18.2",
|
||||
"babel-eslint": "~7.1.0",
|
||||
"babel-loader": "~6.2.3",
|
||||
"babel-plugin-lodash": "~3.2.2",
|
||||
"babel-plugin-transform-class-properties": "~6.19.0",
|
||||
"babel-plugin-transform-decorators-legacy": "~1.3.4",
|
||||
"babel-plugin-transform-react-remove-prop-types": "~0.2.9",
|
||||
"babel-plugin-transform-runtime": "~6.15.0",
|
||||
"babel-polyfill": "~6.16.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-cli": "6.18.0",
|
||||
"babel-core": "6.18.2",
|
||||
"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-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-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",
|
||||
"chai": "~3.5.0",
|
||||
"chai-enzyme": "0.4.2",
|
||||
"cheerio": "0.20.0",
|
||||
"copy-webpack-plugin": "~4.0.0",
|
||||
"core-js": "~2.4.1",
|
||||
"coveralls": "~2.11.11",
|
||||
"css-loader": "~0.26.0",
|
||||
"ejs-loader": "~0.3.0",
|
||||
"enzyme": "2.3.0",
|
||||
"eslint": "~3.10.2",
|
||||
"eslint-config-semistandard": "~7.0.0",
|
||||
"eslint-config-standard": "~6.2.1",
|
||||
"eslint-config-standard-react": "~4.2.0",
|
||||
"eslint-plugin-promise": "~3.4.0",
|
||||
"eslint-plugin-react": "~6.7.1",
|
||||
"eslint-plugin-standard": "~2.0.0",
|
||||
"express": "~4.14.0",
|
||||
"babel-runtime": "6.18.0",
|
||||
"chai": "3.5.0",
|
||||
"chai-enzyme": "0.6.1",
|
||||
"copy-webpack-plugin": "4.0.1",
|
||||
"core-js": "2.4.1",
|
||||
"coveralls": "2.11.15",
|
||||
"css-loader": "0.26.1",
|
||||
"ejs-loader": "0.3.0",
|
||||
"enzyme": "2.6.0",
|
||||
"eslint": "3.11.1",
|
||||
"eslint-config-semistandard": "7.0.0",
|
||||
"eslint-config-standard": "6.2.1",
|
||||
"eslint-config-standard-react": "4.2.0",
|
||||
"eslint-plugin-promise": "3.4.0",
|
||||
"eslint-plugin-react": "6.7.1",
|
||||
"eslint-plugin-standard": "2.0.1",
|
||||
"express": "4.14.0",
|
||||
"extract-loader": "0.1.0",
|
||||
"extract-text-webpack-plugin": "~2.0.0-beta.4",
|
||||
"file-loader": "~0.9.0",
|
||||
"fs-extra": "~0.30.0",
|
||||
"happypack": "~3.0.0",
|
||||
"history": "~2.0.0",
|
||||
"html-loader": "~0.4.4",
|
||||
"html-webpack-plugin": "~2.24.1",
|
||||
"http-proxy-middleware": "~0.17.2",
|
||||
"husky": "~0.11.9",
|
||||
"ignore-styles": "2.0.0",
|
||||
"image-webpack-loader": "~3.0.0",
|
||||
"istanbul": "~1.0.0-alpha.2",
|
||||
"jsdom": "9.2.1",
|
||||
"json-loader": "~0.5.4",
|
||||
"mocha": "~3.0.0-1",
|
||||
"extract-text-webpack-plugin": "2.0.0-beta.4",
|
||||
"file-loader": "0.9.0",
|
||||
"happypack": "3.0.0",
|
||||
"html-loader": "0.4.4",
|
||||
"html-webpack-plugin": "2.24.1",
|
||||
"http-proxy-middleware": "0.17.2",
|
||||
"husky": "0.11.9",
|
||||
"ignore-styles": "5.0.1",
|
||||
"image-webpack-loader": "3.0.0",
|
||||
"istanbul": "1.0.0-alpha.2",
|
||||
"jsdom": "9.8.3",
|
||||
"json-loader": "0.5.4",
|
||||
"mocha": "3.2.0",
|
||||
"mock-local-storage": "1.0.2",
|
||||
"mock-socket": "~3.0.1",
|
||||
"nock": "~8.0.0",
|
||||
"mock-socket": "6.0.3",
|
||||
"nock": "9.0.2",
|
||||
"postcss-import": "8.1.0",
|
||||
"postcss-loader": "~1.1.1",
|
||||
"postcss-nested": "~1.0.0",
|
||||
"postcss-simple-vars": "~3.0.0",
|
||||
"progress": "~1.1.8",
|
||||
"raw-loader": "~0.5.1",
|
||||
"react-addons-perf": "~15.4.1",
|
||||
"react-addons-test-utils": "~15.4.1",
|
||||
"react-hot-loader": "~3.0.0-beta.6",
|
||||
"rucksack-css": "~0.8.6",
|
||||
"sinon": "~1.17.4",
|
||||
"sinon-as-promised": "~4.0.2",
|
||||
"sinon-chai": "~2.8.0",
|
||||
"style-loader": "~0.13.0",
|
||||
"url-loader": "~0.5.7",
|
||||
"webpack": "~2.1.0-beta.27",
|
||||
"webpack-dev-middleware": "~1.8.4",
|
||||
"postcss-loader": "1.1.1",
|
||||
"postcss-nested": "1.0.0",
|
||||
"postcss-simple-vars": "3.0.0",
|
||||
"progress": "1.1.8",
|
||||
"raw-loader": "0.5.1",
|
||||
"react-addons-perf": "15.4.1",
|
||||
"react-addons-test-utils": "15.4.1",
|
||||
"react-hot-loader": "3.0.0-beta.6",
|
||||
"rucksack-css": "0.9.1",
|
||||
"sinon": "1.17.6",
|
||||
"sinon-as-promised": "4.0.2",
|
||||
"sinon-chai": "2.8.0",
|
||||
"style-loader": "0.13.1",
|
||||
"url-loader": "0.5.7",
|
||||
"webpack": "2.1.0-beta.27",
|
||||
"webpack-dev-middleware": "1.8.4",
|
||||
"webpack-error-notification": "0.1.6",
|
||||
"webpack-hot-middleware": "~2.13.2",
|
||||
"websocket": "~1.0.23"
|
||||
"webpack-hot-middleware": "2.13.2",
|
||||
"websocket": "1.0.23"
|
||||
},
|
||||
"dependencies": {
|
||||
"bignumber.js": "~2.3.0",
|
||||
"bignumber.js": "3.0.1",
|
||||
"blockies": "0.0.2",
|
||||
"brace": "~0.9.0",
|
||||
"bytes": "~2.4.0",
|
||||
"chart.js": "~2.3.0",
|
||||
"es6-error": "~4.0.0",
|
||||
"es6-promise": "~3.2.1",
|
||||
"ethereumjs-tx": "~1.1.2",
|
||||
"eventemitter3": "~2.0.2",
|
||||
"file-saver": "~1.3.3",
|
||||
"format-json": "~1.0.3",
|
||||
"format-number": "~2.0.1",
|
||||
"geopattern": "~1.2.3",
|
||||
"isomorphic-fetch": "~2.2.1",
|
||||
"js-sha3": "~0.5.2",
|
||||
"lodash": "~4.11.1",
|
||||
"marked": "~0.3.6",
|
||||
"material-ui": "~0.16.4",
|
||||
"material-ui-chip-input": "~0.11.1",
|
||||
"mobx": "~2.6.1",
|
||||
"mobx-react": "~3.5.8",
|
||||
"mobx-react-devtools": "~4.2.9",
|
||||
"moment": "~2.14.1",
|
||||
"phoneformat.js": "~1.0.3",
|
||||
"qs": "~6.3.0",
|
||||
"react": "~15.4.1",
|
||||
"react-ace": "~4.0.0",
|
||||
"react-addons-css-transition-group": "~15.4.1",
|
||||
"react-chartjs-2": "~1.5.0",
|
||||
"react-copy-to-clipboard": "~4.2.3",
|
||||
"react-dom": "~15.4.1",
|
||||
"react-dropzone": "~3.7.3",
|
||||
"react-redux": "~4.4.5",
|
||||
"react-router": "~2.6.1",
|
||||
"react-router-redux": "~4.0.5",
|
||||
"react-tap-event-plugin": "~2.0.1",
|
||||
"react-tooltip": "~2.0.3",
|
||||
"recharts": "~0.15.2",
|
||||
"redux": "~3.5.2",
|
||||
"redux-actions": "~0.10.1",
|
||||
"redux-thunk": "~2.1.0",
|
||||
"rlp": "~2.0.0",
|
||||
"scryptsy": "~2.0.0",
|
||||
"brace": "0.9.0",
|
||||
"bytes": "2.4.0",
|
||||
"es6-error": "4.0.0",
|
||||
"es6-promise": "4.0.5",
|
||||
"ethereumjs-tx": "1.1.4",
|
||||
"eventemitter3": "2.0.2",
|
||||
"file-saver": "1.3.3",
|
||||
"format-json": "1.0.3",
|
||||
"format-number": "2.0.1",
|
||||
"geopattern": "1.2.3",
|
||||
"isomorphic-fetch": "2.2.1",
|
||||
"js-sha3": "0.5.5",
|
||||
"lodash": "4.17.2",
|
||||
"marked": "0.3.6",
|
||||
"material-ui": "0.16.4",
|
||||
"material-ui-chip-input": "0.11.1",
|
||||
"mobx": "2.6.4",
|
||||
"mobx-react": "4.0.3",
|
||||
"mobx-react-devtools": "4.2.10",
|
||||
"moment": "2.17.0",
|
||||
"phoneformat.js": "1.0.3",
|
||||
"qs": "6.3.0",
|
||||
"react": "15.4.1",
|
||||
"react-ace": "4.1.0",
|
||||
"react-addons-css-transition-group": "15.4.1",
|
||||
"react-copy-to-clipboard": "4.2.3",
|
||||
"react-dom": "15.4.1",
|
||||
"react-dropzone": "3.7.3",
|
||||
"react-redux": "4.4.6",
|
||||
"react-router": "3.0.0",
|
||||
"react-router-redux": "4.0.7",
|
||||
"react-tap-event-plugin": "2.0.1",
|
||||
"react-tooltip": "3.2.2",
|
||||
"recharts": "0.15.2",
|
||||
"redux": "3.6.0",
|
||||
"redux-actions": "1.1.0",
|
||||
"redux-thunk": "2.1.0",
|
||||
"rlp": "2.0.0",
|
||||
"scryptsy": "2.0.0",
|
||||
"solc": "ngotchac/solc-js",
|
||||
"store": "~1.3.20",
|
||||
"utf8": "~2.1.1",
|
||||
"valid-url": "~1.0.9",
|
||||
"validator": "~5.7.0",
|
||||
"web3": "~0.17.0-beta",
|
||||
"whatwg-fetch": "~1.0.0",
|
||||
"worker-loader": "~0.7.1"
|
||||
"store": "1.3.20",
|
||||
"utf8": "2.1.2",
|
||||
"valid-url": "1.0.9",
|
||||
"validator": "6.2.0",
|
||||
"web3": "0.17.0-beta",
|
||||
"whatwg-fetch": "2.0.1",
|
||||
"worker-loader": "0.7.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@
|
|||
|
||||
import ReactDOM from 'react-dom';
|
||||
import React from 'react';
|
||||
import { createHashHistory } from 'history';
|
||||
import { Redirect, Router, Route, useRouterHistory } from 'react-router';
|
||||
import { Redirect, Router, Route, hashHistory } from 'react-router';
|
||||
|
||||
import injectTapEventPlugin from 'react-tap-event-plugin';
|
||||
injectTapEventPlugin();
|
||||
|
|
@ -27,14 +26,12 @@ import Application from './basiccoin/Application';
|
|||
import Overview from './basiccoin/Overview';
|
||||
import Transfer from './basiccoin/Transfer';
|
||||
|
||||
const routerHistory = useRouterHistory(createHashHistory)({});
|
||||
|
||||
import '../../assets/fonts/Roboto/font.css';
|
||||
import '../../assets/fonts/RobotoMono/font.css';
|
||||
import './style.css';
|
||||
|
||||
ReactDOM.render(
|
||||
<Router history={ routerHistory }>
|
||||
<Router history={ hashHistory }>
|
||||
<Redirect from='/' to='/overview' />
|
||||
<Route path='/' component={ Application }>
|
||||
<Route path='deploy' component={ Deploy } />
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@ import ReactDOM from 'react-dom';
|
|||
import { AppContainer } from 'react-hot-loader';
|
||||
|
||||
import injectTapEventPlugin from 'react-tap-event-plugin';
|
||||
import { createHashHistory } from 'history';
|
||||
import { useRouterHistory } from 'react-router';
|
||||
import { hashHistory } from 'react-router';
|
||||
import qs from 'querystring';
|
||||
|
||||
import SecureApi from './secureApi';
|
||||
|
|
@ -74,13 +73,11 @@ store.dispatch(setApi(api));
|
|||
|
||||
window.secureApi = api;
|
||||
|
||||
const routerHistory = useRouterHistory(createHashHistory)({});
|
||||
|
||||
ReactDOM.render(
|
||||
<AppContainer>
|
||||
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
|
||||
<MainApplication
|
||||
routerHistory={ routerHistory }
|
||||
routerHistory={ hashHistory }
|
||||
/>
|
||||
</ContextProvider>
|
||||
</AppContainer>,
|
||||
|
|
@ -88,24 +85,6 @@ ReactDOM.render(
|
|||
);
|
||||
|
||||
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', () => {
|
||||
require('./main.js');
|
||||
|
||||
|
|
@ -113,7 +92,7 @@ if (module.hot) {
|
|||
<AppContainer>
|
||||
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
|
||||
<MainApplication
|
||||
routerHistory={ routerHistory }
|
||||
routerHistory={ hashHistory }
|
||||
/>
|
||||
</ContextProvider>
|
||||
</AppContainer>,
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import 'mock-local-storage';
|
|||
import chai from 'chai';
|
||||
import chaiEnzyme from 'chai-enzyme';
|
||||
import sinonChai from 'sinon-chai';
|
||||
import { w3cwebsocket } from 'websocket';
|
||||
import { WebSocket } from 'mock-socket';
|
||||
import jsdom from 'jsdom';
|
||||
|
||||
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
|
||||
global.expect = chai.expect;
|
||||
global.WebSocket = w3cwebsocket;
|
||||
global.WebSocket = WebSocket;
|
||||
|
||||
// setup jsdom
|
||||
global.document = jsdom.jsdom('<!doctype html><html><body></body></html>');
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ let modules = [
|
|||
'blockies',
|
||||
'brace',
|
||||
'browserify-aes',
|
||||
'chart.js',
|
||||
'ethereumjs-tx',
|
||||
'lodash',
|
||||
'material-ui',
|
||||
|
|
|
|||
Loading…
Reference in New Issue