Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFR] Upgrade react to 16.9 #3706

Merged
merged 1 commit into from
Sep 20, 2019
Merged

[RFR] Upgrade react to 16.9 #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ In the `packages.json`, upgrade ALL react-admin related dependencies to 3.0.0. T
+ "ra-language-french": "^3.0.0",
- "react-admin": "^2.9.6",
+ "react-admin": "^3.0.0",
"react": "~16.8.0",
"react-dom": "~16.8.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
...
},
```
Expand All @@ -30,7 +30,7 @@ Failing to upgrade one of the `ra-` packages will result in a duplication of the

## Increased version requirement for key dependencies

* `react` and `react-dom` are now required to be >= 16.8. This version is backward compatible with 16.3, which was the minimum requirement in react-admin, but it offers the support for Hooks.
* `react` and `react-dom` are now required to be >= 16.9. This version is backward compatible with 16.3, which was the minimum requirement in react-admin, but it offers the support for Hooks.
* `react-redux` requires a minimum version of 7.1.0 (instead of 5.0). Check their upgrade guide for [6.0](https://github.com/reduxjs/react-redux/releases/tag/v6.0.0) and [7.0](https://github.com/reduxjs/react-redux/releases/tag/v7.0.0)
* `redux-form` requires a minimum version of 8.2 (instead of 7.4). Check their [Upgrade guide](https://github.com/erikras/redux-form/releases/tag/v8.0.0).
* `material-ui` requires a minimum of 4.0.0 (instead of 1.5). Check their [Upgrade guide](https://next.material-ui.com/guides/migration-v3/).
Expand Down
4 changes: 2 additions & 2 deletions examples/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"ra-input-rich-text": "^3.0.0-alpha.0",
"ra-language-english": "^3.0.0-alpha.0",
"ra-language-french": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react": "^16.9.0",
"react-admin": "^3.0.0-alpha.0",
"react-app-polyfill": "^0.1.3",
"react-dom": "~16.8.0",
"react-dom": "^16.9.0",
"react-redux": "^7.1.0",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"ra-language-french": "^3.0.0-alpha.0",
"ra-tree-core": "^3.0.0-alpha.0",
"ra-tree-ui-materialui": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react": "^16.9.0",
"react-admin": "^3.0.0-alpha.0",
"react-dom": "~16.8.0"
"react-dom": "^16.9.0"
}
}
4 changes: 2 additions & 2 deletions examples/tutorial/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"dependencies": {
"@material-ui/core": "^4.3.3",
"ra-data-json-server": "^3.0.0-alpha.0",
"react": "~16.8.0",
"react": "^16.9.0",
"react-admin": "^3.0.0-alpha.0",
"react-dom": "~16.8.0",
"react-dom": "^16.9.0",
"react-scripts": "^3.0.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@types/jest": "^24.0.13",
"@types/react": "^16.8.0",
"@types/react": "^16.9.0",
"@types/react-redux": "^7.1.1",
"@types/recompose": "^0.27.0",
"@typescript-eslint/eslint-plugin": "^1.9.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/ra-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
"enzyme-adapter-react-16": "~1.12.1",
"history": "^4.7.2",
"ignore-styles": "~5.0.1",
"react": "~16.8.0",
"react-dom": "~16.8.0",
"react-test-renderer": "~16.8.6",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-test-renderer": "^16.9.0",
"rimraf": "^2.6.3"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"@testing-library/react": "^8.0.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-input-rich-text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
},
"peerDependencies": {
"ra-core": "^3.0.0-alpha.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"lodash": "~4.17.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-tree-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"watch": "rimraf ./lib && tsc --watch"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"performant-array-to-tree": "^1.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-tree-ui-materialui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"peerDependencies": {
"ra-core": "^3.0.0-alpha.0",
"ra-ui-materialui": "^2.5.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"final-form": "^4.18.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/ra-ui-materialui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
"enzyme-adapter-react-16": "~1.12.1",
"file-api": "~0.10.4",
"ignore-styles": "~5.0.1",
"react": "~16.8.0",
"react-dom": "~16.8.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-test-renderer": "~16.8.6",
"rimraf": "^2.6.3"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"@material-ui/core": "^4.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"rimraf": "^2.6.3"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"dependencies": {
"ra-core": "^3.0.0-alpha.4",
Expand Down
28 changes: 4 additions & 24 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^16.8.0":
"@types/react@*", "@types/react@^16.9.0":
version "16.9.2"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.2.tgz#6d1765431a1ad1877979013906731aae373de268"
integrity sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==
Expand Down Expand Up @@ -12677,7 +12677,7 @@ react-dnd@^5.0.0:
recompose "^0.27.1"
shallowequal "^1.0.2"

react-dom@16.9.0:
react-dom@16.9.0, react-dom@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
Expand All @@ -12687,16 +12687,6 @@ react-dom@16.9.0:
prop-types "^15.6.2"
scheduler "^0.15.0"

react-dom@~16.8.0:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.6"

react-dropzone@^10.1.7:
version "10.1.7"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.1.7.tgz#faba6b460a41a27a2d642316602924fe0ec2139c"
Expand Down Expand Up @@ -12851,7 +12841,7 @@ react-scripts@^3.0.0:
optionalDependencies:
fsevents "2.0.7"

react-test-renderer@^16.0.0-0:
react-test-renderer@^16.0.0-0, react-test-renderer@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz#7ed657a374af47af88f66f33a3ef99c9610c8ae9"
integrity sha512-R62stB73qZyhrJo7wmCW9jgl/07ai+YzvouvCXIJLBkRlRqLx4j9RqcLEAfNfU3OxTGucqR2Whmn3/Aad6L3hQ==
Expand Down Expand Up @@ -12891,7 +12881,7 @@ react-transition-group@^4.0.0:
loose-envify "^1.4.0"
prop-types "^15.6.2"

react@16.9.0:
react@16.9.0, react@^16.9.0:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
Expand All @@ -12900,16 +12890,6 @@ react@16.9.0:
object-assign "^4.1.1"
prop-types "^15.6.2"

react@~16.8.0:
version "16.8.6"
resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.13.6"

read-chunk@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
Expand Down