Skip to content

Commit

Permalink
[core] Allow React 17 (#23311)
Browse files Browse the repository at this point in the history
  • Loading branch information
eps1lon committed Nov 2, 2020
1 parent 2ab6acd commit c465fb6
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 32 deletions.
4 changes: 2 additions & 2 deletions framer/Material-UI.framerfx/package.json
Expand Up @@ -22,8 +22,8 @@
"peerDependencies": {
"@types/react": "^16.8.6",
"framer": "^1.0.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -175,6 +175,7 @@
"**/@babel/types": "^7.10.2",
"**/cross-fetch": "^3.0.5",
"**/dot-prop": "^5.2.0",
"**/react-is": "^16.13.1",
"**/webpack": "^4.44.1"
},
"nyc": {
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui-docs/package.json
Expand Up @@ -35,9 +35,9 @@
},
"peerDependencies": {
"@material-ui/core": "^5.0.0-alpha.1",
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui-icons/package.json
Expand Up @@ -40,9 +40,9 @@
},
"peerDependencies": {
"@material-ui/core": "^5.0.0-alpha.14",
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
8 changes: 4 additions & 4 deletions packages/material-ui-lab/package.json
Expand Up @@ -36,9 +36,9 @@
},
"peerDependencies": {
"@material-ui/core": "^5.0.0-alpha.11",
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand All @@ -52,7 +52,7 @@
"@material-ui/utils": "^5.0.0-alpha.14",
"clsx": "^1.0.4",
"prop-types": "^15.7.2",
"react-is": "^16.8.0"
"react-is": "^16.8.0 || ^17.0.0"
},
"devDependencies": {
"@material-ui/types": "^5.1.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui-styles/package.json
Expand Up @@ -38,9 +38,9 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"peerDependencies": {
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui-system/package.json
Expand Up @@ -38,9 +38,9 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"peerDependencies": {
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
8 changes: 4 additions & 4 deletions packages/material-ui-unstyled/package.json
Expand Up @@ -34,9 +34,9 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"peerDependencies": {
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand All @@ -48,7 +48,7 @@
"@material-ui/utils": "^5.0.0-alpha.14",
"clsx": "^1.0.4",
"prop-types": "^15.7.2",
"react-is": "^16.8.0"
"react-is": "^16.8.0 || ^17.0.0"
},
"devDependencies": {
"@material-ui/types": "^5.1.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/material-ui-utils/package.json
Expand Up @@ -35,15 +35,15 @@
"typescript": "tslint -p tsconfig.json \"{src,test}/**/*.{spec,d}.{ts,tsx}\" && tsc -p tsconfig.json"
},
"peerDependencies": {
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"dependencies": {
"@babel/runtime": "^7.4.4",
"@types/prop-types": "^15.7.3",
"@types/react-is": "^16.7.1",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.7.2",
"react-is": "^16.8.0"
"react-is": "^16.8.0 || ^17.0.0"
},
"devDependencies": {
"@babel/helper-module-imports": "^7.8.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/material-ui/package.json
Expand Up @@ -43,9 +43,9 @@
"peerDependencies": {
"@emotion/core": "^10.0.27",
"@emotion/styled": "^10.0.27",
"@types/react": "^16.8.6",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"@types/react": "^16.8.6 || ^17.0.0",
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand All @@ -71,7 +71,7 @@
"csstype": "^3.0.2",
"hoist-non-react-statics": "^3.3.2",
"prop-types": "^15.7.2",
"react-is": "^16.8.0",
"react-is": "^16.8.0 || ^17.0.0",
"react-transition-group": "^4.4.0"
},
"devDependencies": {},
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Expand Up @@ -3033,7 +3033,7 @@
dependencies:
"@types/react" "*"

"@types/react-is@^16.7.1":
"@types/react-is@^16.7.1 || ^17.0.0":
version "16.7.1"
resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539"
integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ==
Expand Down Expand Up @@ -13591,7 +13591,7 @@ react-focus-lock@^2.2.1:
use-callback-ref "^1.2.1"
use-sidecar "^1.0.1"

react-is@16.13.1, react-is@^16.12.0, react-is@^16.13.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
react-is@16.13.1, react-is@^16.12.0, react-is@^16.13.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, "react-is@^16.8.0 || ^17.0.0", react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
Expand Down

0 comments on commit c465fb6

Please sign in to comment.