Skip to content

refactor(rsc): use addWatchFile to invalidate server css virtual #847

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
Sep 15, 2025
Merged

refactor(rsc): use addWatchFile to invalidate server css virtual #847

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10987e0
refactor(rsc): use `addWatchFile` to invalidate server css virtual
hi-ogawa Sep 13, 2025
8adfeb5
fix: addWatchFile all dependencies
hi-ogawa Sep 14, 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
40 changes: 3 additions & 37 deletions packages/plugin-rsc/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,6 +2102,9 @@ function vitePluginRscCss(
const importer = parsed.id
if (this.environment.mode === 'dev') {
const result = collectCss(server.environments.rsc!, importer)
for (const file of [importer, ...result.visitedFiles]) {
this.addWatchFile(file)
}
const cssHrefs = result.hrefs.map((href) => href.slice(1))
const deps = assetsURLOfDeps({ css: cssHrefs, js: [] }, manager)
return generateResourcesCode(
Expand All @@ -2123,20 +2126,6 @@ function vitePluginRscCss(
}
}
},
hotUpdate(ctx) {
if (this.environment.name === 'rsc') {
const { server } = manager
const mods = collectModuleDependents(ctx.modules)
for (const mod of mods) {
if (mod.id) {
invalidteModuleById(
server.environments.rsc!,
`\0` + toCssVirtual({ id: mod.id, type: 'rsc' }),
)
}
}
}
},
},
createVirtualPlugin(
'vite-rsc/remove-duplicate-server-css',
Expand Down Expand Up @@ -2171,29 +2160,6 @@ export default function RemoveDuplicateServerCss() {
]
}

function invalidteModuleById(environment: DevEnvironment, id: string) {
const mod = environment.moduleGraph.getModuleById(id)
if (mod) {
environment.moduleGraph.invalidateModule(mod)
}
return mod
}

function collectModuleDependents(mods: EnvironmentModuleNode[]) {
const visited = new Set<EnvironmentModuleNode>()
function recurse(mod: EnvironmentModuleNode) {
if (visited.has(mod)) return
visited.add(mod)
for (const importer of mod.importers) {
recurse(importer)
}
}
for (const mod of mods) {
recurse(mod)
}
return [...visited]
}

function generateResourcesCode(depsCode: string, manager: RscPluginManager) {
const ResourcesFn = (
React: typeof import('react'),
Expand Down
Loading