Skip to content

Commit

Permalink
Support React v15.
Browse files Browse the repository at this point in the history
  • Loading branch information
STRML committed Apr 8, 2016
1 parent 8b9104d commit f3941c5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
"jsxhint": "^0.15.1",
"mocha": "^2.3.3",
"power-assert": "^1.2.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"semver": "^5.1.0",
"zuul": "^3.6.0"
},
"peerDependencies": {
"react": ">=0.14.0 <0.15.0",
"react-dom": ">=0.14.0 <0.15.0"
"react": "^0.14.0 || ^15.0.0",
"react-dom": "^=0.14.0 || ^15.0.0"
},
"browserify": {
"transform": [
Expand Down Expand Up @@ -64,4 +66,4 @@
"publishConfig": {
"registry": "https://registry.npmjs.org"
}
}
}
2 changes: 1 addition & 1 deletion tests/browser/browser-jsx.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
var assert = require('power-assert');
var React = require('react');
var ReactDOM = React; // For 0.13
var ReactDOM = require('react-dom');
var Router = require('../../index');

var historyAPI = window.history !== undefined && window.history.pushState !== undefined;
Expand Down
2 changes: 1 addition & 1 deletion tests/browser/browser-jsx.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
var assert = require('power-assert');
var React = require('react');
var ReactDOM = React; // For 0.13
var ReactDOM = require('react-dom');
var Router = require('../../index');

var historyAPI = (
Expand Down

0 comments on commit f3941c5

Please sign in to comment.