Skip to content

fix(rsc): fall back on root resolution errors #1309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nihgwu wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(rsc): fall back on root resolution errors #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 121 additions & 0 deletions packages/plugin-rsc/e2e/client-package-resolution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import { expect, test } from '@playwright/test'
import { setupInlineFixture, useFixture } from './fixture'
import { waitForHydration } from './helper'

test.describe(() => {
const root = 'examples/e2e/temp/client-package-resolution'

test.beforeAll(async () => {
await setupInlineFixture({
src: 'examples/starter-extra',
dest: root,
files: {
'package.json': {
edit: (source) => {
const packageJson = JSON.parse(source)
packageJson.dependencies = {
...packageJson.dependencies,
'@vitejs/test-dep-root-conflict': '1.0.0',
'@vitejs/test-dep-server-with-root-conflict': '1.0.0',
}
return JSON.stringify(packageJson, null, 2) + '\n'
},
},
'src/root.tsx': /* tsx */ `
import { TestServer } from '@vitejs/test-dep-server-with-root-conflict/server'

export function Root() {
return (
<html lang="en">
<body>
<TestServer />
</body>
</html>
)
}
`,
'node_modules/@vitejs/test-dep-root-conflict/package.json': /* json */ `
{
"name": "@vitejs/test-dep-root-conflict",
"version": "1.0.0",
"type": "module",
"exports": {
".": "./index.js"
}
}
`,
'node_modules/@vitejs/test-dep-root-conflict/index.js': /* js */ `
export const root = true
`,
'node_modules/@vitejs/test-dep-server-with-root-conflict/package.json': /* json */ `
{
"name": "@vitejs/test-dep-server-with-root-conflict",
"version": "1.0.0",
"type": "module",
"exports": {
"./server": "./server.js"
},
"dependencies": {
"@vitejs/test-dep-root-conflict": "2.0.0"
},
"peerDependencies": {
"react": "*"
}
}
`,
'node_modules/@vitejs/test-dep-server-with-root-conflict/server.js': /* js */ `
import { TestClient } from '@vitejs/test-dep-root-conflict/client'
import React from 'react'

export function TestServer() {
return React.createElement(TestClient)
}
`,
'node_modules/@vitejs/test-dep-server-with-root-conflict/node_modules/@vitejs/test-dep-root-conflict/package.json': /* json */ `
{
"name": "@vitejs/test-dep-root-conflict",
"version": "2.0.0",
"type": "module",
"exports": {
"./client": "./client.js"
},
"peerDependencies": {
"react": "*"
}
}
`,
'node_modules/@vitejs/test-dep-server-with-root-conflict/node_modules/@vitejs/test-dep-root-conflict/client.js': /* js */ `
'use client'

import React from 'react'

export function TestClient() {
const [count, setCount] = React.useState(0)
return React.createElement(
'button',
{ onClick: () => setCount((value) => value + 1) },
'Nested client: ' + count,
)
}
`,
},
})
})

for (const mode of ['dev', 'build'] as const) {
test.describe(mode, () => {
const f = useFixture({ root, mode })

test('uses the client package resolved from its importer', async ({
page,
}) => {
await page.goto(f.url())
await waitForHydration(page)
await page.getByRole('button', { name: 'Nested client: 0' }).click()
await expect(
page.getByRole('button', { name: 'Nested client: 1' }),
).toBeVisible()
})
})
}
})
16 changes: 11 additions & 5 deletions packages/plugin-rsc/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,11 +1738,17 @@ function vitePluginUseClient(
this.environment.config.root,
'index.html',
)
const resolvedAtRoot = await this.resolve(
source,
rootImporter,
options,
)
let resolvedAtRoot
try {
resolvedAtRoot = await this.resolve(
source,
rootImporter,
options,
)
} catch {
// A different version at the root may not export this subpath.
return
}
if (!resolvedAtRoot || resolvedAtRoot.id !== resolved.id) {
return
}
Expand Down
Loading