Merge pull request #4 from button/jeffrey/upgrade-react

Jeffrey Luong · web-flow · commit 6eb92c10cbbf · 2019-11-15T14:33:12.000-05:00
Upgrade react, react-dom, enzyme, sinon and install prop-types
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,9 @@
+* 2.0.0 November 7, 2019
+  - Upgrade to support React 16+
+  - Range [react-router](https://github.com/ReactTraining/react-router) to `^3.2.0` as peer dependency for React 16 support
+  - Switch `React.PropTypes` to [prop-types](https://github.com/facebook/prop-types) as `React.PropTypes` has been deprecated.
+  - Upgrade [enzyme](https://github.com/airbnb/enzyme) to `3.10.0`
+  - Upgrade [sinon](https://github.com/sinonjs/sinon) to `7.5.0`
+
 * 1.0.0 January 19, 2017
   - Initial Release
diff --git a/README.md b/README.md
@@ -43,6 +43,10 @@ three things:
 
 We support any browser supported by both [react](https://github.com/facebook/react) and [react-router](https://github.com/ReactTraining/react-router).
 
+#### React 16 Support
+
+Please note that as of `2.0.0` we provided React 16 support but with `react-router ^3.2.0` as a peer dependency. Since `react-router 4`, the Route architecture has changed significantly which means that using `react-simple-scroll` as a middleware is no longer compatible. We will work on a new version of `react-simple-scroll` in the future that will support `react-router 4` and beyond.
+
 ## Quick Start
 
 To install `react-simple-scroll`, add it as a middleware to `<Router />`:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-simple-scroll",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Declarative API for SPA scroll position",
   "main": "build/SimpleScroll.js",
   "scripts": {
@@ -27,16 +27,17 @@
   },
   "homepage": "https://github.com/button/react-simple-scroll#readme",
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0",
-    "react-router": "^2.4.0 || ^3.0.0"
+    "react": "^16.0.0",
+    "react-router": "^3.2.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
     "babel-core": "^6.21.0",
     "babel-eslint": "^7.1.1",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
-    "enzyme": "^2.7.0",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^3.13.1",
     "eslint-config-airbnb": "^13.0.0",
     "eslint-config-button": "1.0.4",
@@ -47,11 +48,11 @@
     "jsdom": "^9.9.1",
     "lodash.isequal": "^4.5.0",
     "mocha": "^3.2.0",
-    "react": "^0.14.0",
-    "react-addons-test-utils": "0.14.0",
-    "react-dom": "^0.14.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
     "rimraf": "^2.5.4",
-    "sinon": "^1.17.7"
+    "sinon": "7.5.0"
   },
   "files": [
     "LICENSE",
diff --git a/src/SimpleScroll.jsx b/src/SimpleScroll.jsx
@@ -1,5 +1,6 @@
 // eslint-disable-next-line import/no-unresolved
-import React, { PropTypes, Component } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 class SimpleScroll extends Component {
 
diff --git a/test/setup.js b/test/setup.js
@@ -1,4 +1,8 @@
 import { jsdom } from 'jsdom';
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
 
 const markup = '<html><body></body></html>';
 
