Skip to content

fix(rsc): fix client reference preload when group chunk re-exports client components from entry chunk #768

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

Merged
merged 2 commits into from
Aug 24, 2025
Merged

fix(rsc): fix client reference preload when group chunk re-exports client components from entry chunk #768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48abd80
fix(rsc): fix client reference dependency manifest
hi-ogawa Aug 24, 2025
69a3d52
chore: rename
hi-ogawa Aug 24, 2025
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
15 changes: 10 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 @@ -63,6 +63,7 @@ type ClientReferenceMeta = {
// build only for tree-shaking unused export
exportNames: string[]
renderedExports: string[]
groupChunkId?: string
}

type ServerRerferenceMeta = {
Expand Down Expand Up @@ -800,10 +801,11 @@ export default function vitePluginRsc(
assert(entry)
const entryUrl = assetsURL(entry.chunk.fileName, manager)
const clientReferenceDeps: Record<string, AssetDeps> = {}
for (const [id, meta] of Object.entries(
manager.clientReferenceMetaMap,
)) {
const deps: AssetDeps = assetDeps[id]?.deps ?? { js: [], css: [] }
for (const meta of Object.values(manager.clientReferenceMetaMap)) {
const deps: AssetDeps = assetDeps[meta.groupChunkId!]?.deps ?? {
js: [],
css: [],
}
clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(
mergeAssetDeps(deps, entry.deps),
manager,
Expand Down Expand Up @@ -1145,13 +1147,16 @@ function vitePluginUseClient(
// group client reference modules by `clientChunks` option
manager.clientReferenceGroups = {}
for (const meta of Object.values(manager.clientReferenceMetaMap)) {
const name =
let name =
useClientPluginOptions.clientChunks?.(meta.importId) ||
// use original module id as name by default
normalizePath(path.relative(manager.config.root, meta.importId))
name = name.replaceAll('..', '__')
const group = (manager.clientReferenceGroups[name] ??= [])
group.push(meta)
meta.groupChunkId = `\0virtual:vite-rsc/client-references/group/${name}`
}
debug('client-reference-groups', manager.clientReferenceGroups)
for (const [name, metas] of Object.entries(
manager.clientReferenceGroups,
)) {
Expand Down
Loading