Upgrade React, ant, enzyme (#109)

* Upgrade ant to 3.1.0 * Adjust styles for updated ant - Locale is enUS by default now, so removing our config - Adjust table styles * Upgrade react and react-dom to 16.2.0 * Upgrade enzyme to 3.3.0, fix tests accordingly
2018-01-10 10:10:59 -08:00 · 2018-01-10 10:10:59 -08:00 · 00844913f5
parent 1ceaf3874a
commit 00844913f5
13 changed files with 412 additions and 318 deletions
--- a/web/app/css/deployment.css
+++ b/web/app/css/deployment.css
@ -24,6 +24,10 @@
    margin: 6px 12px;
    font-size: small;

+    & p {
+      margin-bottom: 0;
+    }
+
    &.unadded {
      background: var(--status-gray);
      color: white;
--- a/web/app/css/service-mesh.css
+++ b/web/app/css/service-mesh.css
@ -29,6 +29,7 @@
 td .status-dot {
  float: left;
  width: calc(2 * var(--base-width));
+  height: calc(2 * var(--base-width));
  min-width: calc(2 * var(--base-width));
  border-radius: 50%;
  margin-right: var(--base-width);
--- a/web/app/css/sidebar.css
+++ b/web/app/css/sidebar.css
@ -50,7 +50,7 @@
  }

  & .ant-menu-item {
-    padding: 10px 0px 11px 14px;
+    padding: 8px 0px 11px 14px;
  }

  & .ant-menu-item {
--- a/web/app/css/styles.css
+++ b/web/app/css/styles.css
@ -113,28 +113,6 @@ h2, h3, h4, h5, h6 {
  }
 }

-.conduit-table thead > tr > th {
-  background: var(--white);
-  text-transform: uppercase;
-  font-weight: bold;
-  border-bottom: 1px solid;
-  border-color: var(--status-gray);
-  word-break: keep-all;
-}
-
-.ant-table table {
-  font-weight: bold;
-  font-size: .8rem;
-}
-
-.ant-table-tbody > tr:hover > td {
-  background: rgba(47, 128, 237, .1);
-}
-
-tr th.numeric, .numeric {
-  text-align: right;
-}
-
 .no-data-msg {
  font-size: 12px;
  color: var(--subheader-grey);
@ -195,7 +173,7 @@ a.button {
  border-radius: 48px;
  border: 1px solid var(--messageblue);
  padding: 10px 14px 11px 14px;
-  font-weight: bold;
+  font-weight: var(--font-weight-bold);
  font-size: 14px;
  margin: 0px 8px 8px 0px;
  position: relative;
@ -222,3 +200,43 @@ a.button.primary:hover {
 a.button.primary:active {
  background-color: #2469C7;
 }
+
+/*
+  Ant overrides
+*/
+.ant-menu, .ant-table, .ant-tabs {
+  font-family: var(--font-stack);
+}
+
+.conduit-table {
+  & .ant-table-content {
+    font-size: 12px;
+  }
+
+  & thead > tr > th {
+    background: var(--white);
+    text-transform: uppercase;
+    font-weight: var(--font-weight-bold);
+    border-bottom: 1px solid;
+    border-color: var(--status-gray);
+    word-break: keep-all;
+  }
+
+  & .ant-table table {
+    font-weight: bold;
+    font-size: .8rem;
+  }
+
+  & tr > th, & tr > td {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  & .ant-table-tbody > tr:hover > td {
+    background: rgba(47, 128, 237, .1);
+  }
+
+  & tr .numeric {
+    text-align: right;
+  }
+}
--- a/web/app/js/components/StatusTable.jsx
+++ b/web/app/js/components/StatusTable.jsx
@ -28,7 +28,8 @@ const StatusDot = ({status, multilineDots, columnName}) => (
    title={<div>
      <div>{status.name}</div>
      <div>{_.get(columnConfig, [columnName, "dotExplanation", status.value])}</div>
-    </div>}>
+    </div>}
+    overlayStyle={{ fontSize: "12px" }}>
    <div
      className={`status-dot status-dot-${status.value} ${multilineDots ? 'dot-multiline': ''}`}
      key={status.name}>&nbsp;</div>
--- a/web/app/js/index.js
+++ b/web/app/js/index.js
@ -1,6 +1,5 @@
 import Deployment from './components/Deployment.jsx';
 import Deployments from './components/Deployments.jsx';
-import enUS from 'antd/lib/locale-provider/en_US'; // configure ant locale globally
 import NoMatch from './components/NoMatch.jsx';
 import PodDetail from './components/PodDetail.jsx';
 import React from 'react';
@ -9,7 +8,7 @@ import Routes from './components/Routes.jsx';
 import ServiceMesh from './components/ServiceMesh.jsx';
 import Sidebar from './components/Sidebar.jsx';
 import { BrowserRouter, Redirect, Route, Switch } from 'react-router-dom';
-import { Col, LocaleProvider, Row } from 'antd';
+import { Col, Row } from 'antd';
 import './../css/styles.css';

 let appMain = document.getElementById('main');
@ -22,26 +21,24 @@ if (proxyPathMatch) {
 }

 ReactDOM.render((
-  <LocaleProvider locale={enUS}>
-    <BrowserRouter>
-      <Row>
-        <Col xs={6} sm={6}>
-          <Route render={routeProps => <Sidebar {...routeProps} goVersion={appData.goVersion} releaseVersion={appData.releaseVersion} pathPrefix={pathPrefix} uuid={appData.uuid} />} />
-        </Col>
-        <Col xs={18} sm={18}>
-          <div className="main-content">
-            <Switch>
-              <Redirect exact from={`${pathPrefix}/`} to={`${pathPrefix}/servicemesh`} />
-              <Route path={`${pathPrefix}/servicemesh`} render={() => <ServiceMesh pathPrefix={pathPrefix} releaseVersion={appData.releaseVersion} />} />
-              <Route path={`${pathPrefix}/deployments`} render={() => <Deployments pathPrefix={pathPrefix} />} />
-              <Route path={`${pathPrefix}/deployment`} render={props => <Deployment pathPrefix={pathPrefix} location={props.location} />} />
-              <Route path={`${pathPrefix}/pod`} render={props => <PodDetail pathPrefix={pathPrefix} location={props.location} />} />
-              <Route path={`${pathPrefix}/routes`} render={() => <Routes pathPrefix={pathPrefix} />} />
-              <Route component={NoMatch} />
-            </Switch>
-          </div>
-        </Col>
-      </Row>
-    </BrowserRouter>
-  </LocaleProvider>
+  <BrowserRouter>
+    <Row>
+      <Col xs={6} sm={6}>
+        <Route render={routeProps => <Sidebar {...routeProps} goVersion={appData.goVersion} releaseVersion={appData.releaseVersion} pathPrefix={pathPrefix} uuid={appData.uuid} />} />
+      </Col>
+      <Col xs={18} sm={18}>
+        <div className="main-content">
+          <Switch>
+            <Redirect exact from={`${pathPrefix}/`} to={`${pathPrefix}/servicemesh`} />
+            <Route path={`${pathPrefix}/servicemesh`} render={() => <ServiceMesh pathPrefix={pathPrefix} releaseVersion={appData.releaseVersion} />} />
+            <Route path={`${pathPrefix}/deployments`} render={() => <Deployments pathPrefix={pathPrefix} />} />
+            <Route path={`${pathPrefix}/deployment`} render={props => <Deployment pathPrefix={pathPrefix} location={props.location} />} />
+            <Route path={`${pathPrefix}/pod`} render={props => <PodDetail pathPrefix={pathPrefix} location={props.location} />} />
+            <Route path={`${pathPrefix}/routes`} render={() => <Routes pathPrefix={pathPrefix} />} />
+            <Route component={NoMatch} />
+          </Switch>
+        </div>
+      </Col>
+    </Row>
+  </BrowserRouter>
 ), appMain);
--- a/web/app/package.json
+++ b/web/app/package.json
@ -4,13 +4,13 @@
  "main": "index.js",
  "license": "MIT",
  "dependencies": {
-    "antd": "^2.13.3",
+    "antd": "^3.1.0",
    "babel-plugin-syntax-object-rest-spread": "^6.13.0",
    "babel-plugin-transform-object-rest-spread": "^6.26.0",
    "chai": "^4.1.2",
    "d3": "^4.11.0",
-    "enzyme": "2.9.1",
-    "enzyme-adapter-react-15": "^1.0.5",
+    "enzyme": "^3.3.0",
+    "enzyme-adapter-react-16": "^1.1.1",
    "jsdom": "^11.5.1",
    "karma": "^1.7.1",
    "karma-jsdom-launcher": "^6.1.2",
@ -21,8 +21,8 @@
    "mocha": "^4.0.1",
    "moment": "^2.18.1",
    "path": "^0.12.7",
-    "react": "^15.6.1",
-    "react-dom": "^15.6.1",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
    "react-router-dom": "^4.2.2",
    "react-test-renderer": "15.6.1",
    "sinon": "^4.1.2",
@ -52,4 +52,4 @@
    "style-loader": "^0.18.2",
    "url-loader": "^0.6.2"
  }
-}
+}
--- a/web/app/test/DeploymentTest.jsx
+++ b/web/app/test/DeploymentTest.jsx
@ -1,17 +1,23 @@
+/* eslint-disable */
+import 'raf/polyfill';
+import Adapter from 'enzyme-adapter-react-16';
 import Deployment from '../js/components/Deployment.jsx';
+import Enzyme from 'enzyme';
 import { expect } from 'chai';
 import { mount } from 'enzyme';
 import { routerWrap } from "./testHelpers.jsx";
 import sinon from 'sinon';
 import sinonStubPromise from 'sinon-stub-promise';
+/* eslint-enable */

+Enzyme.configure({ adapter: new Adapter() });
 sinonStubPromise(sinon);

 describe('Deployment', () => {
  let component, fetchStub;

  function withPromise(fn) {
-    return component.find("Deployment").get(0).serverPromise.then(fn);
+    return component.find("Deployment").instance().serverPromise.then(fn);
  }

  beforeEach(() => {
@ -19,6 +25,7 @@ describe('Deployment', () => {
  });

  afterEach(() => {
+    component = null;
    window.fetch.restore();
  });

--- a/web/app/test/DeploymentsTest.jsx
+++ b/web/app/test/DeploymentsTest.jsx
@ -1,18 +1,21 @@
+import Adapter from 'enzyme-adapter-react-16';
 import Deployments from '../js/components/Deployments.jsx';
+import Enzyme from 'enzyme';
 import { expect } from 'chai';
 import { mount } from 'enzyme';
 import podFixtures from './fixtures/pods.json';
-import { routerWrap } from "./testHelpers.jsx";
+import { routerWrap } from './testHelpers.jsx';
 import sinon from 'sinon';
 import sinonStubPromise from 'sinon-stub-promise';

+Enzyme.configure({ adapter: new Adapter() });
 sinonStubPromise(sinon);

 describe('Deployments', () => {
  let component, fetchStub;

  function withPromise(fn) {
-    return component.find("Deployments").get(0).serverPromise.then(fn);
+    return component.find("Deployments").instance().serverPromise.then(fn);
  }

  beforeEach(() => {
@ -20,6 +23,7 @@ describe('Deployments', () => {
  });

  afterEach(() => {
+    component = null;
    window.fetch.restore();
  });

@ -42,9 +46,10 @@ describe('Deployments', () => {
    component = mount(routerWrap(Deployments));

    return withPromise(() => {
-      expect(component.find("Deployments")).to.have.length(1);
-      expect(component.find("ConduitSpinner")).to.have.length(0);
-      expect(component.find("CallToAction")).to.have.length(1);
+      component.update();
+      expect(component.find("Deployments").length).to.equal(1);
+      expect(component.find("ConduitSpinner").length).to.equal(0);
+      expect(component.find("CallToAction").length).to.equal(1);
    });
  });

@ -56,10 +61,11 @@ describe('Deployments', () => {
    component = mount(routerWrap(Deployments));

    return withPromise(() => {
-      expect(component.find("Deployments")).to.have.length(1);
-      expect(component.find("ConduitSpinner")).to.have.length(0);
-      expect(component.find("CallToAction")).to.have.length(0);
-      expect(component.find("TabbedMetricsTable")).to.have.length(1);
+      component.update();
+      expect(component.find("Deployments").length).to.equal(1);
+      expect(component.find("ConduitSpinner").length).to.equal(0);
+      expect(component.find("CallToAction").length).to.equal(0);
+      expect(component.find("TabbedMetricsTable").length).to.equal(1);
    });
  });
 });
--- a/web/app/test/ServiceMeshTest.jsx
+++ b/web/app/test/ServiceMeshTest.jsx
@ -1,4 +1,6 @@
 import _ from 'lodash';
+import Adapter from 'enzyme-adapter-react-16';
+import Enzyme from 'enzyme';
 import { expect } from 'chai';
 import { mount } from 'enzyme';
 import podFixtures from './fixtures/pods.json';
@ -7,13 +9,14 @@ import ServiceMesh from '../js/components/ServiceMesh.jsx';
 import sinon from 'sinon';
 import sinonStubPromise from 'sinon-stub-promise';

+Enzyme.configure({ adapter: new Adapter() });
 sinonStubPromise(sinon);

 describe('ServiceMesh', () => {
  let component, fetchStub;

  function withPromise(fn) {
-    return component.find("ServiceMesh").get(0).serverPromise.then(fn);
+    return component.find("ServiceMesh").instance().serverPromise.then(fn);
  }

  beforeEach(() => {
@ -21,6 +24,7 @@ describe('ServiceMesh', () => {
  });

  afterEach(() => {
+    component = null;
    window.fetch.restore();
  });

@ -54,6 +58,7 @@ describe('ServiceMesh', () => {
    component = mount(routerWrap(ServiceMesh));

    return withPromise(() => {
+      component.update();
      expect(component.find("ServiceMesh")).to.have.length(1);
      expect(component.find("ConduitSpinner")).to.have.length(0);
      expect(component.find("CallToAction")).to.have.length(1);
@ -71,6 +76,7 @@ describe('ServiceMesh', () => {
    component = mount(routerWrap(ServiceMesh));

    return withPromise(() => {
+      component.update();
      expect(component.find("ServiceMesh")).to.have.length(1);
      expect(component.find("ConduitSpinner")).to.have.length(0);
      expect(component.find("DeploymentSummary")).to.have.length(3);
@ -85,6 +91,7 @@ describe('ServiceMesh', () => {
    component = mount(routerWrap(ServiceMesh));

    return withPromise(() => {
+      component.update();
      expect(component.find("ServiceMesh")).to.have.length(1);
      expect(component.find("ConduitSpinner")).to.have.length(0);
      expect(component.html()).to.include("Service mesh details");
@ -100,6 +107,7 @@ describe('ServiceMesh', () => {
    component = mount(routerWrap(ServiceMesh));

    return withPromise(() => {
+      component.update();
      expect(component.find("ServiceMesh")).to.have.length(1);
      expect(component.find("ConduitSpinner")).to.have.length(0);
      expect(component.html()).to.include("Control plane");
@ -114,6 +122,7 @@ describe('ServiceMesh', () => {
    component = mount(routerWrap(ServiceMesh));

    return withPromise(() => {
+      component.update();
      expect(component.find("ServiceMesh")).to.have.length(1);
      expect(component.find("ConduitSpinner")).to.have.length(0);
      expect(component.html()).to.include("Data plane");
--- a/web/app/test/StatPaneTest.jsx
+++ b/web/app/test/StatPaneTest.jsx
@ -1,8 +1,11 @@
+import Adapter from 'enzyme-adapter-react-16';
+import Enzyme from 'enzyme';
 import { expect } from 'chai';
 import { mount } from 'enzyme';
 import React from 'react';
 import StatPane from '../js/components/StatPane.jsx';

+Enzyme.configure({ adapter: new Adapter() });

 describe('StatPane', () => {
  it('renders the request, success rate and latency components', () => {
--- a/web/app/test/VersionTest.jsx
+++ b/web/app/test/VersionTest.jsx
@ -1,4 +1,6 @@
+import Adapter from 'enzyme-adapter-react-16';
 import { BrowserRouter } from 'react-router-dom';
+import Enzyme from 'enzyme';
 import { expect } from 'chai';
 import { mount } from 'enzyme';
 import React from 'react';
@ -6,6 +8,7 @@ import sinon from 'sinon';
 import sinonStubPromise from 'sinon-stub-promise';
 import Version from '../js/components/Version.jsx';

+Enzyme.configure({ adapter: new Adapter() });
 sinonStubPromise(sinon);

 describe('Version', () => {
@ -15,7 +18,7 @@ describe('Version', () => {
  let component, fetchStub;

  function withPromise(fn) {
-    return component.find("Version").get(0).serverPromise.then(fn);
+    return component.find("Version").instance().serverPromise.then(fn);
  }

  beforeEach(() => {
@ -23,6 +26,7 @@ describe('Version', () => {
  });

  afterEach(() => {
+    component = null;
    window.fetch.restore();
  });

--- a/web/app/yarn.lock
+++ b/web/app/yarn.lock
@ -198,49 +198,50 @@ ansi-styles@^3.1.0:
  dependencies:
    color-convert "^1.9.0"

-antd@^2.13.3:
-  version "2.13.11"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-2.13.11.tgz#59c0c1e79db07092fa6ee8d00f77668e88c72fb0"
+antd@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-3.1.0.tgz#e2c178c8b811fc3becd9402589d6fc4f30438cba"
  dependencies:
-    array-tree-filter "~1.0.0"
+    array-tree-filter "^2.0.0"
    babel-runtime "6.x"
    classnames "~2.2.0"
    create-react-class "^15.6.0"
    css-animation "^1.2.5"
    dom-closest "^0.2.0"
+    enquire.js "^2.1.1"
    lodash.debounce "^4.0.8"
    moment "^2.19.3"
    omit.js "^1.0.0"
    prop-types "^15.5.7"
    rc-animate "^2.4.1"
-    rc-calendar "~9.0.0"
-    rc-cascader "~0.11.3"
-    rc-checkbox "~2.0.3"
+    rc-calendar "~9.4.0"
+    rc-cascader "~0.12.0"
+    rc-checkbox "~2.1.1"
    rc-collapse "~1.7.5"
-    rc-dialog "~6.5.10"
-    rc-dropdown "~1.5.0"
-    rc-editor-mention "~0.6.12"
-    rc-form "~1.4.0"
-    rc-input-number "~3.6.0"
-    rc-menu "~5.0.10"
-    rc-notification "~2.0.0"
-    rc-pagination "~1.12.4"
+    rc-dialog "~7.1.0"
+    rc-dropdown "~2.1.0"
+    rc-editor-mention "^1.0.2"
+    rc-form "^2.1.0"
+    rc-input-number "~4.0.0"
+    rc-menu "~6.2.0"
+    rc-notification "~3.0.0"
+    rc-pagination "~1.14.0"
    rc-progress "~2.2.2"
-    rc-rate "~2.1.1"
-    rc-select "~6.9.0"
-    rc-slider "~8.3.0"
-    rc-steps "~2.5.1"
-    rc-switch "~1.5.1"
-    rc-table "~5.6.9"
+    rc-rate "~2.4.0"
+    rc-select "~7.5.0"
+    rc-slider "~8.5.0"
+    rc-steps "~3.0.0"
+    rc-switch "~1.6.0"
+    rc-table "~6.1.0"
    rc-tabs "~9.1.2"
-    rc-time-picker "~2.4.1"
-    rc-tooltip "~3.4.6"
+    rc-time-picker "~3.2.1"
+    rc-tooltip "~3.7.0"
    rc-tree "~1.7.0"
-    rc-tree-select "~1.10.2"
+    rc-tree-select "~1.12.0"
    rc-upload "~2.4.0"
    rc-util "^4.0.4"
    react-lazy-load "^3.0.12"
-    react-slick "~0.15.4"
+    react-slick "~0.16.0"
    shallowequal "^1.0.1"
    warning "~3.0.0"

@ -305,10 +306,14 @@ array-slice@^0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"

-array-tree-filter@^1.0.0, array-tree-filter@~1.0.0:
+array-tree-filter@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-1.0.1.tgz#0a8ad1eefd38ce88858632f9cc0423d7634e4d5d"

+array-tree-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.0.0.tgz#20fbc2d5a0de83242c0a9eb90894d4bfb7e2a69e"
+
 array-union@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@ -1291,26 +1296,16 @@ check-error@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"

-cheerio@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
+cheerio@^1.0.0-rc.2:
+  version "1.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
  dependencies:
    css-select "~1.2.0"
    dom-serializer "~0.1.0"
    entities "~1.1.1"
    htmlparser2 "^3.9.1"
-    lodash.assignin "^4.0.9"
-    lodash.bind "^4.1.4"
-    lodash.defaults "^4.0.1"
-    lodash.filter "^4.4.0"
-    lodash.flatten "^4.2.0"
-    lodash.foreach "^4.3.0"
-    lodash.map "^4.4.0"
-    lodash.merge "^4.4.0"
-    lodash.pick "^4.2.1"
-    lodash.reduce "^4.4.0"
-    lodash.reject "^4.4.0"
-    lodash.some "^4.4.0"
+    lodash "^4.15.0"
+    parse5 "^3.0.1"

 chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.7.0:
  version "1.7.0"
@ -1447,6 +1442,10 @@ colormin@^1.0.5:
    css-color-names "0.0.4"
    has "^1.0.1"

+colors@0.5.x:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+
 colors@^1.1.0, colors@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@ -2178,6 +2177,10 @@ diffie-hellman@^5.0.0:
    miller-rabin "^4.0.0"
    randombytes "^2.0.0"

+discontinuous-range@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+
 dns-equal@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@ -2367,7 +2370,7 @@ enhanced-resolve@^3.4.0:
    object-assign "^4.0.1"
    tapable "^0.2.7"

-enquire.js@^2.1.6:
+enquire.js@^2.1.1, enquire.js@^2.1.6:
  version "2.1.6"
  resolved "https://registry.yarnpkg.com/enquire.js/-/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814"

@ -2379,38 +2382,46 @@ entities@^1.1.1, entities@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"

-enzyme-adapter-react-15@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
+enzyme-adapter-react-16@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
  dependencies:
-    enzyme-adapter-utils "^1.1.0"
+    enzyme-adapter-utils "^1.3.0"
    lodash "^4.17.4"
    object.assign "^4.0.4"
    object.values "^1.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"
+    react-reconciler "^0.7.0"
+    react-test-renderer "^16.0.0-0"

-enzyme-adapter-utils@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.2.0.tgz#7f4471ee0a70b91169ec8860d2bf0a6b551664b2"
+enzyme-adapter-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
  dependencies:
    lodash "^4.17.4"
    object.assign "^4.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"

-enzyme@2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.9.1.tgz#07d5ce691241240fb817bf2c4b18d6e530240df6"
+enzyme@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
  dependencies:
-    cheerio "^0.22.0"
-    function.prototype.name "^1.0.0"
+    cheerio "^1.0.0-rc.2"
+    function.prototype.name "^1.0.3"
+    has "^1.0.1"
+    is-boolean-object "^1.0.0"
+    is-callable "^1.1.3"
+    is-number-object "^1.0.3"
+    is-string "^1.0.4"
    is-subset "^0.1.1"
    lodash "^4.17.4"
+    object-inspect "^1.5.0"
    object-is "^1.0.1"
-    object.assign "^4.0.4"
+    object.assign "^4.1.0"
    object.entries "^1.0.4"
    object.values "^1.0.4"
-    prop-types "^15.5.10"
-    uuid "^3.0.1"
+    raf "^3.4.0"
+    rst-selector-parser "^2.2.3"

 errno@^0.1.3:
  version "0.1.6"
@ -3014,12 +3025,12 @@ function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"

-function.prototype.name@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac"
+function.prototype.name@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
  dependencies:
    define-properties "^1.1.2"
-    function-bind "^1.1.0"
+    function-bind "^1.1.1"
    is-callable "^1.1.3"

 functional-red-black-tree@^1.0.1:
@ -3180,6 +3191,10 @@ has-flag@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"

+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+
 has-unicode@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@ -3258,11 +3273,7 @@ hoek@4.x.x:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"

-hoist-non-react-statics@1.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
-
-hoist-non-react-statics@^2.3.0:
+hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"

@ -3503,6 +3514,10 @@ is-binary-path@^1.0.0:
  dependencies:
    binary-extensions "^1.0.0"

+is-boolean-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+
 is-buffer@^1.1.5:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@ -3575,6 +3590,10 @@ is-glob@^3.1.0:
  dependencies:
    is-extglob "^2.1.0"

+is-number-object@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+
 is-number@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
@ -3639,6 +3658,10 @@ is-stream@^1.0.1, is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"

+is-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+
 is-subset@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
@ -3991,14 +4014,6 @@ lodash._reinterpolate@~3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"

-lodash.assignin@^4.0.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-
-lodash.bind@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-
 lodash.camelcase@^4.3.0:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@ -4007,21 +4022,9 @@ lodash.debounce@^4.0.0, lodash.debounce@^4.0.8:
  version "4.0.8"
  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"

-lodash.defaults@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-
-lodash.filter@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
-
-lodash.flatten@^4.2.0:
+lodash.flattendeep@^4.4.0:
  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-
-lodash.foreach@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"

 lodash.get@^4.4.2:
  version "4.4.2"
@ -4043,34 +4046,14 @@ lodash.keys@^3.1.2:
    lodash.isarguments "^3.0.0"
    lodash.isarray "^3.0.0"

-lodash.map@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-
 lodash.memoize@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"

-lodash.merge@^4.4.0:
+lodash.merge@^4.6.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"

-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-
-lodash.reduce@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
-
-lodash.reject@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
-
-lodash.some@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-
 lodash.sortby@^4.7.0:
  version "4.7.0"
  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@ -4100,7 +4083,7 @@ lodash@^3.8.0:
  version "3.10.1"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

-lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.5, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.5, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
  version "4.17.4"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

@ -4285,6 +4268,14 @@ mimic-fn@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"

+mini-store@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-1.0.3.tgz#190e90831be7a3862baa532168b579273b00d818"
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+    prop-types "^15.6.0"
+    shallowequal "^1.0.2"
+
 minimalistic-assert@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
@ -4371,6 +4362,14 @@ natural-compare@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"

+nearley@^2.7.10:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae"
+  dependencies:
+    nomnom "~1.6.2"
+    railroad-diagrams "^1.0.0"
+    randexp "^0.4.2"
+
 negotiator@0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@ -4448,6 +4447,13 @@ node-pre-gyp@^0.6.39:
    tar "^2.2.1"
    tar-pack "^3.4.0"

+nomnom@~1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
+  dependencies:
+    colors "0.5.x"
+    underscore "~1.4.4"
+
 nopt@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@ -4536,11 +4542,15 @@ object-hash@^1.1.4:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.2.0.tgz#e96af0e96981996a1d47f88ead8f74f1ebc4422b"

+object-inspect@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.5.0.tgz#9d876c11e40f485c79215670281b767488f9bfe3"
+
 object-is@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"

-object-keys@^1.0.10, object-keys@^1.0.8:
+object-keys@^1.0.10, object-keys@^1.0.11, object-keys@^1.0.8:
  version "1.0.11"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"

@ -4552,6 +4562,15 @@ object.assign@^4.0.4:
    function-bind "^1.1.0"
    object-keys "^1.0.10"

+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.entries@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@ -4727,7 +4746,7 @@ parse-json@^2.2.0:
  dependencies:
    error-ex "^1.2.0"

-parse5@^3.0.2:
+parse5@^3.0.1, parse5@^3.0.2:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
  dependencies:
@ -5528,6 +5547,23 @@ querystringify@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"

+raf@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+  dependencies:
+    performance-now "^2.1.0"
+
+railroad-diagrams@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+
+randexp@^0.4.2:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  dependencies:
+    discontinuous-range "1.0.0"
+    ret "~0.1.10"
+
 randomatic@^1.1.3:
  version "1.1.7"
  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@ -5578,31 +5614,31 @@ rc-animate@2.x, rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@^2.4.1:
    css-animation "^1.3.2"
    prop-types "15.x"

-rc-calendar@~9.0.0:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.0.4.tgz#35810a8df6428f4fb85e8debdb07bd8d2eb3c5f5"
+rc-calendar@~9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/rc-calendar/-/rc-calendar-9.4.0.tgz#1fa9dacaabd69120524147916c0357f1bae127d1"
  dependencies:
    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 "^4.0.4"
+    rc-trigger "^2.2.0"
+    rc-util "^4.1.1"

-rc-cascader@~0.11.3:
-  version "0.11.6"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.11.6.tgz#7e88cfbb7500b3941a5940cf6e91569c53e37f9d"
+rc-cascader@~0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-0.12.1.tgz#0148514a8dd747c2335527c172ea0cf44180f940"
  dependencies:
    array-tree-filter "^1.0.0"
    prop-types "^15.5.8"
-    rc-trigger "1.x"
-    rc-util "4.x"
+    rc-trigger "^2.2.0"
+    rc-util "^4.0.4"
    shallow-equal "^1.0.0"

-rc-checkbox@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.0.3.tgz#436a9d508948e224980f0535ea738b48177a8f25"
+rc-checkbox@~2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.1.1.tgz#7b2d3632285eaad9cad78612a6643d7d34589e72"
  dependencies:
    babel-runtime "^6.23.0"
    classnames "2.x"
@ -5618,54 +5654,56 @@ rc-collapse@~1.7.5:
    prop-types "^15.5.6"
    rc-animate "2.x"

-rc-dialog@~6.5.10:
-  version "6.5.11"
-  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-6.5.11.tgz#a6ef4d81a7801a54e9923273c605dd521d7fb142"
+rc-dialog@~7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-7.1.0.tgz#ffc18c8f799f1cbc343e9f3a1bd9190a1cb62079"
  dependencies:
    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.1.0"

-rc-dropdown@~1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-1.5.1.tgz#633344f4d1998af35bbb9a9da9d3ed2f21876776"
+rc-dropdown@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-2.1.0.tgz#ae39db67e593ef4ed889dee99ef13ae3994a5c7f"
  dependencies:
+    babel-runtime "^6.26.0"
    prop-types "^15.5.8"
-    rc-trigger "1.x"
+    rc-trigger "^2.2.2"

-rc-editor-core@~0.7.7:
-  version "0.7.9"
-  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.7.9.tgz#dfe8fa20f33aea41bcac1ca484934b600dbb766d"
+rc-editor-core@~0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.3.tgz#0be6a37a10152ae6d58bd2ecfefdf2c80ce0689a"
  dependencies:
+    babel-runtime "^6.26.0"
    draft-js "^0.10.0"
    immutable "^3.7.4"
    lodash "^4.16.5"
    prop-types "^15.5.8"
    setimmediate "^1.0.5"

-rc-editor-mention@~0.6.12:
-  version "0.6.13"
-  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-0.6.13.tgz#5334385cb66640f159488e8b50c6b8845fc0c654"
+rc-editor-mention@^1.0.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.4.tgz#b151d76faa3313300b967507da217f0fea1c9912"
  dependencies:
+    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"
    prop-types "^15.5.8"
    rc-animate "^2.3.0"
-    rc-editor-core "~0.7.7"
+    rc-editor-core "~0.8.3"

-rc-form@~1.4.0:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-1.4.8.tgz#e26c2cd86137d943c2e2996407d73e9fa073b1c6"
+rc-form@^2.1.0:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.1.7.tgz#3e01c5e19838038b65a58014e2802deb088b60b7"
  dependencies:
    async-validator "1.x"
    babel-runtime "6.x"
    create-react-class "^15.5.3"
    dom-scroll-into-view "1.x"
-    hoist-non-react-statics "1.x"
+    hoist-non-react-statics "^2.3.1"
    lodash "^4.17.4"
    warning "^3.0.0"

@ -5677,19 +5715,18 @@ rc-hammerjs@~0.6.0:
    hammerjs "^2.0.8"
    prop-types "^15.5.9"

-rc-input-number@~3.6.0:
-  version "3.6.10"
-  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-3.6.10.tgz#651e17f72d7e5c47a07e126db9ee8d176aa85c2e"
+rc-input-number@~4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-4.0.2.tgz#09651d5fc05c7f6a1e2111dbfad7ed5743fa7595"
  dependencies:
    babel-runtime "6.x"
    classnames "^2.2.0"
-    create-react-class "^15.5.2"
    prop-types "^15.5.7"
-    rc-touchable "^1.0.0"
+    rmc-feedback "^1.0.0"

-rc-menu@^5.0.11:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-5.1.4.tgz#e5df08fe8b833e81469135ff13b30ab8f21ff3c6"
+rc-menu@^6.1.0, rc-menu@~6.2.0:
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-6.2.5.tgz#cb27585cfb6a2e9c2cb09a122df1980ec807bfc8"
  dependencies:
    babel-runtime "6.x"
    classnames "2.x"
@ -5697,23 +5734,12 @@ rc-menu@^5.0.11:
    dom-scroll-into-view "1.x"
    prop-types "^15.5.6"
    rc-animate "2.x"
-    rc-util "^4.0.2"
+    rc-trigger "^2.3.0"
+    rc-util "^4.1.0"

-rc-menu@~5.0.10:
-  version "5.0.14"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-5.0.14.tgz#73fd8e6f3525077b825c34c0318394bedce573d6"
-  dependencies:
-    babel-runtime "6.x"
-    classnames "2.x"
-    create-react-class "^15.5.2"
-    dom-scroll-into-view "1.x"
-    prop-types "^15.5.6"
-    rc-animate "2.x"
-    rc-util "^4.0.2"
-
-rc-notification@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-2.0.6.tgz#76f3f71d9423bf4603a02d7aa0c4b094a46b8c67"
+rc-notification@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-3.0.0.tgz#cefbeb8a03052dc5b988a07f9ba31895e886ac2e"
  dependencies:
    babel-runtime "6.x"
    classnames "2.x"
@ -5721,9 +5747,9 @@ rc-notification@~2.0.0:
    rc-animate "2.x"
    rc-util "^4.0.4"

-rc-pagination@~1.12.4:
-  version "1.12.11"
-  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.12.11.tgz#ed0a4ef4d5c44495eebe1fb669daefabdb303f3d"
+rc-pagination@~1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-1.14.0.tgz#c0f34901941b35d65365baf73a5237084042b97e"
  dependencies:
    babel-runtime "6.x"
    prop-types "^15.5.7"
@ -5735,16 +5761,18 @@ rc-progress@~2.2.2:
    babel-runtime "6.x"
    prop-types "^15.5.8"

-rc-rate@~2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.1.1.tgz#88aeda8b3d6470bbae4f6518c652a02a959bddc5"
+rc-rate@~2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.4.0.tgz#97ebcc5876e2e498b9f5f65ced256d8ab54e5f06"
  dependencies:
+    babel-runtime "^6.26.0"
    classnames "^2.2.5"
    prop-types "^15.5.8"
+    rc-util "^4.3.0"

-rc-select@~6.9.0:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-6.9.7.tgz#72741d0edaba36f1adfdaf823bcecbdac057065d"
+rc-select@~7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-7.5.0.tgz#157d7546d86d4d8571c7d94ea119b1d7c43e609a"
  dependencies:
    babel-runtime "^6.23.0"
    classnames "2.x"
@ -5752,49 +5780,52 @@ rc-select@~6.9.0:
    dom-scroll-into-view "1.x"
    prop-types "^15.5.8"
    rc-animate "2.x"
-    rc-menu "^5.0.11"
-    rc-trigger "1.x"
+    rc-menu "^6.1.0"
+    rc-trigger "^2.2.0"
    rc-util "^4.0.4"
    warning "^3.0.0"

-rc-slider@~8.3.0:
-  version "8.3.5"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.3.5.tgz#41f88ab95debe089139deee7120c6e151260b52d"
+rc-slider@~8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-8.5.0.tgz#6fae97d8ba59a012af69a00409f21925b8954cf5"
  dependencies:
    babel-runtime "6.x"
    classnames "^2.2.5"
    prop-types "^15.5.4"
-    rc-tooltip "^3.4.3"
+    rc-tooltip "^3.7.0"
    rc-util "^4.0.4"
    shallowequal "^1.0.1"
    warning "^3.0.0"

-rc-steps@~2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-2.5.2.tgz#2ff2e03348ba8cc4114f0568e420add6ee273fae"
+rc-steps@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-3.0.1.tgz#fa886eb93d223173ef9a05396f32186992549535"
  dependencies:
+    babel-runtime "^6.23.0"
    classnames "^2.2.3"
    lodash.debounce "^4.0.8"
    prop-types "^15.5.7"

-rc-switch@~1.5.1:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.5.3.tgz#283c2608bac57ebd7cdc4033269de14b6753eb39"
+rc-switch@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-1.6.0.tgz#c2d7369bdb87c1fd45e84989a27c1fb2f201d2fd"
  dependencies:
    babel-runtime "^6.23.0"
    classnames "^2.2.1"
    prop-types "^15.5.6"

-rc-table@~5.6.9:
-  version "5.6.13"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-5.6.13.tgz#ca73021dc6a3aa0af2846d07ee80c01c713ff0de"
+rc-table@~6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-6.1.1.tgz#638fd8746344f8272ccf120b6c4a5423bb8cac5f"
  dependencies:
    babel-runtime "6.x"
    component-classes "^1.2.6"
    lodash.get "^4.4.2"
+    lodash.merge "^4.6.0"
+    mini-store "^1.0.2"
    prop-types "^15.5.8"
-    rc-util "4.x"
-    shallowequal "^0.2.2"
+    rc-util "^4.0.4"
+    shallowequal "^1.0.2"
    warning "^3.0.0"

 rc-tabs@~9.1.2:
@ -5810,17 +5841,17 @@ rc-tabs@~9.1.2:
    rc-util "^4.0.4"
    warning "^3.0.0"

-rc-time-picker@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-2.4.1.tgz#074e3d1208e880edb0d99a7b9cc15b93505da8c6"
+rc-time-picker@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/rc-time-picker/-/rc-time-picker-3.2.1.tgz#e105fed32814bb95f37dbc60b49495cd787abfa2"
  dependencies:
    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@^3.4.3:
+rc-tooltip@^3.7.0, rc-tooltip@~3.7.0:
  version "3.7.0"
  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.7.0.tgz#3afbf109865f7cdcfe43752f3f3f501f7be37aaa"
  dependencies:
@ -5828,23 +5859,9 @@ rc-tooltip@^3.4.3:
    prop-types "^15.5.8"
    rc-trigger "^2.2.2"

-rc-tooltip@~3.4.6:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-3.4.9.tgz#6f99ecbbe3925810447fe0ce81a6ed4f721da8c5"
-  dependencies:
-    babel-runtime "6.x"
-    prop-types "^15.5.8"
-    rc-trigger "1.x"
-
-rc-touchable@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/rc-touchable/-/rc-touchable-1.2.3.tgz#5f498324e3d0b9ba601a9c4834958eaa2c713618"
-  dependencies:
-    babel-runtime "6.x"
-
-rc-tree-select@~1.10.2:
-  version "1.10.13"
-  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-1.10.13.tgz#a9ac2e1a34ccfc4e1ea91b438b248cc3b210c2d9"
+rc-tree-select@~1.12.0:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-1.12.3.tgz#7bde797bf8b5c54657ba0e1d0831df1fdb3cf505"
  dependencies:
    babel-runtime "^6.23.0"
    classnames "^2.2.1"
@ -5852,7 +5869,7 @@ rc-tree-select@~1.10.2:
    prop-types "^15.5.8"
    rc-animate "^2.0.2"
    rc-tree "~1.7.1"
-    rc-trigger "1.x"
+    rc-trigger "^2.2.2"
    rc-util "^4.0.2"

 rc-tree@~1.7.0, rc-tree@~1.7.1:
@ -5866,18 +5883,7 @@ rc-tree@~1.7.0, rc-tree@~1.7.1:
    rc-util "^4.0.4"
    warning "^3.0.0"

-rc-trigger@1.x:
-  version "1.11.5"
-  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-1.11.5.tgz#f88f9f84e0e79f8e0ef1c8d1bf8ac2208b715620"
-  dependencies:
-    babel-runtime "6.x"
-    create-react-class "15.x"
-    prop-types "15.x"
-    rc-align "2.x"
-    rc-animate "2.x"
-    rc-util "4.x"
-
-rc-trigger@^2.2.2:
+rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0:
  version "2.3.3"
  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-2.3.3.tgz#406c5ddea594aca71d067852f27d91a5f3a653b8"
  dependencies:
@ -5897,7 +5903,7 @@ rc-upload@~2.4.0:
    prop-types "^15.5.7"
    warning "2.x"

-rc-util@4.x, rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.3.0:
+rc-util@^4.0.2, rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0:
  version "4.3.1"
  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.3.1.tgz#79f0adb30f449c1b29d7c5cdb2d82c193920c362"
  dependencies:
@ -5915,14 +5921,14 @@ rc@^1.1.7:
    minimist "^1.2.0"
    strip-json-comments "~2.0.1"

-react-dom@^15.6.1:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+react-dom@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
  dependencies:
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"

 react-lazy-load@^3.0.12:
  version "3.0.13"
@ -5933,6 +5939,15 @@ react-lazy-load@^3.0.12:
    lodash.throttle "^4.0.0"
    prop-types "^15.5.8"

+react-reconciler@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 react-router-dom@^4.2.2:
  version "4.2.2"
  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"
@ -5956,9 +5971,9 @@ react-router@^4.2.0:
    prop-types "^15.5.4"
    warning "^3.0.0"

-react-slick@~0.15.4:
-  version "0.15.4"
-  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.15.4.tgz#6709c87b06e7640feeacc06711be42cc2066aabe"
+react-slick@~0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/react-slick/-/react-slick-0.16.0.tgz#27385fb88503d208be081d37267ddec961209a7b"
  dependencies:
    can-use-dom "^0.1.0"
    classnames "^2.2.5"
@ -5975,15 +5990,22 @@ react-test-renderer@15.6.1:
    fbjs "^0.8.9"
    object-assign "^4.1.0"

-react@^15.6.1:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+react-test-renderer@^16.0.0-0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
  dependencies:
-    create-react-class "^15.6.0"
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
+react@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
+  dependencies:
+    fbjs "^0.8.16"
    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"

 read-cache@^1.0.0:
  version "1.0.0"
@ -6271,6 +6293,10 @@ restore-cursor@^2.0.0:
    onetime "^2.0.0"
    signal-exit "^3.0.2"

+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 rgb-hex@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/rgb-hex/-/rgb-hex-2.1.0.tgz#c773c5fe2268a25578d92539a82a7a5ce53beda6"
@ -6298,6 +6324,20 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
    hash-base "^2.0.0"
    inherits "^2.0.1"

+rmc-feedback@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/rmc-feedback/-/rmc-feedback-1.0.3.tgz#efd9d75c51998857c7a9a495ee507313a81aaee9"
+  dependencies:
+    babel-runtime "6.x"
+    classnames "^2.2.5"
+
+rst-selector-parser@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+  dependencies:
+    lodash.flattendeep "^4.4.0"
+    nearley "^2.7.10"
+
 run-async@^2.2.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@ -6430,7 +6470,7 @@ shallowequal@^0.2.2:
  dependencies:
    lodash.keys "^3.1.2"

-shallowequal@^1.0.1:
+shallowequal@^1.0.1, shallowequal@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.0.2.tgz#1561dbdefb8c01408100319085764da3fcf83f8f"

@ -6977,6 +7017,10 @@ ultron@1.0.x:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"

+underscore@~1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+
 uniq@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@ -7056,7 +7100,7 @@ uuid@^2.0.2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"

-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
+uuid@^3.0.0, uuid@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"