From 8fb7a60a21d0e5b2841537c6fc71610156b19bd7 Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Mon, 10 Apr 2017 11:39:26 +0100 Subject: [PATCH 1/5] React 15.5 migration --- package.json | 6 ++++-- src/ScrollBehaviorContext.js | 9 +++++---- src/ScrollContainer.js | 9 +++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 8ae4cd9..66b6776 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "peerDependencies": { "history": "^2.0.0 || ^3.0.0", "react": "^0.14.0 || ^15.0.0", + "prop-types": "^15.0.0", "react-dom": "^0.14.0 || ^15.0.0", "react-router": "^2.3.0 || ^3.0.0" }, @@ -69,8 +70,9 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.8.0", "mocha": "^3.1.2", - "react": "^15.3.2", - "react-dom": "^15.3.2", + "prop-types": "~15.5.6", + "react": "^15.5.6", + "react-dom": "^15.5.6", "react-router": "^2.8.1", "rimraf": "^2.5.4", "sinon": "^1.17.6", diff --git a/src/ScrollBehaviorContext.js b/src/ScrollBehaviorContext.js index 1431bd8..7ee2036 100644 --- a/src/ScrollBehaviorContext.js +++ b/src/ScrollBehaviorContext.js @@ -1,16 +1,17 @@ import React from 'react'; +import PropTypes from 'prop-types'; import ScrollBehavior from 'scroll-behavior'; import StateStorage from './StateStorage'; const propTypes = { - shouldUpdateScroll: React.PropTypes.func, - routerProps: React.PropTypes.object.isRequired, - children: React.PropTypes.element.isRequired, + shouldUpdateScroll: PropTypes.func, + routerProps: PropTypes.object.isRequired, + children: PropTypes.element.isRequired, }; const childContextTypes = { - scrollBehavior: React.PropTypes.object.isRequired, + scrollBehavior: PropTypes.object.isRequired, }; class ScrollBehaviorContext extends React.Component { diff --git a/src/ScrollContainer.js b/src/ScrollContainer.js index 812a2a9..3b51c63 100644 --- a/src/ScrollContainer.js +++ b/src/ScrollContainer.js @@ -1,18 +1,19 @@ import React from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import warning from 'warning'; const propTypes = { - scrollKey: React.PropTypes.string.isRequired, - shouldUpdateScroll: React.PropTypes.func, - children: React.PropTypes.element.isRequired, + scrollKey: PropTypes.string.isRequired, + shouldUpdateScroll: PropTypes.func, + children: PropTypes.element.isRequired, }; const contextTypes = { // This is necessary when rendering on the client. However, when rendering on // the server, this container will do nothing, and thus does not require the // scroll behavior context. - scrollBehavior: React.PropTypes.object, + scrollBehavior: PropTypes.object, }; class ScrollContainer extends React.Component { From 115f2d0df29ec9d664d776a80c23fb2b46ba3a73 Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Mon, 10 Apr 2017 11:56:15 +0100 Subject: [PATCH 2/5] Fixed React version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 66b6776..63485f3 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "karma-webpack": "^1.8.0", "mocha": "^3.1.2", "prop-types": "~15.5.6", - "react": "^15.5.6", - "react-dom": "^15.5.6", + "react": "^15.5.3", + "react-dom": "^15.5.3", "react-router": "^2.8.1", "rimraf": "^2.5.4", "sinon": "^1.17.6", From cd80a39698760c4c3142245f850383369ab5af95 Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Mon, 10 Apr 2017 15:28:44 +0100 Subject: [PATCH 3/5] Replaced tide version by caret and aphabetized package imports --- package.json | 2 +- src/ScrollBehaviorContext.js | 2 +- src/ScrollContainer.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 63485f3..4ef250d 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.8.0", "mocha": "^3.1.2", - "prop-types": "~15.5.6", + "prop-types": "^15.5.6", "react": "^15.5.3", "react-dom": "^15.5.3", "react-router": "^2.8.1", diff --git a/src/ScrollBehaviorContext.js b/src/ScrollBehaviorContext.js index 7ee2036..00187fd 100644 --- a/src/ScrollBehaviorContext.js +++ b/src/ScrollBehaviorContext.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import ScrollBehavior from 'scroll-behavior'; import StateStorage from './StateStorage'; diff --git a/src/ScrollContainer.js b/src/ScrollContainer.js index 3b51c63..0a2c1a4 100644 --- a/src/ScrollContainer.js +++ b/src/ScrollContainer.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import ReactDOM from 'react-dom'; import warning from 'warning'; From 47aa767cecec791a5976b9f26814d66798a4f64f Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Mon, 10 Apr 2017 15:33:27 +0100 Subject: [PATCH 4/5] Moved prop-types package to dependencies --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 4ef250d..ac26094 100644 --- a/package.json +++ b/package.json @@ -30,13 +30,13 @@ }, "homepage": "https://github.com/taion/react-router-scroll#readme", "dependencies": { + "prop-types": "~15.5.6", "scroll-behavior": "^0.9.1", "warning": "^3.0.0" }, "peerDependencies": { "history": "^2.0.0 || ^3.0.0", "react": "^0.14.0 || ^15.0.0", - "prop-types": "^15.0.0", "react-dom": "^0.14.0 || ^15.0.0", "react-router": "^2.3.0 || ^3.0.0" }, @@ -70,7 +70,6 @@ "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.8.0", "mocha": "^3.1.2", - "prop-types": "^15.5.6", "react": "^15.5.3", "react-dom": "^15.5.3", "react-router": "^2.8.1", From 7d38afa5f295544bf904b072f5af03af72d035cd Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Mon, 10 Apr 2017 15:34:02 +0100 Subject: [PATCH 5/5] Changed tide to caret --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac26094..f2b154c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/taion/react-router-scroll#readme", "dependencies": { - "prop-types": "~15.5.6", + "prop-types": "^15.5.6", "scroll-behavior": "^0.9.1", "warning": "^3.0.0" },