From fa6599c560f0a0dd3c476731b815f68a254fa4ab Mon Sep 17 00:00:00 2001 From: Dan Graham Date: Thu, 13 Dec 2018 20:36:04 -0800 Subject: [PATCH] Upgrade React to 16, plus upgrade related components (#769) --- app/renderer/actions/Inspector.js | 2 +- app/renderer/actions/ServerMonitor.js | 2 +- app/renderer/actions/Session.js | 2 +- app/renderer/actions/StartServer.js | 2 +- app/renderer/actions/index.js | 15 + app/renderer/containers/App.js | 7 +- app/renderer/containers/Root.js | 44 + app/renderer/index.js | 62 +- app/renderer/reducers/index.js | 24 +- app/renderer/routes.js | 21 +- .../store/configureStore.development.js | 71 +- app/renderer/store/configureStore.js | 12 + .../store/configureStore.production.js | 15 +- app/renderer/store/store.js | 3 - package-lock.json | 884 +++++++++++------- package.json | 22 +- 16 files changed, 755 insertions(+), 433 deletions(-) create mode 100644 app/renderer/actions/index.js create mode 100644 app/renderer/containers/Root.js delete mode 100644 app/renderer/store/store.js diff --git a/app/renderer/actions/Inspector.js b/app/renderer/actions/Inspector.js index 749a089ac..4a896948f 100644 --- a/app/renderer/actions/Inspector.js +++ b/app/renderer/actions/Inspector.js @@ -1,6 +1,6 @@ import { ipcRenderer } from 'electron'; import { notification } from 'antd'; -import { push } from 'react-router-redux'; +import { push } from 'connected-react-router'; import _ from 'lodash'; import B from 'bluebird'; import { getLocators } from '../components/Inspector/shared'; diff --git a/app/renderer/actions/ServerMonitor.js b/app/renderer/actions/ServerMonitor.js index 396fa5a24..60a8be646 100644 --- a/app/renderer/actions/ServerMonitor.js +++ b/app/renderer/actions/ServerMonitor.js @@ -1,5 +1,5 @@ import { ipcRenderer, shell } from 'electron'; -import { push } from 'react-router-redux'; +import { push } from 'connected-react-router'; export const SERVER_STOP_REQ = 'SERVER_STOP_REQ'; export const SERVER_STOP_OK = 'SERVER_STOP_OK'; diff --git a/app/renderer/actions/Session.js b/app/renderer/actions/Session.js index c39c740cc..2b407dd28 100644 --- a/app/renderer/actions/Session.js +++ b/app/renderer/actions/Session.js @@ -1,7 +1,7 @@ import { ipcRenderer } from 'electron'; import settings from '../../shared/settings'; import { v4 as UUID } from 'uuid'; -import { push } from 'react-router-redux'; +import { push } from 'connected-react-router'; import { notification } from 'antd'; import { debounce, toPairs } from 'lodash'; import { setSessionDetails } from './Inspector'; diff --git a/app/renderer/actions/StartServer.js b/app/renderer/actions/StartServer.js index e9d80d52c..d25507f8c 100644 --- a/app/renderer/actions/StartServer.js +++ b/app/renderer/actions/StartServer.js @@ -1,6 +1,6 @@ /* eslint-disable no-console */ import { ipcRenderer } from 'electron'; -import { push } from 'react-router-redux'; +import { push } from 'connected-react-router'; import { serverLogsReceived, clearLogs, setServerArgs } from './ServerMonitor'; import settings from '../../shared/settings'; diff --git a/app/renderer/actions/index.js b/app/renderer/actions/index.js new file mode 100644 index 000000000..65cc3be09 --- /dev/null +++ b/app/renderer/actions/index.js @@ -0,0 +1,15 @@ +import * as configActions from '../actions/Config'; +import * as inspectorActions from '../actions/Inspector'; +import * as serverMonitorActions from '../actions/ServerMonitor'; +import * as sessionActions from '../actions/Session'; +import * as startServerActions from '../actions/StartServer'; +import * as updaterActions from '../actions/Updater'; + +export default { + ...configActions, + ...inspectorActions, + ...serverMonitorActions, + ...sessionActions, + ...startServerActions, + ...updaterActions, +}; \ No newline at end of file diff --git a/app/renderer/containers/App.js b/app/renderer/containers/App.js index 1a34724ac..f6fafcc25 100644 --- a/app/renderer/containers/App.js +++ b/app/renderer/containers/App.js @@ -1,9 +1,10 @@ -import { Component } from 'react'; +import * as React from 'react'; import PropTypes from 'prop-types'; -export default class App extends Component { +export default class App extends React.Component { render () { - return this.props.children; + const { children } = this.props; + return {children}; } } diff --git a/app/renderer/containers/Root.js b/app/renderer/containers/Root.js new file mode 100644 index 000000000..552b17a27 --- /dev/null +++ b/app/renderer/containers/Root.js @@ -0,0 +1,44 @@ +import React, { Component } from 'react'; +import { Provider } from 'react-redux'; +import { ConnectedRouter } from 'connected-react-router'; +import Routes from '../routes'; +import WrongFolder from '../components/WrongFolder/WrongFolder'; +import electron from 'electron'; + +const { app } = electron.remote; +const isDev = process.env.NODE_ENV === 'development'; + +function shouldShowWrongFolderComponent () { + // If we set an ENV to show wrong folder + if (process.env.WRONG_FOLDER) { + return true; + } + + // If we set an ENV to require it to NOT be shown don't show it + if (process.env.FORCE_NO_WRONG_FOLDER) { + return false; + } + + return (app.isInApplicationsFolder && !app.isInApplicationsFolder()) && !isDev; +} + +export default class Root extends Component { + render () { + const { store, history } = this.props; + return ( + + {shouldShowWrongFolderComponent() ? + : + + + + } + + ); + } +} + +/*Root.propTypes = { + store: PropTypes.element.isRequired, + history: PropTypes.element.isRequired, +};*/ \ No newline at end of file diff --git a/app/renderer/index.js b/app/renderer/index.js index 44885106d..46ebe6f81 100644 --- a/app/renderer/index.js +++ b/app/renderer/index.js @@ -1,49 +1,29 @@ import React from 'react'; import { render } from 'react-dom'; -import { Provider } from 'react-redux'; -import { Router, hashHistory } from 'react-router'; -import { syncHistoryWithStore } from 'react-router-redux'; -import electron from 'electron'; -import WrongFolder from './components/WrongFolder/WrongFolder'; -import routes from './routes'; -import store from './store/store'; +import Root from './containers/Root'; +import { AppContainer } from 'react-hot-loader'; +import Store from './store/configureStore'; -const { app } = electron.remote; -const isDev = process.env.NODE_ENV === 'development'; -const history = syncHistoryWithStore(hashHistory, store); +const { history, configureStore } = Store; -function shouldShowWrongFolderComponent () { - // If we set an ENV to show wrong folder - if (process.env.WRONG_FOLDER) { - return true; - } +const store = configureStore(); - // If we set an ENV to require it to NOT be shown don't show it - if (process.env.FORCE_NO_WRONG_FOLDER) { - return false; - } - - return (app.isInApplicationsFolder && !app.isInApplicationsFolder()) && !isDev; -} - -const router = - {routes} -; - -function renderApp () { - render( - - {shouldShowWrongFolderComponent() ? - : - router - } - , - document.getElementById('root') - ); -} - -renderApp(); +render( + + + , + document.getElementById('root') +); if (module.hot) { - module.hot.accept(renderApp); + module.hot.accept('./containers/Root', () => { + // eslint-disable-next-line global-require + const NextRoot = require('./containers/Root').default; + render( + + + , + document.getElementById('root') + ); + }); } diff --git a/app/renderer/reducers/index.js b/app/renderer/reducers/index.js index a80b1a570..083c865e6 100644 --- a/app/renderer/reducers/index.js +++ b/app/renderer/reducers/index.js @@ -1,5 +1,5 @@ import { combineReducers } from 'redux'; -import { routerReducer as routing } from 'react-router-redux'; +import { connectRouter } from 'connected-react-router'; import startServer from './StartServer'; import serverMonitor from './ServerMonitor'; import session from './Session'; @@ -8,14 +8,14 @@ import updater from './Updater'; import config from './Config'; // create our root reducer -const rootReducer = combineReducers({ - routing, - startServer, - serverMonitor, - session, - inspector, - updater, - config, -}); - -export default rootReducer; +export default function createRootReducer (history) { + return combineReducers({ + router: connectRouter(history), + startServer, + serverMonitor, + session, + inspector, + updater, + config, + }); +} diff --git a/app/renderer/routes.js b/app/renderer/routes.js index 27b6f0cad..fe765a096 100644 --- a/app/renderer/routes.js +++ b/app/renderer/routes.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Route, IndexRoute } from 'react-router'; +import { Switch, Route } from 'react-router'; import App from './containers/App'; import StartServerPage from './containers/StartServerPage'; import ServerMonitorPage from './containers/ServerMonitorPage'; @@ -7,11 +7,14 @@ import SessionPage from './containers/SessionPage'; import InspectorPage from './containers/InspectorPage'; import ConfigPage from './containers/ConfigPage'; - -export default - - - - - -; +export default () => ( + + + + + + + + + +); diff --git a/app/renderer/store/configureStore.development.js b/app/renderer/store/configureStore.development.js index 285ea91e4..ccb7e094e 100644 --- a/app/renderer/store/configureStore.development.js +++ b/app/renderer/store/configureStore.development.js @@ -1,30 +1,69 @@ import { createStore, applyMiddleware, compose } from 'redux'; import thunk from 'redux-thunk'; +import { createHashHistory } from 'history'; +import { routerMiddleware, routerActions } from 'connected-react-router'; import { createLogger } from 'redux-logger'; -import { hashHistory } from 'react-router'; -import { routerMiddleware } from 'react-router-redux'; -import rootReducer from '../reducers'; +import actions from '../actions'; +import createRootReducer from '../reducers'; -const logger = createLogger({ - level: 'info', - collapsed: true, -}); +const history = createHashHistory(); -const router = routerMiddleware(hashHistory); +const rootReducer = createRootReducer(history); -const enhancer = compose( - applyMiddleware(thunk, router, logger), - window.devToolsExtension ? window.devToolsExtension() : (noop) => noop -); +const configureStore = (initialState) => { + // Redux Configuration + const middleware = []; + const enhancers = []; -export default function configureStore (initialState) { + // Thunk Middleware + middleware.push(thunk); + + // Logging Middleware + const logger = createLogger({ + level: 'info', + collapsed: true + }); + + // Skip redux logs in console during the tests + if (process.env.NODE_ENV !== 'test') { + middleware.push(logger); + } + + // Router Middleware + const router = routerMiddleware(history); + middleware.push(router); + + // Redux DevTools Configuration + const actionCreators = { + ...actions, + ...routerActions + }; + // If Redux DevTools Extension is installed use it, otherwise use Redux compose + /* eslint-disable no-underscore-dangle */ + const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ + ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ + // Options: http://extension.remotedev.io/docs/API/Arguments.html + actionCreators + }) + : compose; + /* eslint-enable no-underscore-dangle */ + + // Apply Middleware & Compose Enhancers + enhancers.push(applyMiddleware(...middleware)); + const enhancer = composeEnhancers(...enhancers); + + // Create Store const store = createStore(rootReducer, initialState, enhancer); if (module.hot) { - module.hot.accept('../reducers', () => - store.replaceReducer(require('../reducers')) // eslint-disable-line global-require + module.hot.accept( + '../reducers', + // eslint-disable-next-line global-require + () => store.replaceReducer(require('../reducers').default) ); } return store; -} +}; + +export default { configureStore, history }; \ No newline at end of file diff --git a/app/renderer/store/configureStore.js b/app/renderer/store/configureStore.js index eca511fcc..1892f9671 100644 --- a/app/renderer/store/configureStore.js +++ b/app/renderer/store/configureStore.js @@ -1,3 +1,15 @@ +import configureStoreDev from './configureStore.development'; +import configureStoreProd from './configureStore.production'; + +const selectedConfigureStore = + process.env.NODE_ENV === 'production' + ? configureStoreProd + : configureStoreDev; + +export const { configureStore } = selectedConfigureStore; + +export const { history } = selectedConfigureStore; + if (process.env.NODE_ENV === 'production') { module.exports = require('./configureStore.production'); // eslint-disable-line global-require } else { diff --git a/app/renderer/store/configureStore.production.js b/app/renderer/store/configureStore.production.js index 7ef15c333..3dcb8baf1 100644 --- a/app/renderer/store/configureStore.production.js +++ b/app/renderer/store/configureStore.production.js @@ -1,13 +1,16 @@ import { createStore, applyMiddleware } from 'redux'; import thunk from 'redux-thunk'; -import { hashHistory } from 'react-router'; -import { routerMiddleware } from 'react-router-redux'; -import rootReducer from '../reducers'; - -const router = routerMiddleware(hashHistory); +import { createHashHistory } from 'history'; +import { routerMiddleware } from 'connected-react-router'; +import createRootReducer from '../reducers'; +const history = createHashHistory(); +const rootReducer = createRootReducer(history); +const router = routerMiddleware(history); const enhancer = applyMiddleware(thunk, router); -export default function configureStore (initialState) { +function configureStore (initialState) { return createStore(rootReducer, initialState, enhancer); } + +export default { configureStore, history }; \ No newline at end of file diff --git a/app/renderer/store/store.js b/app/renderer/store/store.js deleted file mode 100644 index 45cd6f6e8..000000000 --- a/app/renderer/store/store.js +++ /dev/null @@ -1,3 +0,0 @@ -import configureStore from './configureStore'; - -export default configureStore(); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c89cf0770..4368c280e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,20 @@ "integrity": "sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA==", "dev": true }, + "@ant-design/icons": { + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-1.1.16.tgz", + "integrity": "sha512-0zNVP5JYBJkfMi9HotN6QBQjF3SFmUlumJNJXZIH+pZWp/5EbrCczzlG3YTmBWoyRHAsuOGIjSFIy8v/76DTPg==" + }, + "@ant-design/icons-react": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ant-design/icons-react/-/icons-react-1.1.2.tgz", + "integrity": "sha512-7Fgt9d8ABgxrhZxsFjHk/VpPcxodQJJhbJO8Lsh7u58pGN4NoxxW++92naeGTXCyqZsbDPBReP+SC0bdBtbsGQ==", + "requires": { + "ant-design-palettes": "^1.1.3", + "babel-runtime": "^6.26.0" + } + }, "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", @@ -1777,53 +1791,80 @@ "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=" }, + "ant-design-palettes": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ant-design-palettes/-/ant-design-palettes-1.1.3.tgz", + "integrity": "sha512-UpkkTp8egEN21KZNvY7sTcabLlkHvLvS71EVPk4CYi77Z9AaGGCaVn7i72tbOgWDrQp2wjIg8WgMbKBdK7GtWA==", + "requires": { + "tinycolor2": "^1.4.1" + } + }, "antd": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/antd/-/antd-2.10.1.tgz", - "integrity": "sha1-0e8pNjVDoR9xz4Ekd6hBVxV1BIw=", + "version": "3.11.2", + "resolved": "https://registry.npmjs.org/antd/-/antd-3.11.2.tgz", + "integrity": "sha512-bwc9L+5Dk6sGbtA2Nr9rnfchM5JJ28Zb/AZTzMzevwA/89CFm5Eq4uBhFtYrITv8R2+p0FXyPo4lDVUQ16IlPQ==", "requires": { - "array-tree-filter": "~1.0.0", + "@ant-design/icons": "~1.1.15", + "@ant-design/icons-react": "~1.1.2", + "array-tree-filter": "^2.1.0", "babel-runtime": "6.x", - "classnames": "~2.2.0", - "css-animation": "^1.2.5", + "classnames": "~2.2.6", + "create-react-class": "^15.6.3", + "create-react-context": "0.2.2", + "css-animation": "^1.5.0", "dom-closest": "^0.2.0", - "lodash.debounce": "^4.0.8", - "moment": "^2.18.1", - "object-assign": "~4.1.0", - "omit.js": "^0.1.0", - "prop-types": "^15.5.7", - "rc-animate": "~2.3.0", - "rc-calendar": "~8.1.0", - "rc-cascader": "~0.11.0", - "rc-checkbox": "~1.5.0", - "rc-collapse": "~1.7.0", - "rc-dialog": "~6.5.0", - "rc-dropdown": "~1.4.8", - "rc-editor-mention": "~0.6.11", - "rc-form": "~1.3.0", - "rc-input-number": "~3.4.4", - "rc-menu": "~5.0.9", - "rc-notification": "~1.4.0", - "rc-pagination": "~1.8.7", - "rc-progress": "~2.1.0", - "rc-radio": "~2.0.0", - "rc-rate": "~2.1.0", - "rc-select": "~6.8.0", - "rc-slider": "~7.0.0", - "rc-steps": "~2.5.0", - "rc-switch": "~1.4.2", - "rc-table": "~5.2.13", - "rc-tabs": "~7.5.0", - "rc-time-picker": "~2.4.0", - "rc-tooltip": "~3.4.2", - "rc-tree": "~1.5.0", - "rc-tree-select": "~1.9.0", - "rc-upload": "~2.3.0", - "rc-util": "^4.0.1", - "react-lazy-load": "^3.0.10", - "react-slick": "~0.14.2", - "shallowequal": "^0.2.2", - "warning": "~3.0.0" + "enquire.js": "^2.1.6", + "intersperse": "^1.0.0", + "lodash": "^4.17.11", + "moment": "^2.22.2", + "omit.js": "^1.0.0", + "prop-types": "^15.6.2", + "raf": "^3.4.0", + "rc-animate": "^2.5.4", + "rc-calendar": "~9.8.0", + "rc-cascader": "~0.16.0", + "rc-checkbox": "~2.1.5", + "rc-collapse": "~1.10.0", + "rc-dialog": "~7.2.1", + "rc-drawer": "~1.7.6", + "rc-dropdown": "~2.2.1", + "rc-editor-mention": "^1.1.7", + "rc-form": "^2.2.7", + "rc-input-number": "~4.3.7", + "rc-menu": "~7.4.12", + "rc-notification": "~3.3.0", + "rc-pagination": "~1.17.3", + "rc-progress": "~2.2.6", + "rc-rate": "~2.4.2", + "rc-select": "~8.6.0", + "rc-slider": "~8.6.3", + "rc-steps": "~3.3.0", + "rc-switch": "~1.8.0", + "rc-table": "~6.4.0", + "rc-tabs": "~9.5.2", + "rc-time-picker": "~3.4.0", + "rc-tooltip": "~3.7.3", + "rc-tree": "~1.14.6", + "rc-tree-select": "~2.4.0", + "rc-trigger": "^2.6.2", + "rc-upload": "~2.6.0", + "rc-util": "^4.5.1", + "react-lazy-load": "^3.0.13", + "react-lifecycles-compat": "^3.0.4", + "react-slick": "~0.23.2", + "resize-observer-polyfill": "^1.5.0", + "shallowequal": "^1.1.0", + "warning": "~4.0.2" + }, + "dependencies": { + "warning": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", + "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "any-base": { @@ -2583,9 +2624,9 @@ "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=" }, "array-tree-filter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-1.0.1.tgz", - "integrity": "sha1-CorR7v04zoiFhjL5zAQj12NOTV0=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz", + "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==" }, "array-unique": { "version": "0.3.2", @@ -2766,9 +2807,9 @@ } }, "async-validator": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.10.0.tgz", - "integrity": "sha512-tjkUJ3OXURZbm1nrlU2QtH0XJe4YvhN1J9AYiKFN9ODBqt0AFIE6YZdZByrWG2SidPUOOK5KIAsqskqFj/43ZQ==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", "requires": { "babel-runtime": "6.x" } @@ -3721,11 +3762,6 @@ } } }, - "can-use-dom": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/can-use-dom/-/can-use-dom-0.1.0.tgz", - "integrity": "sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=" - }, "caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", @@ -4892,6 +4928,15 @@ "xdg-basedir": "^3.0.0" } }, + "connected-react-router": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.0.0.tgz", + "integrity": "sha512-TarPqf2wY3cz993Mw3eBg2U12M5OmaGwKzJsinvRQh61nKb8WMUvimyhu6u2HeWS8625PHFXjNOU0OIAMWj/bQ==", + "requires": { + "immutable": "^3.8.1", + "seamless-immutable": "^7.1.3" + } + }, "console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", @@ -5057,6 +5102,15 @@ "object-assign": "^4.1.1" } }, + "create-react-context": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.2.tgz", + "integrity": "sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==", + "requires": { + "fbjs": "^0.8.0", + "gud": "^1.0.0" + } + }, "cross-env": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", @@ -6046,6 +6100,13 @@ "fbjs": "^0.8.15", "immutable": "~3.7.4", "object-assign": "^4.1.0" + }, + "dependencies": { + "immutable": { + "version": "3.7.6", + "resolved": "http://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" + } } }, "duplexer": { @@ -8539,6 +8600,11 @@ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, + "gud": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", + "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" + }, "hammerjs": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", @@ -8698,13 +8764,14 @@ "integrity": "sha512-Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A==" }, "history": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz", - "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", + "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", "requires": { "invariant": "^2.2.1", "loose-envify": "^1.2.0", - "query-string": "^4.2.2", + "resolve-pathname": "^2.2.0", + "value-equal": "^0.4.0", "warning": "^3.0.0" } }, @@ -8726,9 +8793,9 @@ "dev": true }, "hoist-non-react-statics": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", - "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" }, "homedir-polyfill": { "version": "1.0.1", @@ -9377,9 +9444,9 @@ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" }, "immutable": { - "version": "3.7.6", - "resolved": "http://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", - "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=" }, "import-fresh": { "version": "2.0.0", @@ -9590,6 +9657,11 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, + "intersperse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz", + "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=" + }, "into-stream": { "version": "2.0.1", "resolved": "http://registry.npmjs.org/into-stream/-/into-stream-2.0.1.tgz", @@ -9807,6 +9879,11 @@ "is-path-inside": "^1.0.0" } }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" + }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -10469,11 +10546,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, - "lodash-es": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.11.tgz", - "integrity": "sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==" - }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", @@ -10523,12 +10595,8 @@ "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" - }, - "lodash.has": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", - "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=" + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true }, "lodash.isarguments": { "version": "3.1.0", @@ -10572,11 +10640,6 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.set": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", - "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" - }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -10951,6 +11014,17 @@ "dom-walk": "^0.1.0" } }, + "mini-store": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mini-store/-/mini-store-2.0.0.tgz", + "integrity": "sha512-EG0CuwpQmX+XL4QVS0kxNwHW5ftSbhygu1qxQH0pipugjnPkbvkalCdQbEihMwtQY6d3MTN+MS0q+aurs+RfLQ==", + "requires": { + "hoist-non-react-statics": "^2.3.1", + "prop-types": "^15.6.0", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.0.2" + } + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -11199,6 +11273,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "mutationobserver-shim": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz", + "integrity": "sha1-9NXa56SXGiIHkU+1qQ69UUtlrMo=" + }, "mute-stream": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", @@ -11673,11 +11752,11 @@ "integrity": "sha1-3LcCTazVDFK00wPwSALJHAV8dl8=" }, "omit.js": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-0.1.0.tgz", - "integrity": "sha1-l4aiGm1sMW+jW7FOcQHu7iHFIEQ=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.0.tgz", + "integrity": "sha512-O1rwbvEfAdhtonTv+v6IQeMOKTi/wlHcXpI3hehyPDlujkjSBQC6Vtzg0mdy+v2KVDmuPf7hAbHlTBM6q1bUHQ==", "requires": { - "object-assign": "^4.1.0" + "babel-runtime": "^6.23.0" } }, "on-finished": { @@ -13472,6 +13551,11 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, + "prettier": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.15.3.tgz", + "integrity": "sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==" + }, "pretty-bytes": { "version": "1.0.4", "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", @@ -13666,6 +13750,7 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "dev": true, "requires": { "object-assign": "^4.1.0", "strict-uri-encode": "^1.0.0" @@ -13694,6 +13779,14 @@ "through2": "^2.0.0" } }, + "raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "requires": { + "performance-now": "^2.1.0" + } + }, "ramda": { "version": "0.25.0", "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz", @@ -13783,65 +13876,75 @@ } }, "rc-animate": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.3.6.tgz", - "integrity": "sha1-QXeigixnrfT9W5CM66fO6NE8H6w=", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.6.0.tgz", + "integrity": "sha512-JXDycchgbOI+7T/VKmFWnAIn042LLScK1fNkmNunb0jz5q5aPGCAybx2bTo7X5t31Jkj9OsxKNb/vZPDPWufCg==", "requires": { - "css-animation": "^1.3.0", - "prop-types": "^15.5.6" + "babel-runtime": "6.x", + "classnames": "^2.2.6", + "css-animation": "^1.3.2", + "prop-types": "15.x", + "raf": "^3.4.0", + "react-lifecycles-compat": "^3.0.4" } }, "rc-calendar": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-8.1.3.tgz", - "integrity": "sha1-RardCULTGTeNHQivMnOzme73IJs=", + "version": "9.8.1", + "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.8.1.tgz", + "integrity": "sha512-0320a5TDWcbiqEsoHAh68ERejJbyqUXOIAV+lbPqn6+KYiIp1ut4f8SqDLtsPl3DjMdN24wKvU3So2dSkO/aaw==", "requires": { "babel-runtime": "6.x", "classnames": "2.x", "create-react-class": "^15.5.2", "moment": "2.x", "prop-types": "^15.5.8", - "rc-trigger": "1.x", - "rc-util": "3.x" - }, - "dependencies": { - "rc-util": { - "version": "3.4.1", - "resolved": "http://registry.npmjs.org/rc-util/-/rc-util-3.4.1.tgz", - "integrity": "sha1-S34LDHWTvbz/jtBF2I+7x3OnsGE=", - "requires": { - "add-dom-event-listener": "1.x", - "classnames": "2.x", - "shallowequal": "0.2.x" - } - } + "rc-trigger": "^2.2.0", + "rc-util": "^4.1.1" } }, "rc-cascader": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.11.6.tgz", - "integrity": "sha512-j9HXC3HrxBy8vpIE/UKtHCLHRWRd9xj2gIMYOnrvnjehRKFdrHxizIdz4Tx7EuN8cVDZe6GYngxFTtBlWCfBFQ==", + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.16.2.tgz", + "integrity": "sha512-XYO6nJGQu4mshFJGZDIR1f1+z4mNDEfTyp3LSZ6KhxYlnBoTuTHbuduph2J/sM1ziVjrQ2WjdUu29Rh1BuVOMQ==", "requires": { "array-tree-filter": "^1.0.0", "prop-types": "^15.5.8", - "rc-trigger": "1.x", - "rc-util": "4.x", - "shallow-equal": "^1.0.0" + "rc-trigger": "^2.2.0", + "rc-util": "^4.0.4", + "shallow-equal": "^1.0.0", + "warning": "^4.0.1" + }, + "dependencies": { + "array-tree-filter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-1.0.1.tgz", + "integrity": "sha1-CorR7v04zoiFhjL5zAQj12NOTV0=" + }, + "warning": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", + "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", + "requires": { + "loose-envify": "^1.0.0" + } + } } }, "rc-checkbox": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-1.5.0.tgz", - "integrity": "sha1-RkzptAsa2dEZUkztF0pgp7TrdSk=", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.1.5.tgz", + "integrity": "sha512-WXKnZV6ipS3Jsmd7mVenVUQf+ictgWZW0RqiH+7MeYdzGj/SL4g/S6MZgRdgzaBS2tGBCp4bvhGcyZLns6uQxw==", "requires": { + "babel-runtime": "^6.23.0", "classnames": "2.x", - "rc-util": "^4.0.1" + "prop-types": "15.x", + "rc-util": "^4.0.4" } }, "rc-collapse": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.7.7.tgz", - "integrity": "sha512-F9eWCcFtwb/H7ot1e/Z9CamVM1bQ0GaTx3Agkle6LrhrcPxuWTH00dldmtk0HelCBK43TyhTWoHEFB5S4biPLA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.10.0.tgz", + "integrity": "sha512-H8cn7yOhSg28anuhZTSbGBTEWYMmEqNHWT2AMCXk6JpYN5RpdJDCWMZitdJYPeKT0axMqQnrNe4upSELmWnTMw==", "requires": { "classnames": "2.x", "css-animation": "1.x", @@ -13850,31 +13953,44 @@ } }, "rc-dialog": { - "version": "6.5.11", - "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-6.5.11.tgz", - "integrity": "sha512-FGifsGYvCO8vZQ6SBezXUf60JZ2wa2tHv+qLnUPA7HJaR52v4l4pVwQJgdbNiE3lvveH0Qq4x6C9ZQjTAK5SVA==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.2.1.tgz", + "integrity": "sha512-UgKNFq6ekC7XZUnXYss/9/HSDajwy04qJ++8Iuecvfq48FbMf1k9UtTW0QGcbKIfLHWUJV13/DsTBJki2H6vWw==", "requires": { "babel-runtime": "6.x", - "create-react-class": "^15.5.2", - "object-assign": "~4.1.0", "rc-animate": "2.x", - "rc-util": "^4.0.4" + "rc-util": "^4.4.0" + } + }, + "rc-drawer": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-1.7.6.tgz", + "integrity": "sha512-FPJjShzI32ijWVjuBm+icDJHdXnKGQh/tvHJooKKspmWusCo2CAKMn1c7IG4pbVdKhZYCih70/8pD5iF5E8Bhg==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5", + "prop-types": "^15.5.0", + "rc-util": "^4.5.1" } }, "rc-dropdown": { - "version": "1.4.12", - "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-1.4.12.tgz", - "integrity": "sha1-At6p9z+leTAFhrhpEwqiv5Ve5zM=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-2.2.1.tgz", + "integrity": "sha512-eyTYEkdyhQGHcNc+YDH6MrExX783zPAxQCnQ0+ArIchXmKmDw6MRV88kbRT69jfmqEkH6n8kOKt65EFCNWzk6g==", "requires": { + "babel-runtime": "^6.26.0", "prop-types": "^15.5.8", - "rc-trigger": "1.x" + "rc-trigger": "^2.5.1", + "react-lifecycles-compat": "^3.0.2" } }, "rc-editor-core": { - "version": "0.7.9", - "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.7.9.tgz", - "integrity": "sha1-3+j6IPM66kG8rBykhJNLYA27dm0=", + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.8.tgz", + "integrity": "sha512-4zT4Z8BtQSDcdh9mGXrsVCzUXmXKpe2U2VJSKOAErh5J4yTzJxSOfJon+nHxZyJZEKXg7rZvwrnhogXZzYNIng==", "requires": { + "babel-runtime": "^6.26.0", + "classnames": "^2.2.5", "draft-js": "^0.10.0", "immutable": "^3.7.4", "lodash": "^4.16.5", @@ -13883,32 +13999,31 @@ } }, "rc-editor-mention": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-0.6.14.tgz", - "integrity": "sha512-2fhxptmTLoWF0qs3pz+6Dh40xi0mKuUCFxo17sKi9x1OpAnp1JGB27dc9iV1oP1l8dJCLRKMtInTMGbCX18OzA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.12.tgz", + "integrity": "sha512-cPm2rQ7P+hXaKMsO0ajVv08QlTDcSPVtw8/lVr9D+QzQKRPChCqLw9rVGOa4YGYTeS3gVe8lBfLr8a9JKFk3gA==", "requires": { + "babel-runtime": "^6.23.0", "classnames": "^2.2.5", "dom-scroll-into-view": "^1.2.0", "draft-js": "~0.10.0", - "immutable": "~3.7.4", + "immutable": "^3.7.4", "prop-types": "^15.5.8", "rc-animate": "^2.3.0", - "rc-editor-core": "~0.7.7" + "rc-editor-core": "~0.8.3" } }, "rc-form": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-1.3.4.tgz", - "integrity": "sha512-RFaUUW6Be3LNZsy74P54S8K2t+FagO/UA3/qkyXEo3LYGXB/0tL53QydXnBBTscyj/fnDy3d0fVK5HmCJ9Cfzg==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-2.2.7.tgz", + "integrity": "sha512-50zIXXa+QzssgZZQx5OwGFbELr99d0sCZYVo1SIXS216ioWnFefzbFs+iofTCir+YbTCQHh/cxqXDdC6r6HvYg==", "requires": { - "async-validator": "1.x", + "async-validator": "~1.8.5", "babel-runtime": "6.x", "create-react-class": "^15.5.3", "dom-scroll-into-view": "1.x", - "hoist-non-react-statics": "1.x", - "lodash.get": "^4.4.2", - "lodash.has": "^4.5.2", - "lodash.set": "^4.3.2", + "hoist-non-react-statics": "^2.3.1", + "lodash": "^4.17.4", "warning": "^3.0.0" } }, @@ -13923,99 +14038,100 @@ } }, "rc-input-number": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-3.4.15.tgz", - "integrity": "sha1-L5BHNUAK8IO57rYFlqBeSLH6i44=", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.3.7.tgz", + "integrity": "sha512-uIrUSJ3mURDBIcoBE3Suq6hvO7OyfNJHLeai0xN2hXMxOkR9ePH4B/RbiqNjMPflmj6/fxbtK5odOXqVV7BemQ==", "requires": { - "babel-runtime": "^6.23.0", + "babel-runtime": "6.x", "classnames": "^2.2.0", - "create-react-class": "^15.5.2", + "is-negative-zero": "^2.0.0", "prop-types": "^15.5.7", - "rc-touchable": "^1.0.0" + "rc-util": "^4.5.1", + "rmc-feedback": "^2.0.0" } }, "rc-menu": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-5.0.14.tgz", - "integrity": "sha512-Ks6GOB9obVvrHCtbp5X8xCK+D08Hwlrjkx60sa4RYPuimuUS4uQo8yV1FJLPTvRCx1PXxM8Clj23jawuoPDs3g==", + "version": "7.4.20", + "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-7.4.20.tgz", + "integrity": "sha512-ONhgwlfuoJTm09KeUq+J+rtAEPPN/tYo2RXQN3Sr/PKPPKw6+5ltP9RReHkPOWQEd3kypOcL0VpRJrk4B+M5Rg==", "requires": { "babel-runtime": "6.x", "classnames": "2.x", - "create-react-class": "^15.5.2", "dom-scroll-into-view": "1.x", + "mini-store": "^2.0.0", + "mutationobserver-shim": "^0.3.2", "prop-types": "^15.5.6", "rc-animate": "2.x", - "rc-util": "^4.0.2" + "rc-trigger": "^2.3.0", + "rc-util": "^4.1.0", + "resize-observer-polyfill": "^1.5.0" } }, "rc-notification": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-1.4.3.tgz", - "integrity": "sha1-Tq6FgHvX5a7hyJJ6XJvrr+Tld4c=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-3.3.0.tgz", + "integrity": "sha512-T7wUryaKTNTO9gsWPCwRyC9P4FcKFTrIRsiNVXJhjlRbHKT0xZF3ag/gxXxZzPBDAf0l1vfgIrT+11cfWtZW0g==", "requires": { - "babel-runtime": "^6.23.0", + "babel-runtime": "6.x", "classnames": "2.x", "prop-types": "^15.5.8", "rc-animate": "2.x", - "rc-util": "4.x" + "rc-util": "^4.0.4" } }, "rc-pagination": { - "version": "1.8.10", - "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.8.10.tgz", - "integrity": "sha1-M6/MPHOjcAz7g2ik8kKtM5VuRGY=", + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.17.3.tgz", + "integrity": "sha512-/bwe4++vjBHq2lNvxWP2LpCx0c0CRNH+tDO75tFsj1XMpQQo/vzdhreISC3HFjQOeb5a+59e2dXKmoBCootr9Q==", "requires": { - "babel-runtime": "^6.23.0", + "babel-runtime": "6.x", "prop-types": "^15.5.7" } }, "rc-progress": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.1.2.tgz", - "integrity": "sha1-0xzLFJmuIjwNIdFIVlCqSg03TOA=", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.2.6.tgz", + "integrity": "sha512-73Ul9WrWf474q0ze+XblpcR8q2No0tybHt+zdGXYyQ7fUZy4b+I5dUQcoxr9UXY6W5Ele9ZsPWJWHSDz/IAOUw==", "requires": { - "babel-runtime": "^6.23.0", + "babel-runtime": "6.x", "prop-types": "^15.5.8" } }, - "rc-radio": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/rc-radio/-/rc-radio-2.0.1.tgz", - "integrity": "sha1-yNyT6d94kd4pTRsm01LpeOGobV8=", - "requires": { - "rc-checkbox": "1.x" - } - }, "rc-rate": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.1.1.tgz", - "integrity": "sha1-iK7aiz1kcLuuT2UYxlKgKpWb3cU=", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.4.3.tgz", + "integrity": "sha512-MyE0toUYgAFpy4ONbammAkktwlPmmoOAazWWmae8iz2KaJ4Pj3itN1DgAcamfIdpyDe97drldY2l7AvCg1fUSQ==", "requires": { + "babel-runtime": "^6.26.0", "classnames": "^2.2.5", - "prop-types": "^15.5.8" + "prop-types": "^15.5.8", + "rc-util": "^4.3.0", + "react-lifecycles-compat": "^3.0.4" } }, "rc-select": { - "version": "6.8.11", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-6.8.11.tgz", - "integrity": "sha512-RzxtnIeGB+W2gIBt9hNp8KSp94K7MCJsD5w3Chk4kOlsCuxzg9XcZ11mOUtC0NbwLdXO7bQVtJfRrVIBM36sHA==", + "version": "8.6.4", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-8.6.4.tgz", + "integrity": "sha512-8qCIR+VrJPFCH3Fnw6LUarwML8twvE6ROb/+IkZUkDN7FusajdmGHKSTYjgz54nxLYP26xj3TjFaAQ22Xftehw==", "requires": { "babel-runtime": "^6.23.0", "classnames": "2.x", "component-classes": "1.x", "dom-scroll-into-view": "1.x", "prop-types": "^15.5.8", + "raf": "^3.4.0", "rc-animate": "2.x", - "rc-menu": "5.x || 4.x", - "rc-trigger": "1.x", + "rc-menu": "^7.3.0", + "rc-trigger": "^2.5.4", "rc-util": "^4.0.4", - "warning": "2.x" + "react-lifecycles-compat": "^3.0.2", + "warning": "^4.0.2" }, "dependencies": { "warning": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-2.1.0.tgz", - "integrity": "sha1-ISINnGOvx3qMkhEeARr3Bc4MaQE=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", + "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", "requires": { "loose-envify": "^1.0.0" } @@ -14023,150 +14139,200 @@ } }, "rc-slider": { - "version": "7.0.8", - "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-7.0.8.tgz", - "integrity": "sha1-G918v9jsG2QYulXlBoiLu1AVlVY=", + "version": "8.6.4", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.6.4.tgz", + "integrity": "sha512-CV2i2Ww6ib0EjFuBKvgjw3PgT6QwvWKC93iEpqPtrztZrx5wO9Iw//AUri4KHRqptW13AuBvFdEHovqLi6XFTw==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.5", "prop-types": "^15.5.4", - "rc-tooltip": "^3.4.2", + "rc-tooltip": "^3.7.0", "rc-util": "^4.0.4", + "shallowequal": "^1.0.1", "warning": "^3.0.0" } }, "rc-steps": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-2.5.2.tgz", - "integrity": "sha512-FsKpogxMaF2GYX3G9pn0pwTm9XTS+fAge/7F9uN0sDRPULUODBaUtlVUAOrDXIFOcIxxeku2UWBA6WfUvmcfTw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-3.3.0.tgz", + "integrity": "sha512-a4TjKu27Nmgo7CbT/Rx17G24yL/FYfv7tDBptuw3JixCMNs6H935vQvsYIdyO9k/l02uGXd/DGVAqUIDHJEBeA==", "requires": { + "babel-runtime": "^6.23.0", "classnames": "^2.2.3", - "lodash.debounce": "^4.0.8", + "lodash": "^4.17.5", "prop-types": "^15.5.7" } }, "rc-switch": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.4.4.tgz", - "integrity": "sha1-/fCErJHwJn+Ci9uUuyCMof6JgVs=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.8.0.tgz", + "integrity": "sha512-n4H+K2XJCqGwVQKwWOjbxl1kpdov0PVE9DGhzs/S20gk65s/nAOkpdO9tBD7IM/20KRNTBh0fEWkEedByrqh6w==", "requires": { + "babel-runtime": "^6.23.0", "classnames": "^2.2.1", "prop-types": "^15.5.6" } }, "rc-table": { - "version": "5.2.15", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-5.2.15.tgz", - "integrity": "sha1-plIbpo1mCwI+mFT4H//deoAGXiI=", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.4.0.tgz", + "integrity": "sha512-dd1vcomCZtV8NIVLz6i0aK8019rRojrmVktTruHmFRc7LiFKm6M+Ij3aHp5jUAs0t5dUeToFu9AoYzA0JknBTg==", "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5", "component-classes": "^1.2.6", - "lodash.get": "^4.4.2", - "rc-util": "4.x", - "shallowequal": "^0.2.2", + "lodash": "^4.17.5", + "mini-store": "^2.0.0", + "prop-types": "^15.5.8", + "rc-util": "^4.0.4", + "react-lifecycles-compat": "^3.0.2", + "shallowequal": "^1.0.2", "warning": "^3.0.0" } }, "rc-tabs": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-7.5.0.tgz", - "integrity": "sha1-FtYZTLmaUPKVyN94X2WAW8QJ584=", + "version": "9.5.7", + "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.5.7.tgz", + "integrity": "sha512-9aP4ra3zhy5VREqRG6t9Qce8uhCcRjHZuXx3LfLCP1Yip8bbm8zmPtcQ6dCeOJTFopdE1MwGSUJBGPs4jhbisw==", "requires": { "babel-runtime": "6.x", "classnames": "2.x", - "create-react-class": "15.x", + "create-react-context": "0.2.2", + "lodash": "^4.17.5", "prop-types": "15.x", + "raf": "^3.4.1", "rc-hammerjs": "~0.6.0", + "rc-util": "^4.0.4", "warning": "^3.0.0" } }, "rc-time-picker": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-2.4.1.tgz", - "integrity": "sha1-B049EgjogO2w2Zp7nMFbk1BdqMY=", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.4.0.tgz", + "integrity": "sha512-BgF0Fu/d36AK0h8jYBa01VWCm5vHWtYCh4DXBQhNazPLSH9hMP6JHLMJPSYMJ9jKttdE18O+F3j0mVQCL8JpDg==", "requires": { "babel-runtime": "6.x", "classnames": "2.x", "moment": "2.x", "prop-types": "^15.5.8", - "rc-trigger": "1.x" + "rc-trigger": "^2.2.0" } }, "rc-tooltip": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.4.9.tgz", - "integrity": "sha512-D9VFsy+0sB6s3zZ/DSTI+AJB106mOrRVTw3IXwF1mMhjHaCvEO+CGzHcTfyj9k6tY+5c4E+fd+r2g4DnkjgSNg==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz", + "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==", "requires": { "babel-runtime": "6.x", "prop-types": "^15.5.8", - "rc-trigger": "1.x" - } - }, - "rc-touchable": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rc-touchable/-/rc-touchable-1.3.1.tgz", - "integrity": "sha512-A52MNEZV3+9w8q+jSXM6sWutyHhsCz/q2hdBHDN75KJpAmhBiy8QrO75u6qzlgaHTXtmKphITciuUcdvPdpKMQ==", - "requires": { - "babel-runtime": "6.x" + "rc-trigger": "^2.2.2" } }, "rc-tree": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-1.5.0.tgz", - "integrity": "sha1-a3ADA8TxYK1/bEOKj9ylfelqXdE=", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-1.14.8.tgz", + "integrity": "sha512-jaI7D6q/Usvyaj2lIgRmOdyFD9M3GsxRdkVDtpCURJGuaBtH5eiAAYqj1xb1YR8gx9g6GiNZhaFd5srQcdM/aw==", "requires": { + "babel-runtime": "^6.23.0", "classnames": "2.x", - "object-assign": "4.x", "prop-types": "^15.5.8", - "rc-animate": "2.x", - "rc-util": "^4.0.2" + "rc-animate": "^3.0.0-rc.5", + "rc-util": "^4.5.1", + "react-lifecycles-compat": "^3.0.4", + "warning": "^3.0.0" + }, + "dependencies": { + "rc-animate": { + "version": "3.0.0-rc.6", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz", + "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5", + "component-classes": "^1.2.6", + "fbjs": "^0.8.16", + "prop-types": "15.x", + "raf": "^3.4.0", + "rc-util": "^4.5.0", + "react-lifecycles-compat": "^3.0.4" + } + } } }, "rc-tree-select": { - "version": "1.9.7", - "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-1.9.7.tgz", - "integrity": "sha512-X/1di501NZgt4k7L3ASx5OI00tyU+aimW53giIi2eTIzrRRYil79L1YymI5T+YUJWc+zxe7Smv+3KCcKG+E+KQ==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.4.4.tgz", + "integrity": "sha512-jg64hqD9KRfmjhbAjraDi65rzNuiu4llIVpmmfdaoRwSbdbbBNK/SNhXAy2UQ5QmTzKqzYuRj81IJEV2wH2K/w==", "requires": { "babel-runtime": "^6.23.0", "classnames": "^2.2.1", - "object-assign": "^4.0.1", "prop-types": "^15.5.8", - "rc-animate": "^2.0.2", - "rc-tree": "~1.4.8", - "rc-trigger": "1.x", - "rc-util": "^4.0.2" + "raf": "^3.4.0", + "rc-animate": "^3.0.0-rc.4", + "rc-tree": "~1.14.3", + "rc-trigger": "^3.0.0-rc.2", + "rc-util": "^4.5.0", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.0.2", + "warning": "^4.0.1" }, "dependencies": { - "rc-tree": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-1.4.8.tgz", - "integrity": "sha1-J+xlMZlgBW43KoJAzfB9qeD6v34=", + "rc-animate": { + "version": "3.0.0-rc.6", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz", + "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5", + "component-classes": "^1.2.6", + "fbjs": "^0.8.16", + "prop-types": "15.x", + "raf": "^3.4.0", + "rc-util": "^4.5.0", + "react-lifecycles-compat": "^3.0.4" + } + }, + "rc-trigger": { + "version": "3.0.0-rc.3", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0-rc.3.tgz", + "integrity": "sha512-4vB6cpxcUdm2qO5VtB9q1TZz0MoWm9BzFLvGknulphGrl1qI6uxUsPDCvqnmujdpDdAKGGfjxntFpA7RtAwkFQ==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.6", + "prop-types": "15.x", + "raf": "^3.4.0", + "rc-align": "^2.4.1", + "rc-animate": "^3.0.0-rc.1", + "rc-util": "^4.4.0" + } + }, + "warning": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", + "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", "requires": { - "classnames": "2.x", - "object-assign": "4.x", - "prop-types": "^15.5.8", - "rc-animate": "2.x", - "rc-util": "^4.0.2" + "loose-envify": "^1.0.0" } } } }, "rc-trigger": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-1.11.5.tgz", - "integrity": "sha512-MBuUPw1nFzA4K7jQOwb7uvFaZFjXGd00EofUYiZ+l/fgKVq8wnLC0lkv36kwqM7vfKyftRo2sh7cWVpdPuNnnw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-2.6.2.tgz", + "integrity": "sha512-op4xCu95/gdHVaysyxxiYxbY+Z+UcIBSUY9nQfLqm1FlitdtnAN+owD5iMPfnnsRXntgcQ5+RdYKNUFQT5DjzA==", "requires": { "babel-runtime": "6.x", - "create-react-class": "15.x", + "classnames": "^2.2.6", "prop-types": "15.x", - "rc-align": "2.x", + "rc-align": "^2.4.0", "rc-animate": "2.x", - "rc-util": "4.x" + "rc-util": "^4.4.0" } }, "rc-upload": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.3.8.tgz", - "integrity": "sha512-R3NB6NcY5L41O/LNLpklrJ5vxTSwdqto72UgJ5ZHFF900Zmm3DrTc8TKWbL7qqcvV69oKsrB3xVR3x07XmtigA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.6.0.tgz", + "integrity": "sha512-0nKpPEdRopGzxxrcFGXgZIiRJZwuet+TcMatYFAwPTCDyrFikdiSKkaLcz8Lz9tvLG2VzR5berbT2VLfpH9VvA==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.5", @@ -14193,18 +14359,27 @@ "babel-runtime": "6.x", "prop-types": "^15.5.10", "shallowequal": "^0.2.2" + }, + "dependencies": { + "shallowequal": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz", + "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=", + "requires": { + "lodash.keys": "^3.1.2" + } + } } }, "react": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz", - "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz", + "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==", "requires": { - "create-react-class": "^15.6.0", - "fbjs": "^0.8.9", "loose-envify": "^1.1.0", - "object-assign": "^4.1.0", - "prop-types": "^15.5.10" + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.11.2" } }, "react-addons-test-utils": { @@ -14214,14 +14389,14 @@ "dev": true }, "react-dom": { - "version": "15.6.2", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz", - "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz", + "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==", "requires": { - "fbjs": "^0.8.9", "loose-envify": "^1.1.0", - "object-assign": "^4.1.0", - "prop-types": "^15.5.10" + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.11.2" } }, "react-is": { @@ -14246,67 +14421,89 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-redux": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.1.tgz", - "integrity": "sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-6.0.0.tgz", + "integrity": "sha512-EmbC3uLl60pw2VqSSkj6HpZ6jTk12RMrwXMBdYtM6niq0MdEaRq9KYCwpJflkOZj349BLGQm1MI/JO1W96kLWQ==", "requires": { - "@babel/runtime": "^7.1.2", - "hoist-non-react-statics": "^3.1.0", + "@babel/runtime": "^7.2.0", + "hoist-non-react-statics": "^3.2.1", "invariant": "^2.2.4", - "loose-envify": "^1.1.0", - "prop-types": "^15.6.1", - "react-is": "^16.6.0", - "react-lifecycles-compat": "^3.0.0" + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-is": "^16.6.3" }, "dependencies": { + "@babel/runtime": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz", + "integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==", + "requires": { + "regenerator-runtime": "^0.12.0" + } + }, "hoist-non-react-statics": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.0.tgz", - "integrity": "sha512-3IascCRfaEkbmHjJnUxWSspIUE1okLPjGTMVXW8zraUo1t3yg1BadKAxAGILHwgoBzmMnzrgeeaDGBvpuPz6dA==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", + "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", "requires": { "react-is": "^16.3.2" } + }, + "regenerator-runtime": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" } } }, "react-router": { - "version": "3.2.1", - "resolved": "http://registry.npmjs.org/react-router/-/react-router-3.2.1.tgz", - "integrity": "sha512-SXkhC0nr3G0ltzVU07IN8jYl0bB6FsrDIqlLC9dK3SITXqyTJyM7yhXlUqs89w3Nqi5OkXsfRUeHX+P874HQrg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", + "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", "requires": { - "create-react-class": "^15.5.1", - "history": "^3.0.0", - "hoist-non-react-statics": "^2.3.1", - "invariant": "^2.2.1", - "loose-envify": "^1.2.0", - "prop-types": "^15.5.6", - "warning": "^3.0.0" + "history": "^4.7.2", + "hoist-non-react-statics": "^2.5.0", + "invariant": "^2.2.4", + "loose-envify": "^1.3.1", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.1", + "warning": "^4.0.1" }, "dependencies": { - "hoist-non-react-statics": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + } + }, + "warning": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz", + "integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==", + "requires": { + "loose-envify": "^1.0.0" + } } } }, - "react-router-redux": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.8.tgz", - "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=" - }, "react-slick": { - "version": "0.14.11", - "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.14.11.tgz", - "integrity": "sha1-wsvb43KMZqL/SSm+ltRX4+oNgPM=", + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.23.2.tgz", + "integrity": "sha512-fM6DXX7+22eOcYE9cgaXUfioZL/Zw6fwS6aPMDBt0kLHl4H4fFNEbp4JsJQdEWMLUNFtUytNcvd9KRml22Tp5w==", "requires": { - "can-use-dom": "^0.1.0", "classnames": "^2.2.5", - "create-react-class": "^15.5.2", "enquire.js": "^2.1.6", "json2mq": "^0.2.0", - "object-assign": "^4.1.0", - "slick-carousel": "^1.6.0" + "lodash.debounce": "^4.0.8", + "prettier": "^1.14.3", + "resize-observer-polyfill": "^1.5.0" } }, "read-config-file": { @@ -14481,14 +14678,12 @@ } }, "redux": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", - "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz", + "integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==", "requires": { - "lodash": "^4.2.1", - "lodash-es": "^4.2.1", - "loose-envify": "^1.1.0", - "symbol-observable": "^1.0.3" + "loose-envify": "^1.4.0", + "symbol-observable": "^1.2.0" } }, "redux-logger": { @@ -15005,6 +15200,11 @@ "resolve-from": "^1.0.0" } }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", @@ -15029,6 +15229,11 @@ "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", "dev": true }, + "resolve-pathname": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", + "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==" + }, "resolve-url": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", @@ -15093,6 +15298,15 @@ "inherits": "^2.0.1" } }, + "rmc-feedback": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz", + "integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5" + } + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -15181,6 +15395,15 @@ "xmlchars": "^1.3.1" } }, + "scheduler": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.3.tgz", + "integrity": "sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -15192,6 +15415,11 @@ "ajv-keywords": "^3.1.0" } }, + "seamless-immutable": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/seamless-immutable/-/seamless-immutable-7.1.4.tgz", + "integrity": "sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==" + }, "sec": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/sec/-/sec-1.0.0.tgz", @@ -15364,12 +15592,9 @@ "integrity": "sha1-UI0YOLPeWQq4dXsBGyXkMJAJRfc=" }, "shallowequal": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz", - "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=", - "requires": { - "lodash.keys": "^3.1.2" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, "shared-preferences-builder": { "version": "0.0.4", @@ -15628,11 +15853,6 @@ } } }, - "slick-carousel": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz", - "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==" - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -16106,7 +16326,8 @@ "strict-uri-encode": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true }, "string-convert": { "version": "0.2.1", @@ -17197,6 +17418,11 @@ "resolved": "https://registry.npmjs.org/validate.js/-/validate.js-0.12.0.tgz", "integrity": "sha512-/x2RJSvbqEyxKj0RPN4xaRquK+EggjeVXiDDEyrJzsJogjtiZ9ov7lj/svVb4DM5Q5braQF4cooAryQbUwOxlA==" }, + "value-equal": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", + "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==" + }, "vargs": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz", diff --git a/package.json b/package.json index c8343716f..f6b8a3fd3 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "package-linux": "npm run build && build --linux", "package-all": "npm run build && build -mwl", "package-nsis": "cross-env TARGET=nsis npm run build && build --win nsis --publish onTagOrDraft && build --win nsis-web --publish onTagOrDraft", - "package-ci": "node ./check-engines package.json && npm run clean && npm run build && npm run test && build --publish onTagOrDraft && npm run test-e2e ", + "package-ci": "node ./check-engines package.json && npm run clean && npm run build && npm run test && build --publish onTagOrDraft && npm run test-e2e ", "postinstall": "node ./check-engines package.json package.json && rimraf node_modules/jimp/browser", "postversion": "git pull --tags && git push && git push --tags" }, @@ -102,29 +102,30 @@ "dependencies": { "@babel/polyfill": "^7.0.0", "ansi-to-html": "~0.6.7", - "antd": "2.10.1", + "antd": "^3.11.2", "appium": "^1.10.0", "appium-support": "^2.25.0", "bluebird": "^3.5.1", + "connected-react-router": "^6.0.0", "css-modules-require-hook": "^4.2.3", "electron-debug": "^2.0.0", "electron-log": "^2.2.17", - "electron-settings": "2.x", + "electron-settings": "^2.2.4", "electron-updater": "^4.0.1", "fix-path": "^2.1.0", "font-awesome": "4.x", "format-json": "1.x", "highlight.js": "9.x", + "history": "^4.7.2", "lodash": "4.x", "moment": "^2.20.1", "postcss": "^7.0.4", "prop-types": "^15.6.2", - "react": "^15.6.2", - "react-dom": "^15.6.2", - "react-redux": "^5.1.0", - "react-router": "^3.2.0", - "react-router-redux": "4.x", - "redux": "^3.7.2", + "react": "^16.6.3", + "react-dom": "^16.6.3", + "react-redux": "^6.0.0", + "react-router": "^4.3.1", + "redux": "^4.0.1", "redux-logger": "^3.0.6", "redux-thunk": "2.x", "request-promise": "^4.2.2", @@ -134,7 +135,8 @@ "temp": "0.x", "uuid": "3.x", "wd": "^1.6.0", - "xpath": "0.0.27" + "xpath": "0.0.27", + "react-hot-loader": "^4.3.12" }, "devDependencies": { "7zip": "0.0.6",