Skip to content

Commit

Permalink
[Compat] support React@15.5
Browse files Browse the repository at this point in the history
A few deprecation warnings were added in React@15.5. This supports the
new APIs that React recommends.

Closes #875
  • Loading branch information
Kent C. Dodds authored and ljharb committed Apr 12, 2017
1 parent a8cf810 commit e901252
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 6 deletions.
10 changes: 9 additions & 1 deletion README.md
Expand Up @@ -60,14 +60,22 @@ npm i --save-dev enzyme
Enzyme is currently compatible with `React 15.x`, `React 0.14.x` and `React 0.13.x`. In order to
achieve this compatibility, some dependencies cannot be explicitly listed in our `package.json`.

If you are using `React 0.14` or `React 15.x`, in addition to `enzyme`, you will have to ensure that
If you are using `React 0.14` or `React <15.5`, in addition to `enzyme`, you will have to ensure that
you also have the following npm modules installed if they were not already:

```bash
npm i --save-dev react-addons-test-utils
npm i --save-dev react-dom
```

If you are using `React >=15.5`, in addition to `enzyme`, you will have to ensure that you also have
the following npm modules installed if they were not already:

```bash
npm i --save-dev react-dom
npm i --save-dev prop-types
```


Basic Usage
===========
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -23,7 +23,7 @@
"react:clean": "rimraf node_modules/react node_modules/react-dom node_modules/react-addons-test-utils",
"react:13": "rimraf node_modules/.bin/npm && npm run react:clean && npm i react@0.13 && npm install",
"react:14": "rimraf node_modules/.bin/npm && npm run react:clean && npm i react@0.14 react-dom@0.14 react-addons-test-utils@0.14 && npm install",
"react:15": "rimraf node_modules/.bin/npm && npm run react:clean && npm i react@15 react-dom@15 react-addons-test-utils@15 && npm install",
"react:15": "rimraf node_modules/.bin/npm && npm run react:clean && npm i react@15 react-dom@15 react-addons-test-utils@15 prop-types@15 create-react-class@15 && npm install",
"docs:clean": "rimraf _book",
"docs:prepare": "gitbook install",
"docs:build": "npm run docs:prepare && gitbook build",
Expand Down
3 changes: 2 additions & 1 deletion src/ReactWrapperComponent.jsx
@@ -1,5 +1,6 @@
import React, { PropTypes } from 'react';
import React from 'react';
import objectAssign from 'object.assign';
import { PropTypes, createClass } from './react-compat';

/* eslint react/forbid-prop-types: 0 */

Expand Down
25 changes: 22 additions & 3 deletions src/react-compat.js
Expand Up @@ -7,7 +7,7 @@
*/

import objectAssign from 'object.assign';
import { REACT013 } from './version';
import { REACT013, REACT155 } from './version';

let TestUtils;
let createShallowRenderer;
Expand All @@ -18,6 +18,8 @@ let childrenToArray;
let renderWithOptions;
let unmountComponentAtNode;
let batchedUpdates;
let PropTypes;
let createClass;

const React = require('react');

Expand Down Expand Up @@ -95,8 +97,13 @@ if (REACT013) {
// to list this as a dependency in package.json and have 0.13 work properly.
// As a result, right now this is basically an implicit dependency.
try {
// eslint-disable-next-line import/no-extraneous-dependencies
TestUtils = require('react-addons-test-utils');
if (REACT155) {
// eslint-disable-next-line import/no-extraneous-dependencies
TestUtils = require('react-dom/test-utils');
} else {
// eslint-disable-next-line import/no-extraneous-dependencies
TestUtils = require('react-addons-test-utils');
}
} catch (e) {
// eslint-disable-next-line no-console
console.error(
Expand Down Expand Up @@ -150,6 +157,16 @@ if (REACT013) {
};
}

if (REACT155) {
// eslint-disable-next-line import/no-extraneous-dependencies
PropTypes = require('prop-types');
// eslint-disable-next-line import/no-extraneous-dependencies
createClass = require('create-react-class');
} else {
PropTypes = React.PropTypes;
createClass = React.createClass;
}

function isDOMComponentElement(inst) {
return React.isValidElement(inst) && typeof inst.type === 'string';
}
Expand Down Expand Up @@ -185,4 +202,6 @@ export {
renderWithOptions,
unmountComponentAtNode,
batchedUpdates,
PropTypes,
createClass,
};
1 change: 1 addition & 0 deletions src/version.js
Expand Up @@ -4,3 +4,4 @@ export const VERSION = React.version;
export const REACT013 = VERSION.slice(0, 4) === '0.13';
export const REACT014 = VERSION.slice(0, 4) === '0.14';
export const REACT15 = VERSION.slice(0, 3) === '15.';
export const REACT155 = VERSION.slice(0, 4) === '15.5';

0 comments on commit e901252

Please sign in to comment.