Merge branch 'main' into 07-31-feat_rsc_support_customizing_react-server_conditioned_environment

Author: hi-ogawa

packages/plugin-rsc/src/plugin.ts

@@ -963,20 +963,6 @@ function hashString(v: string) {
   return createHash('sha256').update(v).digest().toString('hex').slice(0, 12)
 }
 
-function normalizeReferenceId(
-  id: string,
-  name: 'client' | 'rsc' | (string & {}),
-) {
-  if (!server) {
-    return hashString(path.relative(config.root, id))
-  }
-
-  // align with how Vite import analysis would rewrite id
-  // to avoid double modules on browser and ssr.
-  const environment = server.environments[name]!
-  return normalizeViteImportAnalysisUrl(environment, id)
-}
-
 /** @experimental */
 export function vitePluginUseClient(
   useClientPluginOptions: Pick<
@@ -1289,7 +1275,14 @@ export function vitePluginUseServer(
               // module identity of `import(id)` like browser, so we simply strip it off.
               id = id.split('?v=')[0]!
             }
-            normalizedId_ = normalizeReferenceId(id, serverEnvironmentName)
+            if (config.command === 'build') {
+              normalizedId_ = hashString(path.relative(config.root, id))
+            } else {
+              normalizedId_ = normalizeViteImportAnalysisUrl(
+                server.environments[serverEnvironmentName]!,
+                id,
+              )
+            }
           }
           return normalizedId_
         }