From dd274b64b3c44979e3e825dd9e434e1d070a2ebd Mon Sep 17 00:00:00 2001 From: eps1lon Date: Sun, 13 Mar 2022 08:42:48 +0100 Subject: [PATCH 1/3] test-build-devtools uses same release-channel as CI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec226416e21..80a697031d5 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "test-prod-build": "yarn test --deprecated 'yarn test --prod --build'", "test-build": "yarn test --deprecated 'yarn test --build'", "test-build-prod": "yarn test --deprecated 'yarn test --build --prod'", - "test-build-devtools": "yarn test --build --project devtools", + "test-build-devtools": "node ./scripts/jest/jest-cli.js --build --project devtools --release-channel=experimental", "debug-test-build-devtools": "yarn test --deprecated 'yarn test-build-devtools --debug'", "test-dom-fixture": "cd fixtures/dom && yarn && yarn prestart && yarn test", "flow": "node ./scripts/tasks/flow.js", From 5402c219584f1a088b651ddc7b6698a2d8d79ca6 Mon Sep 17 00:00:00 2001 From: eps1lon Date: Sun, 13 Mar 2022 09:54:22 +0100 Subject: [PATCH 2/3] Update ReactVersion so that build-for-devtools uses the correct version --- packages/react-devtools-shared/src/backend/renderer.js | 2 +- packages/shared/ReactVersion.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js index 32ce8e2a9fe..eea0100d102 100644 --- a/packages/react-devtools-shared/src/backend/renderer.js +++ b/packages/react-devtools-shared/src/backend/renderer.js @@ -220,7 +220,7 @@ export function getInternalReactConstants( // Keep it in sync, and add version guards if it changes. // // TODO Update the gt() check below to be gte() whichever the next version number is. - // Currently the version in Git is 17.0.2 (but that version has not been/may not end up being released). + // Currently the version in Git is 18.0.0 (but that version has not been/may not end up being released). if (gt(version, '17.0.1')) { ReactTypeOfWork = { CacheComponent: 24, // Experimental diff --git a/packages/shared/ReactVersion.js b/packages/shared/ReactVersion.js index 8d357322ca3..51aebd51ee5 100644 --- a/packages/shared/ReactVersion.js +++ b/packages/shared/ReactVersion.js @@ -7,10 +7,10 @@ // TODO: this is special because it gets imported during build. // -// TODO: 17.0.3 has not been released to NPM; +// TODO: 18.0.0 has not been released to NPM; // It exists as a placeholder so that DevTools can support work tag changes between releases. -// When we next publish a release (either 17.0.3 or 17.1.0), update the matching TODO in backend/renderer.js +// When we next publish a release, update the matching TODO in backend/renderer.js // TODO: This module is used both by the release scripts and to expose a version // at runtime. We should instead inject the version number as part of the build // process, and use the ReactVersions.js module as the single source of truth. -export default '17.0.3'; +export default '18.0.0'; From 6f99d07017f8a5f5b55f6e098a9a3c34053e042a Mon Sep 17 00:00:00 2001 From: Sebastian Silbermann Date: Wed, 23 Mar 2022 06:18:24 +0100 Subject: [PATCH 3/3] Update packages/react-devtools-shared/src/backend/renderer.js Co-authored-by: Brian Vaughn --- packages/react-devtools-shared/src/backend/renderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js index eea0100d102..32ce8e2a9fe 100644 --- a/packages/react-devtools-shared/src/backend/renderer.js +++ b/packages/react-devtools-shared/src/backend/renderer.js @@ -220,7 +220,7 @@ export function getInternalReactConstants( // Keep it in sync, and add version guards if it changes. // // TODO Update the gt() check below to be gte() whichever the next version number is. - // Currently the version in Git is 18.0.0 (but that version has not been/may not end up being released). + // Currently the version in Git is 17.0.2 (but that version has not been/may not end up being released). if (gt(version, '17.0.1')) { ReactTypeOfWork = { CacheComponent: 24, // Experimental