Skip to content

Commit e150a32

Browse files
authored
fix[react-devtools/ci]: fix configurations for e2e testing (#29016)
This should fix failing DevTools e2e tests on `main`. With these changes, running tests locally successfully passes all cases.
1 parent ec15267 commit e150a32

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
},
110110
"scripts": {
111111
"build": "node ./scripts/rollup/build-all-release-channels.js",
112-
"build-for-devtools": "cross-env RELEASE_CHANNEL=experimental yarn build react/index,react/jsx,react-dom/index,react-dom/client,react-dom/unstable_testing,react-dom/test-utils,react-is,react-debug-tools,scheduler,react-test-renderer,react-refresh,react-art --type=NODE",
112+
"build-for-devtools": "cross-env RELEASE_CHANNEL=experimental yarn build react/index,react/jsx,react/compiler-runtime,react-dom/index,react-dom/client,react-dom/unstable_testing,react-dom/test-utils,react-is,react-debug-tools,scheduler,react-test-renderer,react-refresh,react-art --type=NODE",
113113
"build-for-devtools-dev": "yarn build-for-devtools --type=NODE_DEV",
114114
"build-for-devtools-prod": "yarn build-for-devtools --type=NODE_PROD",
115115
"linc": "node ./scripts/tasks/linc.js",

packages/react-devtools-shell/webpack-server.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ const makeConfig = (entry, alias) => ({
124124
},
125125
});
126126

127-
const clientAsSeparateBuild = semver.gte(REACT_VERSION, '19.0.0');
128-
129127
const app = makeConfig(
130128
{
131129
'app-index': './src/app/index.js',
@@ -144,14 +142,8 @@ const app = makeConfig(
144142
react: resolve(builtModulesDir, 'react'),
145143
'react-debug-tools': resolve(builtModulesDir, 'react-debug-tools'),
146144
'react-devtools-feature-flags': resolveFeatureFlags('shell'),
147-
'react-dom/client': resolve(
148-
builtModulesDir,
149-
clientAsSeparateBuild ? 'react-dom/unstable_testing' : 'react-dom/client',
150-
),
151-
'react-dom': resolve(
152-
builtModulesDir,
153-
clientAsSeparateBuild ? 'react-dom' : 'react-dom/unstable_testing',
154-
),
145+
'react-dom/client': resolve(builtModulesDir, 'react-dom/unstable_testing'),
146+
'react-dom': resolve(builtModulesDir, 'react-dom'),
155147
'react-is': resolve(builtModulesDir, 'react-is'),
156148
scheduler: resolve(builtModulesDir, 'scheduler'),
157149
},

0 commit comments

Comments
 (0)