diff --git a/examples/animations/app.js b/examples/animations/app.js index 98abe716ef..a7ea24ddbe 100644 --- a/examples/animations/app.js +++ b/examples/animations/app.js @@ -1,4 +1,6 @@ -import React from 'react/addons' +import React from 'react' +import { render } from 'react-dom' +import ReactCSSTransitionGroup from 'react-addons-transition-group' import { createHistory, useBasename } from 'history' import { Router, Route, Link } from 'react-router' @@ -8,8 +10,6 @@ const history = useBasename(createHistory)({ basename: '/animations' }) -const { CSSTransitionGroup } = React.addons - class App extends React.Component { render() { const { pathname } = this.props.location @@ -20,9 +20,9 @@ class App extends React.Component {
  • Page 1
  • Page 2
  • - + {React.cloneElement(this.props.children ||
    , { key: pathname })} - +
    ) } @@ -50,7 +50,7 @@ class Page2 extends React.Component { } } -React.render(( +render(( diff --git a/examples/auth-flow/app.js b/examples/auth-flow/app.js index d3688cbf1b..be96697f2b 100644 --- a/examples/auth-flow/app.js +++ b/examples/auth-flow/app.js @@ -1,4 +1,5 @@ -import React, { findDOMNode } from 'react' +import React from 'react' +import { render, findDOMNode } from 'react-dom' import { Router, Route, Link, History } from 'react-router' import { createHistory, useBasename } from 'history' import auth from './auth' @@ -123,7 +124,7 @@ function requireAuth(nextState, replaceState) { replaceState({ nextPathname: nextState.location.pathname }, '/login') } -React.render(( +render(( diff --git a/examples/dynamic-segments/app.js b/examples/dynamic-segments/app.js index c8d8a1ccee..405a44aa78 100644 --- a/examples/dynamic-segments/app.js +++ b/examples/dynamic-segments/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { Router, Route, Link, Redirect } from 'react-router' import { createHistory, useBasename } from 'history' @@ -50,7 +51,7 @@ class Task extends React.Component { } } -React.render(( +render(( diff --git a/examples/huge-apps/app.js b/examples/huge-apps/app.js index 83372c7acc..06ab96305b 100644 --- a/examples/huge-apps/app.js +++ b/examples/huge-apps/app.js @@ -1,5 +1,6 @@ /*eslint-disable no-unused-vars */ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router } from 'react-router' import stubbedCourses from './stubs/COURSES' @@ -23,7 +24,7 @@ const rootRoute = { } ] } -React.render( +render( , document.getElementById('example') ) diff --git a/examples/master-detail/app.js b/examples/master-detail/app.js index 050c45f699..c6c68c5bfc 100644 --- a/examples/master-detail/app.js +++ b/examples/master-detail/app.js @@ -1,4 +1,5 @@ -import React, { findDOMNode } from 'react' +import React from 'react' +import { render, findDOMNode } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, History, Route, IndexRoute, Link } from 'react-router' import ContactStore from './ContactStore' @@ -155,7 +156,7 @@ var NotFound = React.createClass({ } }) -React.render(( +render(( diff --git a/examples/nested-animations/app.js b/examples/nested-animations/app.js index da1c59202d..ed6b6dd681 100644 --- a/examples/nested-animations/app.js +++ b/examples/nested-animations/app.js @@ -1,4 +1,6 @@ -import React from 'react/addons' +import React from 'react' +import { render } from 'react-dom' +import ReactCSSTransitionGroup from 'react-addons-transition-group' import { createHistory, useBasename } from 'history' import { Router, Route, Link } from 'react-router' @@ -8,8 +10,6 @@ const history = useBasename(createHistory)({ basename: '/nested-animations' }) -const { CSSTransitionGroup } = React.addons - class App extends React.Component { render() { const { pathname } = this.props.location @@ -23,9 +23,9 @@ class App extends React.Component {
  • Page 1
  • Page 2
  • - + {React.cloneElement(this.props.children ||
    , { key: key })} - +
    ) } @@ -42,9 +42,9 @@ class Page1 extends React.Component {
  • Tab 1
  • Tab 2
  • - + {React.cloneElement(this.props.children ||
    , { key: pathname })} - +
    ) } @@ -61,9 +61,9 @@ class Page2 extends React.Component {
  • Tab 1
  • Tab 2
  • - + {React.cloneElement(this.props.children ||
    , { key: pathname })} - +
    ) } @@ -91,7 +91,7 @@ class Tab2 extends React.Component { } } -React.render(( +render(( diff --git a/examples/passing-props-to-children/app.js b/examples/passing-props-to-children/app.js index 3c1d0230e7..420e77ec4c 100644 --- a/examples/passing-props-to-children/app.js +++ b/examples/passing-props-to-children/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, Link, History } from 'react-router' @@ -78,7 +79,7 @@ const Taco = React.createClass({ } }) -React.render(( +render(( diff --git a/examples/pinterest/app.js b/examples/pinterest/app.js index 81d18891f9..5a7b6345f2 100644 --- a/examples/pinterest/app.js +++ b/examples/pinterest/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, IndexRoute, Link } from 'react-router' @@ -139,7 +140,7 @@ const Picture = React.createClass({ } }) -React.render(( +render(( diff --git a/examples/query-params/app.js b/examples/query-params/app.js index 3ccabf9bff..6ad48116d4 100644 --- a/examples/query-params/app.js +++ b/examples/query-params/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, Link } from 'react-router' @@ -36,7 +37,7 @@ class App extends React.Component { } } -React.render(( +render(( diff --git a/examples/shared-root/app.js b/examples/shared-root/app.js index 7a4cdba2ad..aafd6f4a6f 100644 --- a/examples/shared-root/app.js +++ b/examples/shared-root/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, Link } from 'react-router' @@ -73,7 +74,7 @@ class ForgotPassword extends React.Component { } } -React.render(( +render(( diff --git a/examples/sidebar/app.js b/examples/sidebar/app.js index 2fdf5356e3..b398c75d74 100644 --- a/examples/sidebar/app.js +++ b/examples/sidebar/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, Link } from 'react-router' import data from './data' @@ -106,7 +107,7 @@ class App extends React.Component { } } -React.render(( +render(( diff --git a/examples/transitions/app.js b/examples/transitions/app.js index 8f0a370eb8..c2aeb314fe 100644 --- a/examples/transitions/app.js +++ b/examples/transitions/app.js @@ -1,4 +1,5 @@ import React from 'react' +import { render } from 'react-dom' import { createHistory, useBasename } from 'history' import { Router, Route, Link, History, Lifecycle } from 'react-router' @@ -69,7 +70,7 @@ const Form = React.createClass({ } }) -React.render(( +render(( diff --git a/package.json b/package.json index c6253c705d..fb4754ddb0 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "qs": "^4.0.0", "react": "0.14.0", "react-addons-test-utils": "0.14.0", + "react-addons-transition-group": "0.14.0", "react-dom": "0.14.0", "rf-changelog": "^0.4.0", "style-loader": "^0.12.4",