Skip to content

Commit 4420943

Browse files
committed
test: fix setupIsolatedFixture to inherit overrides
1 parent eb0da52 commit 4420943

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

packages/plugin-rsc/e2e/fixture.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,27 @@ export async function setupIsolatedFixture(options: {
160160

161161
// setup package.json overrides
162162
const packagesDir = path.join(import.meta.dirname, '..', '..')
163-
const overrides = {
163+
164+
// override workspace packages
165+
const overrides: Record<string, string> = {
164166
'@vitejs/plugin-rsc': `file:${path.join(packagesDir, 'plugin-rsc')}`,
165167
'@vitejs/plugin-react': `file:${path.join(packagesDir, 'plugin-react')}`,
166168
}
169+
170+
// inherit current overrides
171+
const listResult = await x(
172+
'pnpm',
173+
['list', '--json', '--depth=0', 'react', 'vite'],
174+
{
175+
nodeOptions: { cwd: path.join(import.meta.dirname, '..') },
176+
},
177+
)
178+
const deps = JSON.parse(listResult.stdout)[0].devDependencies
179+
overrides.react = deps.react.version
180+
overrides['react-dom'] = deps.react.version
181+
overrides['react-server-dom-webpack'] = deps.react.version
182+
overrides.vite = deps.vite.version
183+
167184
editFileJson(path.join(options.dest, 'package.json'), (pkg: any) => {
168185
Object.assign(((pkg.pnpm ??= {}).overrides ??= {}), overrides)
169186
return pkg

packages/plugin-rsc/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"react-server-dom-webpack": "^19.1.0",
6161
"rsc-html-stream": "^0.0.7",
6262
"tinyexec": "^1.0.1",
63-
"tsdown": "^0.13.0"
63+
"tsdown": "^0.13.0",
64+
"vite": "^7.0.5"
6465
},
6566
"peerDependencies": {
6667
"react": "*",

pnpm-lock.yaml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)