Revert "chore: partial revert "refactor: use originalFileNames/names (vitejs#18240)""

This reverts commit aec2b6e.

Author: sapphi-red

packages/vite/src/node/plugins/asset.ts

@@ -42,17 +42,8 @@ const svgExtRE = /\.svg(?:$|\?)/
 
 const assetCache = new WeakMap<Environment, Map<string, string>>()
 
-// chunk.name is the basename for the asset ignoring the directory structure
-// For the manifest, we need to preserve the original file path and isEntry
-// for CSS assets. We keep a map from referenceId to this information.
-export interface GeneratedAssetMeta {
-  originalFileName: string | undefined
-  isEntry?: boolean
-}
-export const generatedAssetsMap = new WeakMap<
-  Environment,
-  Map<string, GeneratedAssetMeta>
->()
+/** a set of referenceId for entry CSS assets for each environment */
+export const cssEntriesMap = new WeakMap<Environment, Set<string>>()
 
 // add own dictionary entry by directly assigning mrmime
 export function registerCustomMime(): void {
@@ -156,7 +147,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
 
     buildStart() {
       assetCache.set(this.environment, new Map())
-      generatedAssetsMap.set(this.environment, new Map())
+      cssEntriesMap.set(this.environment, new Set())
     },
 
     resolveId(id) {
@@ -417,8 +408,6 @@ async function fileToBuiltUrl(
       originalFileName,
       source: content,
     })
-    generatedAssetsMap.get(environment)!.set(referenceId, { originalFileName })
-
     url = `__VITE_ASSET__${referenceId}__${postfix ? `$_${postfix}__` : ``}`
   }
 

packages/vite/src/node/plugins/css.ts

@@ -93,9 +93,9 @@ import { findNearestPackageData } from '../packages'
 import { addToHTMLProxyTransformResult } from './html'
 import {
   assetUrlRE,
+  cssEntriesMap,
   fileToDevUrl,
   fileToUrl,
-  generatedAssetsMap,
   publicAssetUrlCache,
   publicAssetUrlRE,
   publicFileToBuiltUrl,
@@ -483,7 +483,9 @@ export function cssPostPlugin(config: ResolvedConfig): RolldownPlugin {
         assetFileNames({
           type: 'asset',
           name: cssAssetName,
+          names: [cssAssetName],
           originalFileName: null,
+          originalFileNames: [],
           source: '/* vite internal call, ignore */',
         }),
       )
@@ -639,8 +641,6 @@ export function cssPostPlugin(config: ResolvedConfig): RolldownPlugin {
     },
 
     async renderChunk(code, chunk, opts) {
-      const generatedAssets = generatedAssetsMap.get(this.environment)!
-
       let chunkCSS = ''
       // the chunk is empty if it's a dynamic entry chunk that only contains a CSS import
       const isJsChunkEmpty = code === '' && !chunk.isEntry
@@ -799,7 +799,6 @@ export function cssPostPlugin(config: ResolvedConfig): RolldownPlugin {
             originalFileName,
             source: content,
           })
-          generatedAssets.set(referenceId, { originalFileName })
 
           const filename = this.getFileName(referenceId)
           chunk.viteMetadata!.importedAssets.add(cleanUrl(filename))
@@ -857,7 +856,9 @@ export function cssPostPlugin(config: ResolvedConfig): RolldownPlugin {
               originalFileName,
               source: chunkCSS,
             })
-            generatedAssets.set(referenceId, { originalFileName, isEntry })
+            if (isEntry) {
+              cssEntriesMap.get(this.environment)!.add(referenceId)
+            }
             chunk.viteMetadata!.importedCss.add(this.getFileName(referenceId))
           } else if (this.environment.config.consumer === 'client') {
             // legacy build and inline css

packages/vite/src/node/plugins/html.ts

@@ -929,7 +929,8 @@ export function buildHtmlPlugin(config: ResolvedConfig): RolldownPlugin {
           const cssChunk =
             cssBundleName &&
             (Object.values(bundle).find(
-              (chunk) => chunk.type === 'asset' && chunk.name === cssBundleName,
+              (chunk) =>
+                chunk.type === 'asset' && chunk.names.includes(cssBundleName),
             ) as OutputAsset | undefined)
           if (cssChunk) {
             result = injectToHead(result, [

packages/vite/src/node/plugins/manifest.ts

@@ -8,7 +8,7 @@ import type {
 import type { Plugin } from '../plugin'
 import { normalizePath, sortObjectKeys } from '../utils'
 import { perEnvironmentState } from '../environment'
-import { generatedAssetsMap } from './asset'
+import { cssEntriesMap } from './asset'
 
 const endsWithJSRE = /\.[cm]?js$/
 
@@ -130,18 +130,15 @@ export function manifestPlugin(): Plugin {
         return manifestChunk
       }
 
-      const assets = generatedAssetsMap.get(this.environment)!
-      const entryCssAssetFileNames = new Set()
-      for (const [id, asset] of assets.entries()) {
-        if (asset.isEntry) {
-          try {
-            const fileName = this.getFileName(id)
-            entryCssAssetFileNames.add(fileName)
-          } catch {
-            // The asset was generated as part of a different output option.
-            // It was already handled during the previous run of this plugin.
-            assets.delete(id)
-          }
+      const entryCssReferenceIds = cssEntriesMap.get(this.environment)!
+      const entryCssAssetFileNames = new Set(entryCssReferenceIds)
+      for (const id of entryCssReferenceIds) {
+        try {
+          const fileName = this.getFileName(id)
+          entryCssAssetFileNames.add(fileName)
+        } catch {
+          // The asset was generated as part of a different output option.
+          // It was already handled during the previous run of this plugin.
         }
       }
 
@@ -151,30 +148,28 @@ export function manifestPlugin(): Plugin {
         const chunk = bundle[file]
         if (chunk.type === 'chunk') {
           manifest[getChunkName(chunk)] = createChunk(chunk)
-        } else if (chunk.type === 'asset' && typeof chunk.name === 'string') {
+        } else if (chunk.type === 'asset' && chunk.names.length > 0) {
           // Add every unique asset to the manifest, keyed by its original name
           const src =
-            chunk.originalFileName ?? '_' + path.basename(chunk.fileName)
+            chunk.originalFileNames.length > 0
+              ? chunk.originalFileNames[0]
+              : '_' + path.basename(chunk.fileName)
           const isEntry = entryCssAssetFileNames.has(chunk.fileName)
           const asset = createAsset(chunk, src, isEntry)
 
           // If JS chunk and asset chunk are both generated from the same source file,
           // prioritize JS chunk as it contains more information
           const file = manifest[src]?.file
-          if (file && endsWithJSRE.test(file)) continue
-
-          manifest[src] = asset
-          fileNameToAsset.set(chunk.fileName, asset)
-        }
-      }
+          if (!(file && endsWithJSRE.test(file))) {
+            manifest[src] = asset
+            fileNameToAsset.set(chunk.fileName, asset)
+          }
 
-      // Add deduplicated assets to the manifest
-      for (const [referenceId, { originalFileName }] of assets.entries()) {
-        if (originalFileName && !manifest[originalFileName]) {
-          const fileName = this.getFileName(referenceId)
-          const asset = fileNameToAsset.get(fileName)
-          if (asset) {
-            manifest[originalFileName] = asset
+          for (const originalFileName of chunk.originalFileNames.slice(1)) {
+            const file = manifest[originalFileName]?.file
+            if (!(file && endsWithJSRE.test(file))) {
+              manifest[originalFileName] = asset
+            }
           }
         }
       }

packages/vite/src/node/plugins/worker.ts

@@ -24,7 +24,9 @@ import { fileToUrl } from './asset'
 
 type WorkerBundleAsset = {
   fileName: string
+  /** @deprecated */
   originalFileName: string | null
+  originalFileNames: string[]
   source: string | Uint8Array
 }
 
@@ -131,6 +133,7 @@ async function bundleWorkerEntry(
         saveEmitWorkerAsset(config, {
           fileName: outputChunk.fileName,
           originalFileName: null,
+          originalFileNames: [],
           source: outputChunk.code,
         })
       }
@@ -169,6 +172,7 @@ function emitSourcemapForWorkerEntry(
       saveEmitWorkerAsset(config, {
         fileName: mapFileName,
         originalFileName: null,
+        originalFileNames: [],
         source: data,
       })
     }
@@ -203,6 +207,7 @@ export async function workerFileToUrl(
     saveEmitWorkerAsset(config, {
       fileName,
       originalFileName: null,
+      originalFileNames: [],
       source: outputChunk.code,
     })
     workerMap.bundle.set(id, fileName)
@@ -495,8 +500,9 @@ export function webWorkerPlugin(config: ResolvedConfig): RolldownPlugin {
         this.emitFile({
           type: 'asset',
           fileName: asset.fileName,
-          originalFileName: asset.originalFileName,
           source: asset.source,
+          // NOTE: fileName is already generated when bundling the worker
+          //       so no need to pass originalFileNames/names
         })
       })
       workerMap.assets.clear()