Skip to content

Commit

Permalink
Merge pull request #3144 from marmelab/fix-react-router-warnings
Browse files Browse the repository at this point in the history
[RFR] Relax react router dependency to avoid version mismatch
  • Loading branch information
Gildas Garcia authored Apr 19, 2019
2 parents 93bc43f + 00e3819 commit eff280e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 32 deletions.
2 changes: 1 addition & 1 deletion docs/Admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ By default, react-admin creates URLs using a hash sign (e.g. "myadmin.acme.com/#
You can create your own `history` function (compatible with [the `history` npm package](https://github.com/reacttraining/history)), and pass it to the `<Admin>` component to override the default history strategy. For instance, to use `browserHistory`:

```js
import createHistory from 'history/createBrowserHistory';
import { createBrowserHistory as createHistory } from 'history';

const history = createHistory();

Expand Down
2 changes: 1 addition & 1 deletion examples/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-app-polyfill": "^0.1.3",
"react-dom": "~16.3.1",
"react-redux": "~5.0.7",
"react-router-dom": "~4.2.2",
"react-router-dom": "^4.2.0",
"react-scripts": "^2.0.5",
"recompose": "~0.26.0",
"redux-form": "~7.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"query-string": "~5.1.1",
"ra-language-english": "^2.8.5",
"react-redux": "~5.0.7",
"react-router": "~4.2.0",
"react-router-dom": "~4.2.2",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.0",
"react-router-redux": "~5.0.0-alpha.9",
"recompose": "~0.26.0",
"redux": "~3.7.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-realtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"peerDependencies": {
"ra-core": "^2.5.0",
"react-admin": "^2.5.3",
"react-router": "~4.2.0",
"react-router": "^4.2.0",
"react-router-redux": "~5.0.0-alpha.9",
"redux-saga": "~0.16.0"
},
"devDependencies": {
"cross-env": "^5.2.0",
"react-router": "~4.2.0",
"react-router": "^4.2.0",
"react-router-redux": "~5.0.0-alpha.9",
"redux-saga": "~0.16.0",
"rimraf": "^2.6.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"react-dropzone": "~4.0.1",
"react-headroom": "^2.2.4",
"react-redux": "~5.0.7",
"react-router": "~4.2.0",
"react-router-dom": "~4.2.2",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.0",
"react-router-redux": "~5.0.0-alpha.9",
"react-transition-group": "^2.2.1",
"recompose": "~0.26.0",
Expand Down
35 changes: 11 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7337,7 +7337,7 @@ hoek@4.x.x:
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==

hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.4:
hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.4:
version "2.5.5"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
Expand Down Expand Up @@ -11879,7 +11879,7 @@ prompts@^0.1.9:
kleur "^2.0.1"
sisteransi "^0.1.1"

prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@~15.6.1:
prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@~15.6.1:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
Expand Down Expand Up @@ -12279,17 +12279,17 @@ react-redux@~5.0.7:
loose-envify "^1.1.0"
prop-types "^15.6.0"

react-router-dom@~4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"
integrity sha512-cHMFC1ZoLDfEaMFoKTjN7fry/oczMgRt5BKfMAkTu5zEuJvUiPp1J8d0eXSVTnBh6pxlbdqDhozunOOLtmKfPA==
react-router-dom@^4.2.0:
version "4.3.1"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
dependencies:
history "^4.7.2"
invariant "^2.2.2"
invariant "^2.2.4"
loose-envify "^1.3.1"
prop-types "^15.5.4"
react-router "^4.2.0"
warning "^3.0.0"
prop-types "^15.6.1"
react-router "^4.3.1"
warning "^4.0.1"

react-router-redux@~5.0.0-alpha.9:
version "5.0.0-alpha.9"
Expand All @@ -12300,7 +12300,7 @@ react-router-redux@~5.0.0-alpha.9:
prop-types "^15.6.0"
react-router "^4.2.0"

react-router@^4.2.0:
react-router@^4.2.0, react-router@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
Expand All @@ -12313,19 +12313,6 @@ react-router@^4.2.0:
prop-types "^15.6.1"
warning "^4.0.1"

react-router@~4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986"
integrity sha512-DY6pjwRhdARE4TDw7XjxjZsbx9lKmIcyZoZ+SDO7SBJ1KUeWNxT22Kara2AC7u6/c2SYEHlEDLnzBCcNhLE8Vg==
dependencies:
history "^4.7.2"
hoist-non-react-statics "^2.3.0"
invariant "^2.2.2"
loose-envify "^1.3.1"
path-to-regexp "^1.7.0"
prop-types "^15.5.4"
warning "^3.0.0"

react-scripts@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-2.0.5.tgz#74b8e9fa6a7c5f0f11221dd18c10df2ae3df3d69"
Expand Down

0 comments on commit eff280e

Please sign in to comment.