Merge pull request react-bootstrap#1319 from taion/r14-rc1

taion · taion · commit 8f153f67149a · 2015-09-13T11:20:48.000-04:00
Update for React 0.14.0-rc1 and React Router 1.0.0-rc1
diff --git a/docs/build.js b/docs/build.js
@@ -1,11 +1,11 @@
 /* eslint no-console: 0 */
 
 import fsp from 'fs-promise';
+import createLocation from 'history/lib/createLocation';
 import path from 'path';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import Router from 'react-router';
-import Location from 'react-router/lib/Location';
+import {match, RoutingContext} from 'react-router';
 
 import Root from './src/Root';
 import routes from './src/Routes';
@@ -32,10 +32,11 @@ const readmeDest = path.join(docsBuilt, 'README.md');
 function generateHTML(fileName) {
   return new Promise( resolve => {
     const urlSlug = fileName === 'index.html' ? '/' : `/${fileName}`;
+    const location = createLocation(urlSlug);
 
-    Router.run(routes, new Location(urlSlug), (error, initialState) => {
+    match({routes, location}, (error, redirectLocation, renderProps) => {
       let html = ReactDOMServer.renderToString(
-        <Router {...initialState} />
+        <RoutingContext {...renderProps} />
       );
       html = '<!doctype html>' + html;
       let write = fsp.writeFile(path.join(docsBuilt, fileName), html);
diff --git a/docs/client.js b/docs/client.js
@@ -2,10 +2,10 @@ import CodeMirror from 'codemirror';
 import 'codemirror/addon/runmode/runmode';
 import 'codemirror/mode/htmlmixed/htmlmixed';
 import 'codemirror/mode/javascript/javascript';
+import createBrowserHistory from 'history/lib/createBrowserHistory';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {Router} from 'react-router';
-import {history} from 'react-router/lib/BrowserHistory';
 
 import Root from './src/Root';
 import routes from './src/Routes';
@@ -30,6 +30,8 @@ global.CodeMirror = CodeMirror;
 Root.assetBaseUrl = window.ASSET_BASE_URL;
 Root.propData = window.PROP_DATA;
 
+const history = createBrowserHistory();
+
 ReactDOM.render(
   <Router history={history} children={routes} />,
   document
diff --git a/docs/server.js b/docs/server.js
@@ -2,13 +2,13 @@
 
 import 'colors';
 import express from 'express';
+import createLocation from 'history/lib/createLocation';
 import httpProxy from 'http-proxy';
 import ip from 'ip';
 import path from 'path';
 import React from 'react';
 import ReactDOMServer from 'react-dom/server';
-import Router from 'react-router';
-import Location from 'react-router/lib/Location';
+import {match, RoutingContext} from 'react-router';
 
 import Root from './src/Root';
 import routes from './src/Routes';
@@ -46,9 +46,10 @@ if (development) {
       res.header('Access-Control-Allow-Origin', target);
       res.header('Access-Control-Allow-Headers', 'X-Requested-With');
 
-      Router.run(routes, new Location(req.url), (error, initialState) => {
+      const location = createLocation(req.url);
+      match({routes, location}, (error, redirectLocation, renderProps) => {
         const html = ReactDOMServer.renderToString(
-          <Router {...initialState} />
+          <RoutingContext {...renderProps} />
         );
         res.send('<!doctype html>' + html);
       });
diff --git a/docs/src/Routes.js b/docs/src/Routes.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Route} from 'react-router';
+import {IndexRoute, Route} from 'react-router';
 
 import ComponentsPage from './ComponentsPage';
 import GettingStartedPage from './GettingStartedPage';
@@ -10,12 +10,12 @@ import Root from './Root';
 import SupportPage from './SupportPage';
 
 export default (
-  <Route component={Root}>
-    <Route path="/" component={HomePage} />
-    <Route path="/introduction.html" component={IntroductionPage} />
-    <Route path="/getting-started.html" component={GettingStartedPage} />
-    <Route path="/components.html" component={ComponentsPage} />
-    <Route path="/support.html" component={SupportPage} />
+  <Route path="/" component={Root}>
+    <IndexRoute component={HomePage} />
+    <Route path="introduction.html" component={IntroductionPage} />
+    <Route path="getting-started.html" component={GettingStartedPage} />
+    <Route path="components.html" component={ComponentsPage} />
+    <Route path="support.html" component={SupportPage} />
 
     <Route path="*" component={NotFoundPage} />
   </Route>
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "docs": "babel-node docs/dev-run",
     "docs-prod": "npm run docs-build && NODE_ENV=production babel-node docs/server.js",
     "docs-prod-unoptimized": "npm run docs-build -- --dev && NODE_ENV=production babel-node docs/server.js",
-
     "minor": "node ./tools/release minor",
     "patch": "node ./tools/release patch"
   },
@@ -42,8 +41,8 @@
   "author": "Stephen J. Collings <stevoland@gmail.com>",
   "license": "MIT",
   "peerDependencies": {
-    "react": ">=0.14.0-beta3",
-    "react-dom": ">=0.14.0-beta3"
+    "react": ">=0.14.0-rc1",
+    "react-dom": ">=0.14.0-rc1"
   },
   "devDependencies": {
     "babel": "^5.8.19",
@@ -70,6 +69,7 @@
     "fs-extra": "^0.23.0",
     "fs-promise": "^0.3.1",
     "glob": "^5.0.14",
+    "history": "^1.9.0",
     "http-proxy": "^1.11.1",
     "ip": "^0.3.3",
     "isparta-loader": "^0.2.0",
@@ -96,11 +96,11 @@
     "output-file-sync": "^1.1.1",
     "phantomjs": "^1.9.17",
     "portfinder": "^0.4.0",
-    "react": "^0.14.0-beta3",
+    "react": "^0.14.0-rc1",
     "react-component-metadata": "^1.3.0",
-    "react-dom": "^0.14.0-beta3",
+    "react-dom": "^0.14.0-rc1",
     "react-hot-loader": "^1.2.8",
-    "react-router": "^1.0.0-beta3",
+    "react-router": "^1.0.0-rc1",
     "rimraf": "^2.4.2",
     "semver": "^5.0.1",
     "sinon": "^1.15.4",
@@ -117,7 +117,7 @@
     "dom-helpers": "^2.2.4",
     "keycode": "^2.0.0",
     "lodash": "^3.10.0",
-    "react-overlays": "^0.50.0-alpha3",
+    "react-overlays": "^0.50.0-alpha4",
     "uncontrollable": "^3.1.1",
     "warning": "^2.0.0"
   }
diff --git a/test/ModalSpec.js b/test/ModalSpec.js
@@ -196,7 +196,7 @@ describe('Modal', function () {
   it('Should use dialogComponent', function () {
     let noOp = function () {};
 
-    class CustomDialog {
+    class CustomDialog extends React.Component {
       render() { return <div {...this.props}/>; }
     }
 
diff --git a/test/PanelGroupSpec.js b/test/PanelGroupSpec.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactTestUtils from 'react/lib/ReactTestUtils';
-import ReactDOM from 'react-dom';
 
 import Panel from '../src/Panel';
 import PanelGroup from '../src/PanelGroup';
@@ -98,11 +97,5 @@ describe('PanelGroup', function () {
       assert.equal(panelBodies[0].getAttribute('aria-hidden'), 'false');
       assert.equal(panelBodies[1].getAttribute('aria-hidden'), 'true');
     });
-
-    afterEach(function() {
-      if (instance && ReactTestUtils.isCompositeComponent(instance) && instance.isMounted()) {
-        ReactDOM.unmountComponentAtNode(ReactDOM.findDOMNode(instance));
-      }
-    });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ describe('Modal', function () {`
`196`	`196`	`it('Should use dialogComponent', function () {`
`197`	`197`	`let noOp = function () {};`
`198`	`198`
`199`		`- class CustomDialog {`
	`199`	`+ class CustomDialog extends React.Component {`
`200`	`200`	`render() { return <div {...this.props}/>; }`
`201`	`201`	`}`
`202`	`202`