Skip to content

Commit 0eab56e

Browse files
authored
Merge pull request #109 from akichim21/master
update react v16.0.0
2 parents 502f27d + 02cc675 commit 0eab56e

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ React Infinite Scroller
33

44
[![Travis](https://img.shields.io/travis/CassetteRocks/react-infinite-scroller.svg?style=flat-square)](https://travis-ci.org/CassetteRocks/react-infinite-scroller)
55
[![npm](https://img.shields.io/npm/dt/react-infinite-scroller.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroller)
6-
[![React Version](https://img.shields.io/badge/React-%5E0.14.9%20%7C%7C%20%5E15.3.0-blue.svg?style=flat-square)](https://www.npmjs.com/package/react)
6+
[![React Version](https://img.shields.io/badge/React-%5E0.14.9%20%7C%7C%20%5E15.3.0%20%7C%7C%20%5E16.0.0-blue.svg?style=flat-square)](https://www.npmjs.com/package/react)
77
[![npm](https://img.shields.io/npm/v/react-infinite-scroller.svg?style=flat-square)](https://www.npmjs.com/package/react-infinite-scroller)
88
[![npm](https://img.shields.io/npm/l/react-infinite-scroller.svg?style=flat-square)](https://github.com/CassetteRocks/react-infinite-scroller/blob/master/LICENSE)
99

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"prop-types": "^15.5.8"
3030
},
3131
"peerDependencies": {
32-
"react": "^0.14.9 || ^15.3.0"
32+
"react": "^0.14.9 || ^15.3.0 || ^16.0.0"
3333
},
3434
"devDependencies": {
3535
"babel-cli": "^6.6.5",
@@ -43,9 +43,9 @@
4343
"babel-preset-es2015": "^6.6.0",
4444
"babel-preset-react": "^6.5.0",
4545
"babel-preset-stage-2": "^6.13.0",
46-
"chai": "^3.5.0",
47-
"chai-enzyme": "^0.6.1",
48-
"enzyme": "^2.8.2",
46+
"chai": "^4.1.2",
47+
"enzyme": "^3.0.0",
48+
"enzyme-adapter-react-16": "^1.0.0",
4949
"eslint": "^3.19.0",
5050
"eslint-config-airbnb": "^14.1.0",
5151
"eslint-plugin-import": "^2.2.0",
@@ -55,9 +55,9 @@
5555
"jsdom": "^10.0.0",
5656
"mocha": "^3.3.0",
5757
"nyc": "^10.2.0",
58-
"react": "^15.5.4",
59-
"react-dom": "^15.5.4",
60-
"react-test-renderer": "^15.5.4",
58+
"react": "^16.0.0",
59+
"react-dom": "^16.0.0",
60+
"react-test-renderer": "^16.0.0",
6161
"sinon": "^2.1.0",
6262
"webpack": "^2.5.1"
6363
}

test/test_helper.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
require('babel-register')();
33
var chai = require('chai');
44
var JSDOM = require('jsdom').JSDOM;
5-
var chaiEnzyme = require('chai-enzyme');
5+
var Enzyme = require('enzyme');
6+
var Adapter = require('enzyme-adapter-react-16');
67
var exposedProperties = ['window', 'navigator', 'document'];
78

9+
Enzyme.configure({ adapter: new Adapter() });
10+
811
global.dom = new JSDOM('<body></body>');
912
global.window = dom.window.document.defaultView;
1013

@@ -18,5 +21,3 @@ Object.keys(dom.window.document.defaultView).forEach((property) => {
1821
global.navigator = {
1922
userAgent: 'node.js',
2023
};
21-
22-
chai.use(chaiEnzyme());

0 commit comments

Comments
 (0)