From 11ef98c42232f25d8533292846a9404740eee7fe Mon Sep 17 00:00:00 2001 From: Anders Hassis Date: Wed, 19 Apr 2017 07:30:01 +0200 Subject: [PATCH 1/3] Use separate prop-types package when upgrading --- src/LinkContainer.js | 28 ++++++++++++++-------------- test/visual/index.js | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/LinkContainer.js b/src/LinkContainer.js index 3225df0..07860b8 100644 --- a/src/LinkContainer.js +++ b/src/LinkContainer.js @@ -1,6 +1,6 @@ // This is largely taken from react-router/lib/Link. - import React from 'react'; +import PropTypes from 'prop-types'; function isLeftClickEvent(event) { return event.button === 0; @@ -24,26 +24,26 @@ function createLocationDescriptor(to, query, hash, state) { } const propTypes = { - onlyActiveOnIndex: React.PropTypes.bool.isRequired, - to: React.PropTypes.oneOfType([ - React.PropTypes.string, - React.PropTypes.object, + onlyActiveOnIndex: PropTypes.bool.isRequired, + to: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.object, ]).isRequired, - query: React.PropTypes.string, - hash: React.PropTypes.string, - state: React.PropTypes.object, - action: React.PropTypes.oneOf([ + query: PropTypes.string, + hash: PropTypes.string, + state: PropTypes.object, + action: PropTypes.oneOf([ 'push', 'replace', ]).isRequired, - onClick: React.PropTypes.func, - active: React.PropTypes.bool, - target: React.PropTypes.string, - children: React.PropTypes.node.isRequired, + onClick: PropTypes.func, + active: PropTypes.bool, + target: PropTypes.string, + children: PropTypes.node.isRequired, }; const contextTypes = { - router: React.PropTypes.object, + router: PropTypes.object, }; const defaultProps = { diff --git a/test/visual/index.js b/test/visual/index.js index 9c1a3c1..e1f3490 100644 --- a/test/visual/index.js +++ b/test/visual/index.js @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; import Grid from 'react-bootstrap/lib/Grid'; import ReactDOM from 'react-dom'; import { hashHistory, IndexRedirect, Route, Router } from 'react-router'; @@ -12,7 +13,7 @@ import NavItemVisual from './NavItemVisual'; import 'bootstrap/less/bootstrap.less'; const propTypes = { - children: React.PropTypes.node.isRequired, + children: PropTypes.node.isRequired, }; const App = ({ children }) => ( From 820cccdf658c290b541ebb2de689019aa484e9ef Mon Sep 17 00:00:00 2001 From: Anders Hassis Date: Wed, 19 Apr 2017 07:30:07 +0200 Subject: [PATCH 2/3] Updated packages --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 9508d41..994fb14 100644 --- a/package.json +++ b/package.json @@ -87,6 +87,9 @@ "webpack-dev-server": "^1.14.1", "yargs": "^4.8.1" }, + "dependencies": { + "prop-types": "^15.5.8" + }, "release-script": { "bowerRepo": "git@github.com:react-bootstrap/react-router-bootstrap-bower.git" } From e80729727f3ccd2d5335ec1a3a7431f0fc3c0e46 Mon Sep 17 00:00:00 2001 From: Jimmy Jia Date: Wed, 19 Apr 2017 01:47:58 -0400 Subject: [PATCH 3/3] Minor fixes --- .travis.yml | 1 + package.json | 56 ++++++++++++++++----------------- src/LinkContainer.js | 2 +- test/IndexLinkContainer.spec.js | 2 +- test/LinkContainer.spec.js | 2 +- test/visual/index.js | 2 +- 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index da1d3b9..0e5804e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,3 +20,4 @@ before_install: branches: only: - master + - rr-v3 diff --git a/package.json b/package.json index 994fb14..ee71297 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "build": "rimraf lib && babel src -d lib && webpack && webpack -p && npm run bower-prepare", "lint": "eslint scripts src test *.js", "release": "release", - "test": "npm run lint && karma start", + "test": "npm run lint && karma start --single-run", "visual-test": "open http://localhost:8080/ && webpack-dev-server --config webpack.visual.config.babel.js" }, "repository": { @@ -33,19 +33,19 @@ }, "homepage": "https://github.com/react-bootstrap/react-router-bootstrap", "peerDependencies": { - "react": ">=0.14.0" + "react": ">=0.14.9" }, "devDependencies": { - "babel-cli": "^6.11.4", - "babel-core": "^6.11.4", - "babel-eslint": "^6.1.2", - "babel-loader": "^6.2.4", + "babel-cli": "^6.24.1", + "babel-core": "^6.24.1", + "babel-eslint": "^7.2.2", + "babel-loader": "^6.4.1", "babel-plugin-add-module-exports": "^0.2.1", - "babel-preset-es2015": "^6.9.0", + "babel-preset-es2015": "^6.24.1", "babel-preset-es2015-loose": "^7.0.0", - "babel-preset-react": "^6.11.1", - "babel-preset-stage-1": "^6.5.0", - "babel-register": "^6.11.5", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-1": "^6.24.1", + "babel-register": "^6.24.1", "bootstrap": "^3.3.7", "chai": "^3.5.0", "colors": "^1.1.2", @@ -55,37 +55,37 @@ "eslint-plugin-babel": "^3.3.0", "eslint-plugin-import": "^1.11.1", "eslint-plugin-jsx-a11y": "^1.5.5", - "eslint-plugin-mocha": "^4.1.0", + "eslint-plugin-mocha": "^4.9.0", "eslint-plugin-react": "^5.2.2", "file-loader": "^0.9.0", "history": "^2.1.2", - "html-webpack-plugin": "^2.22.0", - "karma": "^1.1.1", + "html-webpack-plugin": "^2.28.0", + "karma": "^1.6.0", "karma-chrome-launcher": "^1.0.1", - "karma-firefox-launcher": "^1.0.0", - "karma-mocha": "^1.1.1", - "karma-mocha-reporter": "^2.0.4", - "karma-sinon-chai": "^1.2.3", + "karma-firefox-launcher": "^1.0.1", + "karma-mocha": "^1.3.0", + "karma-mocha-reporter": "^2.2.3", + "karma-sinon-chai": "^1.3.1", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.7.0", - "less": "^2.7.1", + "less": "^2.7.2", "less-loader": "^2.2.3", - "lodash": "^4.14.0", + "lodash": "^4.17.4", "mocha": "^2.5.3", - "react": "^15.2.1", - "react-bootstrap": "^0.30.0", - "react-dom": "^15.2.1", + "react": "^15.5.4", + "react-bootstrap": "^0.30.9", + "react-dom": "^15.5.4", "react-router": "^2.6.0", "release-script": "^1.0.2", - "rimraf": "^2.5.4", - "shelljs": "^0.7.2", - "sinon": "^1.17.4", - "sinon-chai": "^2.8.0", + "rimraf": "^2.6.1", + "shelljs": "^0.7.7", + "sinon": "^2.1.0", + "sinon-chai": "^2.9.0", "style-loader": "^0.13.1", - "url-loader": "^0.5.7", + "url-loader": "^0.5.8", "webpack": "^1.13.1", "webpack-dev-server": "^1.14.1", - "yargs": "^4.8.1" + "yargs": "^7.1.0" }, "dependencies": { "prop-types": "^15.5.8" diff --git a/src/LinkContainer.js b/src/LinkContainer.js index 07860b8..f19895c 100644 --- a/src/LinkContainer.js +++ b/src/LinkContainer.js @@ -1,6 +1,6 @@ // This is largely taken from react-router/lib/Link. -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; function isLeftClickEvent(event) { return event.button === 0; diff --git a/test/IndexLinkContainer.spec.js b/test/IndexLinkContainer.spec.js index daacc13..13b4046 100644 --- a/test/IndexLinkContainer.spec.js +++ b/test/IndexLinkContainer.spec.js @@ -1,7 +1,7 @@ import React from 'react'; -import ReactTestUtils from 'react/lib/ReactTestUtils'; import * as ReactBootstrap from 'react-bootstrap'; import ReactDOM from 'react-dom'; +import ReactTestUtils from 'react-dom/test-utils'; import { createMemoryHistory, IndexRoute, Route, Router } from 'react-router'; import IndexLinkContainer from '../src/IndexLinkContainer'; diff --git a/test/LinkContainer.spec.js b/test/LinkContainer.spec.js index b4c2fd4..7553d2f 100644 --- a/test/LinkContainer.spec.js +++ b/test/LinkContainer.spec.js @@ -1,7 +1,7 @@ import React from 'react'; -import ReactTestUtils from 'react/lib/ReactTestUtils'; import * as ReactBootstrap from 'react-bootstrap'; import ReactDOM from 'react-dom'; +import ReactTestUtils from 'react-dom/test-utils'; import { createMemoryHistory, Route, Router } from 'react-router'; import LinkContainer from '../src/LinkContainer'; diff --git a/test/visual/index.js b/test/visual/index.js index e1f3490..9bf263e 100644 --- a/test/visual/index.js +++ b/test/visual/index.js @@ -1,5 +1,5 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; import Grid from 'react-bootstrap/lib/Grid'; import ReactDOM from 'react-dom'; import { hashHistory, IndexRedirect, Route, Router } from 'react-router';