From 57847c2ed24fb86ac6a99e9cfd639f6c9b4cf526 Mon Sep 17 00:00:00 2001 From: Gerald Monaco Date: Fri, 4 Jun 2021 17:36:41 +0000 Subject: [PATCH 1/4] Bump minimum React version to ^17.0.2 --- packages/next/package.json | 8 ++++---- packages/react-dev-overlay/package.json | 4 ++-- packages/react-refresh-utils/package.json | 4 ++-- yarn.lock | 17 ++++++++++++----- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/packages/next/package.json b/packages/next/package.json index d171e4547e866..fdcd727b84bdb 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -100,8 +100,8 @@ "prop-types": "15.7.2", "querystring-es3": "0.2.1", "raw-body": "2.4.1", - "react-is": "16.13.1", - "react-refresh": "0.8.3", + "react-is": "17.0.2", + "react-refresh": "0.10.0", "stream-browserify": "3.0.0", "stream-http": "3.1.1", "string_decoder": "1.3.0", @@ -116,8 +116,8 @@ "peerDependencies": { "fibers": ">= 3.1.0", "node-sass": "^4.0.0 || ^5.0.0", - "react": "^16.6.0 || ^17", - "react-dom": "^16.6.0 || ^17", + "react": "^17.0.2", + "react-dom": "^17.0.2", "sass": "^1.3.0" }, "peerDependenciesMeta": { diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json index 50a7411ebff1d..c7f5fc7df2e54 100644 --- a/packages/react-dev-overlay/package.json +++ b/packages/react-dev-overlay/package.json @@ -29,7 +29,7 @@ "strip-ansi": "6.0.0" }, "peerDependencies": { - "react": "^16.9.0 || ^17", - "react-dom": "^16.9.0 || ^17" + "react": "^17.0.2", + "react-dom": "^17.0.2" } } diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json index 6d44127f89b88..56ed4c7f69f17 100644 --- a/packages/react-refresh-utils/package.json +++ b/packages/react-refresh-utils/package.json @@ -19,7 +19,7 @@ "dev": "tsc -d -w -p tsconfig.json" }, "peerDependencies": { - "react-refresh": "0.8.3", + "react-refresh": "0.10.0", "webpack": "^4 || ^5" }, "peerDependenciesMeta": { @@ -28,6 +28,6 @@ } }, "devDependencies": { - "react-refresh": "0.8.3" + "react-refresh": "0.10.0" } } diff --git a/yarn.lock b/yarn.lock index 2657e2392c3a1..5edf25213bbf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3188,12 +3188,14 @@ "@types/react-dom@16.9.4": version "16.9.4" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df" + integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw== dependencies: "@types/react" "*" "@types/react-is@16.7.1": version "16.7.1" resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-16.7.1.tgz#d3f1c68c358c00ce116b55ef5410cf486dd08539" + integrity sha512-dMLFD2cCsxtDgMkTydQCM0PxDq8vwc6uN5M/jRktDfYvH3nQj6pjC9OrCXS2lKlYoYTNJorI/dI8x9dpLshexQ== dependencies: "@types/react" "*" @@ -13820,7 +13822,12 @@ react-dom@17.0.1: object-assign "^4.1.1" scheduler "^0.20.1" -react-is@16.13.1, react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -13829,10 +13836,10 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-refresh@0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" - integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== +react-refresh@0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3" + integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ== react-ssr-prepass@1.0.8: version "1.0.8" From 4c676547fd8d93657495ce705e62d91c2d3eaffb Mon Sep 17 00:00:00 2001 From: Gerald Monaco Date: Fri, 4 Jun 2021 18:55:43 +0000 Subject: [PATCH 2/4] Revert react-refresh change for now --- package.json | 4 ++-- packages/next/package.json | 2 +- packages/react-refresh-utils/package.json | 4 ++-- yarn.lock | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 47f98237ba28b..b3ac6631f0316 100644 --- a/package.json +++ b/package.json @@ -110,8 +110,8 @@ "prettier": "2.0.5", "pretty-bytes": "5.3.0", "pretty-ms": "7.0.0", - "react": "17.0.1", - "react-dom": "17.0.1", + "react": "17.0.2", + "react-dom": "17.0.2", "react-ssr-prepass": "1.0.8", "release": "6.3.0", "request-promise-core": "1.1.2", diff --git a/packages/next/package.json b/packages/next/package.json index 213bd7236b698..f97480d3fc26a 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -102,7 +102,7 @@ "querystring-es3": "0.2.1", "raw-body": "2.4.1", "react-is": "17.0.2", - "react-refresh": "0.10.0", + "react-refresh": "0.8.3", "stream-browserify": "3.0.0", "stream-http": "3.1.1", "string_decoder": "1.3.0", diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json index acf1adad63eaa..30093a7f6a5cd 100644 --- a/packages/react-refresh-utils/package.json +++ b/packages/react-refresh-utils/package.json @@ -19,7 +19,7 @@ "dev": "tsc -d -w -p tsconfig.json" }, "peerDependencies": { - "react-refresh": "0.10.0", + "react-refresh": "0.8.3", "webpack": "^4 || ^5" }, "peerDependenciesMeta": { @@ -28,6 +28,6 @@ } }, "devDependencies": { - "react-refresh": "0.10.0" + "react-refresh": "0.8.3" } } diff --git a/yarn.lock b/yarn.lock index 32ae26d821cd1..01b1b07314697 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13850,10 +13850,10 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-refresh@0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3" - integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ== +react-refresh@0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" + integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== react-ssr-prepass@1.0.8: version "1.0.8" From f7d08ddebdf12729fac5596bb3c1fad3208c33f2 Mon Sep 17 00:00:00 2001 From: Gerald Monaco Date: Sat, 5 Jun 2021 16:32:34 +0000 Subject: [PATCH 3/4] Remove React 16 tests --- .github/workflows/build_test_deploy.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 51e71ed0af9f9..620dbd37b4490 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -177,8 +177,8 @@ jobs: - run: xvfb-run node run-tests.js test/integration/{fallback-modules,link-ref,production,basic,async-modules,font-optimization,ssr-ctx}/test/index.test.js test/acceptance/*.test.js if: ${{needs.build.outputs.docsChange != 'docs only change'}} - testLegacyReact: - name: React 16 + Webpack 4 (Basic, Production, Acceptance) + testLegacyWebpack: + name: Webpack 4 (Basic, Production, Acceptance) runs-on: ubuntu-latest env: NEXT_TELEMETRY_DISABLED: 1 @@ -196,12 +196,6 @@ jobs: - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/* if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} - - run: cat package.json | jq '.resolutions.react = "^16.14.0"' > package.json.tmp && mv package.json.tmp package.json - if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} - - - run: cat package.json | jq '.resolutions."react-dom" = "^16.14.0"' > package.json.tmp && mv package.json.tmp package.json - if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} - - run: yarn install --check-files if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} From 88ae8334fcfeb2eb7560e94f97bfd460ccfd54a4 Mon Sep 17 00:00:00 2001 From: Gerald Monaco Date: Sun, 6 Jun 2021 18:46:48 +0000 Subject: [PATCH 4/4] Fix yarn --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 01b1b07314697..0e8c6771a5f54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13827,14 +13827,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dom@17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" - integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== +react-dom@17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - scheduler "^0.20.1" + scheduler "^0.20.2" react-is@17.0.2: version "17.0.2" @@ -13861,10 +13861,10 @@ react-ssr-prepass@1.0.8: dependencies: object-is "^1.0.1" -react@17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== +react@17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -14699,10 +14699,10 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@^0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" - integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1"