Merge pull request #20 from nfl/feature/react-15

feat(dependency): Bump react to v15
nfl · Apr 16, 2016 · d6ca28d · d6ca28d
2 parents 865f21a + b354eea
commit d6ca28d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 sudo: false
 node_js:
-  - stable
-  - '0.12'
+  - "4"
+  - "5"
 cache:
   directories:
   - node_modules

diff --git a/examples/no-router-lib/basic/app.js b/examples/no-router-lib/basic/app.js
@@ -23,7 +23,7 @@ class App extends Component {
                     <li><a href={createHref("/page/A")}>Page A</a></li>
                     <li><a href={createHref("/page/B")}>Page B</a></li>
                 </ul>
-                {this.props.children && React.cloneElement(this.props.children, this.props)}
+                {this.props.children && React.cloneElement(this.props.children, {...this.props})}
             </div>
         );
     }

diff --git a/package.json b/package.json
@@ -37,8 +37,6 @@
     "fbjs": "^0.7.2",
     "hoist-non-react-statics": "^1.0.5",
     "querystring": "^0.2.0",
-    "react": "^0.14.8",
-    "react-dom": "^0.14.8",
     "rimraf": "^2.5.1"
   },
   "devDependencies": {
@@ -81,8 +79,10 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.4.5",
     "path-to-regexp": "^1.2.1",
-    "react-addons-test-utils": "^0.14.8",
-    "react-redux": "^4.4.0",
+    "react": "^15.0.1",
+    "react-addons-test-utils": "^15.0.1",
+    "react-dom": "^15.0.1",
+    "react-redux": "^4.4.5",
     "react-router": "^2.0.0",
     "redux": "^3.3.1",
     "sinon": "^1.17.3",