Merge branch 'main' into 09-14-fix_rsc_remove_server_style_when_css_import_is_removed

Author: hi-ogawa

packages/plugin-rsc/src/plugin.ts

@@ -2129,6 +2129,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(
@@ -2150,20 +2153,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',
@@ -2198,29 +2187,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'),