Skip to content

refactor(rsc): add toRelativeId util #771

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 3 commits into from
Aug 25, 2025
Merged

refactor(rsc): add toRelativeId util #771

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27a3126
refactor(rsc): add `manager.toStableId`
hi-ogawa Aug 24, 2025
b03178d
refactor(rsc): use toStableId for additional path normalization
hi-ogawa Aug 25, 2025
d7d7673
chore: rename
hi-ogawa Aug 25, 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
23 changes: 10 additions & 13 deletions packages/plugin-rsc/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ class RscPluginManager {
this.clientReferenceMetaMap = sortObject(this.clientReferenceMetaMap)
this.serverResourcesMetaMap = sortObject(this.serverResourcesMetaMap)
}

toRelativeId(id: string): string {
return normalizePath(path.relative(this.config.root, id))
}
}

export type RscPluginOptions = {
Expand Down Expand Up @@ -1081,9 +1085,7 @@ function vitePluginUseClient(
referenceKey = importId
} else {
importId = id
referenceKey = hashString(
normalizePath(path.relative(manager.config.root, id)),
)
referenceKey = hashString(manager.toRelativeId(id))
}
}

Expand Down Expand Up @@ -1156,7 +1158,7 @@ function vitePluginUseClient(
serverChunk: meta.serverChunk!,
}) ??
// use original module id as name by default
normalizePath(path.relative(manager.config.root, meta.importId))
manager.toRelativeId(meta.importId)
name = name.replaceAll('..', '__')
const group = (manager.clientReferenceGroups[name] ??= [])
group.push(meta)
Expand Down Expand Up @@ -1269,11 +1271,8 @@ function vitePluginUseClient(
meta.renderedExports = mod.renderedExports
meta.serverChunk =
(chunk.facadeModuleId ? 'facade:' : 'non-facade:') +
normalizePath(
path.relative(
manager.config.root,
chunk.facadeModuleId ?? [...chunk.moduleIds].sort()[0]!,
),
manager.toRelativeId(
chunk.facadeModuleId ?? [...chunk.moduleIds].sort()[0]!,
)
}
}
Expand Down Expand Up @@ -1485,7 +1484,7 @@ function vitePluginUseServer(
id = cleanUrl(id)
}
if (manager.config.command === 'build') {
normalizedId_ = hashString(path.relative(manager.config.root, id))
normalizedId_ = hashString(manager.toRelativeId(id))
} else {
normalizedId_ = normalizeViteImportAnalysisUrl(
manager.server.environments[serverEnvironmentName]!,
Expand Down Expand Up @@ -1994,9 +1993,7 @@ function vitePluginRscCss(
manager,
)
} else {
const key = normalizePath(
path.relative(manager.config.root, importer),
)
const key = manager.toRelativeId(importer)
manager.serverResourcesMetaMap[importer] = { key }
return `
import __vite_rsc_assets_manifest__ from "virtual:vite-rsc/assets-manifest";
Expand Down
Loading