fix(manifest): preserve pure css chunk assets

sun0day · Sep 5, 2023 · 787353c · 787353c
1 parent 1a2e5e6
commit 787353c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
@@ -42,6 +42,8 @@ const assetCache = new WeakMap<ResolvedConfig, Map<string, string>>()
 export interface GeneratedAssetMeta {
   originalName: string
   isEntry?: boolean
+  // for pure css chunk's assets, e.g: fonts
+  importedAssets?: Set<string>
 }
 export const generatedAssets = new WeakMap<
   ResolvedConfig,

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -653,7 +653,13 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
           const originalName = isPreProcessor(lang) ? cssAssetName : cssFileName
           generatedAssets
             .get(config)!
-            .set(referenceId, { originalName, isEntry })
+            .set(referenceId, {
+              originalName,
+              isEntry,
+              importedAssets: isPureCssChunk
+                ? chunk.viteMetadata?.importedAssets
+                : undefined,
+            })
           chunk.viteMetadata!.importedCss.add(this.getFileName(referenceId))
 
           if (emitTasksLength === emitTasks.length) {

diff --git a/packages/vite/src/node/plugins/manifest.ts b/packages/vite/src/node/plugins/manifest.ts
@@ -63,7 +63,10 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
         return filteredImports
       }
 
-      function createChunk(chunk: OutputChunk): ManifestChunk {
+      function createChunk(
+        chunk: OutputChunk,
+        fileNameToAssetMeta: Map<string, GeneratedAssetMeta>,
+      ): ManifestChunk {
         const manifestChunk: ManifestChunk = {
           file: chunk.fileName,
         }
@@ -92,13 +95,21 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
           }
         }
 
-        if (chunk.viteMetadata?.importedCss.size) {
-          manifestChunk.css = [...chunk.viteMetadata.importedCss]
-        }
         if (chunk.viteMetadata?.importedAssets.size) {
           manifestChunk.assets = [...chunk.viteMetadata.importedAssets]
         }
 
+        if (chunk.viteMetadata?.importedCss.size) {
+          manifestChunk.css = [...chunk.viteMetadata.importedCss]
+          manifestChunk.css.forEach((cssFile) => {
+            const asset = fileNameToAssetMeta.get(cssFile)
+            if (asset?.importedAssets) {
+              manifestChunk.assets ||= []
+              manifestChunk.assets.push(...asset.importedAssets)
+            }
+          })
+        }
+
         return manifestChunk
       }
 
@@ -127,7 +138,10 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
       for (const file in bundle) {
         const chunk = bundle[file]
         if (chunk.type === 'chunk') {
-          manifest[getChunkName(chunk)] = createChunk(chunk)
+          manifest[getChunkName(chunk)] = createChunk(
+            chunk,
+            fileNameToAssetMeta,
+          )
         } else if (chunk.type === 'asset' && typeof chunk.name === 'string') {
           // Add every unique asset to the manifest, keyed by its original name
           const assetMeta = fileNameToAssetMeta.get(chunk.fileName)