Skip to content

Commit aad2b94

Browse files
taiontaion
committed
Merge pull request react-bootstrap#1391 from react-bootstrap/react-14
Update for React v0.14.0
2 parents 2f63487 + 5376f88 commit aad2b94

194 files changed

Lines changed: 983 additions & 914 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/build.js‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
/* eslint no-console: 0 */
22

3-
import React from 'react';
3+
import fsp from 'fs-promise';
4+
import createLocation from 'history/lib/createLocation';
45
import path from 'path';
5-
import Router from 'react-router';
6-
import routes from './src/Routes';
6+
import React from 'react';
7+
import ReactDOMServer from 'react-dom/server';
8+
import {match, RoutingContext} from 'react-router';
9+
710
import Root from './src/Root';
8-
import fsp from 'fs-promise';
9-
import { copy } from '../tools/fs-utils';
10-
import { exec } from '../tools/exec';
11+
import routes from './src/Routes';
12+
1113
import metadata from './generate-metadata';
1214

15+
import {copy} from '../tools/fs-utils';
16+
import {exec} from '../tools/exec';
17+
1318
const repoRoot = path.resolve(__dirname, '../');
1419
const docsBuilt = path.join(repoRoot, 'docs-built');
1520

@@ -24,12 +29,15 @@ const readmeDest = path.join(docsBuilt, 'README.md');
2429
* @return {Promise} promise
2530
* @internal
2631
*/
27-
function generateHTML(fileName, propData) {
32+
function generateHTML(fileName) {
2833
return new Promise( resolve => {
2934
const urlSlug = fileName === 'index.html' ? '/' : `/${fileName}`;
35+
const location = createLocation(urlSlug);
3036

31-
Router.run(routes, urlSlug, Handler => {
32-
let html = React.renderToString(React.createElement(Handler, { propData }));
37+
match({routes, location}, (error, redirectLocation, renderProps) => {
38+
let html = ReactDOMServer.renderToString(
39+
<RoutingContext {...renderProps} />
40+
);
3341
html = '<!doctype html>' + html;
3442
let write = fsp.writeFile(path.join(docsBuilt, fileName), html);
3543
resolve(write);
@@ -46,7 +54,10 @@ export default function BuildDocs({dev}) {
4654
.then(() => fsp.mkdir(docsBuilt))
4755
.then(metadata)
4856
.then(propData => {
49-
let pagesGenerators = Root.getPages().map( page => generateHTML(page, propData));
57+
Root.assetBaseUrl = '';
58+
Root.propData = propData;
59+
60+
const pagesGenerators = Root.getPages().map(generateHTML);
5061

5162
return Promise.all(pagesGenerators.concat([
5263
exec(`webpack --config webpack.docs.js --bail ${devOption}`),

‎docs/client.js‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
1+
import CodeMirror from 'codemirror';
2+
import 'codemirror/addon/runmode/runmode';
3+
import 'codemirror/mode/htmlmixed/htmlmixed';
4+
import 'codemirror/mode/javascript/javascript';
5+
import createBrowserHistory from 'history/lib/createBrowserHistory';
6+
import React from 'react';
7+
import ReactDOM from 'react-dom';
8+
import {Router} from 'react-router';
9+
10+
import Root from './src/Root';
11+
import routes from './src/Routes';
12+
113
import 'bootstrap/less/bootstrap.less';
14+
215
import './assets/docs.css';
316
import './assets/style.css';
417

18+
import 'codemirror/lib/codemirror.css';
19+
import 'codemirror/theme/solarized.css';
20+
import './assets/CodeMirror.css';
21+
522
import './assets/carousel.png';
623
import './assets/logo.png';
724
import './assets/favicon.ico';
825
import './assets/thumbnail.png';
926
import './assets/thumbnaildiv.png';
1027
import './assets/TheresaKnott_castle.svg';
1128

12-
import 'codemirror/mode/htmlmixed/htmlmixed';
13-
import 'codemirror/mode/javascript/javascript';
14-
import 'codemirror/theme/solarized.css';
15-
import 'codemirror/lib/codemirror.css';
16-
import './assets/CodeMirror.css';
29+
global.CodeMirror = CodeMirror;
1730

18-
import React from 'react';
19-
import CodeMirror from 'codemirror';
20-
import 'codemirror/addon/runmode/runmode';
21-
import Router from 'react-router';
22-
import routes from './src/Routes';
31+
Root.assetBaseUrl = window.ASSET_BASE_URL;
32+
Root.propData = window.PROP_DATA;
2333

24-
global.CodeMirror = CodeMirror;
34+
const history = createBrowserHistory();
2535

26-
Router.run(routes, Router.RefreshLocation, Handler => {
27-
React.render(
28-
React.createElement(Handler, window.INITIAL_PROPS), document);
29-
});
36+
ReactDOM.render(
37+
<Router history={history} children={routes} />,
38+
document
39+
);

‎docs/examples/.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"globals": {
77
"mountNode",
88
"React",
9+
"ReactDOM",
910
"classNames",
1011
"Accordion",
1112
"Alert",

‎docs/examples/AlertAutoDismissable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ const AlertAutoDismissable = React.createClass({
2929
}
3030
});
3131

32-
React.render(<AlertAutoDismissable />, mountNode);
32+
ReactDOM.render(<AlertAutoDismissable />, mountNode);

‎docs/examples/AlertBasic.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ const alertInstance = (
44
</Alert>
55
);
66

7-
React.render(alertInstance, mountNode);
7+
ReactDOM.render(alertInstance, mountNode);

‎docs/examples/AlertDismissable.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ const AlertDismissable = React.createClass({
3434
}
3535
});
3636

37-
React.render(<AlertDismissable />, mountNode);
37+
ReactDOM.render(<AlertDismissable />, mountNode);

‎docs/examples/Badge.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ const badgeInstance = (
22
<p>Badges <Badge>42</Badge></p>
33
);
44

5-
React.render(badgeInstance, mountNode);
5+
ReactDOM.render(badgeInstance, mountNode);

‎docs/examples/Breadcrumb.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ const breadcrumbInstance = (
1212
</Breadcrumb>
1313
);
1414

15-
React.render(breadcrumbInstance, mountNode);
15+
ReactDOM.render(breadcrumbInstance, mountNode);

‎docs/examples/ButtonActive.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ const buttonsInstance = (
55
</ButtonToolbar>
66
);
77

8-
React.render(buttonsInstance, mountNode);
8+
ReactDOM.render(buttonsInstance, mountNode);

‎docs/examples/ButtonBlock.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ const buttonsInstance = (
77
</div>
88
);
99

10-
React.render(buttonsInstance, mountNode);
10+
ReactDOM.render(buttonsInstance, mountNode);

0 commit comments

Comments
 (0)