refactor(rsc): merge environmentImportOutputMap into environmentImportMetaMap

Add fileName field to EnvironmentImportMeta instead of tracking output
filenames in a separate map. This simplifies the data structure and
removes the TODO about merging the maps.

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: hi-ogawa

packages/plugin-rsc/src/plugin.ts

@@ -126,9 +126,6 @@ class RscPluginManager {
   serverReferenceMetaMap: Record<string, ServerRerferenceMeta> = {}
   serverResourcesMetaMap: Record<string, { key: string }> = {}
   environmentImportMetaMap: Record<string, EnvironmentImportMeta> = {}
-  // TODO: per-environment (can we merge to environmentImportMetaMap?)
-  // Maps resolvedId to output fileName (populated in generateBundle)
-  environmentImportOutputMap: Record<string, string> = {}
 
   stabilize(): void {
     // sort for stable build
@@ -176,8 +173,7 @@ class RscPluginManager {
 
       let code = 'export default {\n'
       for (const [resolvedId, meta] of Object.entries(imports)) {
-        const outputFileName = this.environmentImportOutputMap[resolvedId]
-        if (!outputFileName) {
+        if (!meta.fileName) {
           console.warn(
             `[vite-rsc] missing output for environment import: ${resolvedId}`,
           )
@@ -186,7 +182,7 @@ class RscPluginManager {
         const targetOutDir =
           this.config.environments[meta.targetEnv]!.build.outDir
         const relativePath = normalizeRelativePath(
-          path.relative(sourceOutDir, path.join(targetOutDir, outputFileName)),
+          path.relative(sourceOutDir, path.join(targetOutDir, meta.fileName)),
         )
         code += `  ${JSON.stringify(resolvedId)}: () => import(${JSON.stringify(relativePath)}),\n`
       }

packages/plugin-rsc/src/plugins/import-environment.ts

@@ -21,6 +21,7 @@ export type EnvironmentImportMeta = {
   targetEnv: string
   sourceEnv: string
   specifier: string
+  fileName?: string
 }
 
 export function vitePluginImportEnvironment(
@@ -179,9 +180,9 @@ export function vitePluginImportEnvironment(
         // This runs in both RSC and SSR builds to capture all outputs
         for (const [fileName, chunk] of Object.entries(bundle)) {
           if (chunk.type === 'chunk' && chunk.isEntry && chunk.facadeModuleId) {
-            const resolvedId = chunk.facadeModuleId
-            if (resolvedId in manager.environmentImportMetaMap) {
-              manager.environmentImportOutputMap[resolvedId] = fileName
+            const meta = manager.environmentImportMetaMap[chunk.facadeModuleId]
+            if (meta) {
+              meta.fileName = fileName
             }
           }
         }