Skip to content

Commit 72c90f1

Browse files
committed
fix: using stable name for metadataPlugin
1 parent 6071dc5 commit 72c90f1

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export function renderAssetUrlInJS(
9090
s ||= new MagicString(code)
9191
const [full, referenceId, postfix = ''] = match
9292
const file = ctx.getFileName(referenceId)
93-
getChunkMetadata(chunk.fileName)!.importedAssets.add(cleanUrl(file))
93+
getChunkMetadata(chunk.name)!.importedAssets.add(cleanUrl(file))
9494
const filename = file + postfix
9595
const replacement = toOutputFilePathInJS(
9696
filename,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
599599
// replace asset url references with resolved url.
600600
chunkCSS = chunkCSS.replace(assetUrlRE, (_, fileHash, postfix = '') => {
601601
const filename = this.getFileName(fileHash) + postfix
602-
getChunkMetadata(chunk.fileName)!.importedAssets.add(cleanUrl(filename))
602+
getChunkMetadata(chunk.name)!.importedAssets.add(cleanUrl(filename))
603603
return encodeURIPath(
604604
toOutputFilePathInCss(
605605
filename,
@@ -768,7 +768,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
768768
generatedAssets
769769
.get(config)!
770770
.set(referenceId, { originalName: originalFilename, isEntry })
771-
getChunkMetadata(chunk.fileName)!.importedCss.add(this.getFileName(referenceId))
771+
getChunkMetadata(chunk.name)!.importedCss.add(this.getFileName(referenceId))
772772
} else if (!config.build.ssr) {
773773
// legacy build and inline css
774774

@@ -828,9 +828,9 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
828828
},
829829

830830
augmentChunkHash(chunk) {
831-
if (getChunkMetadata(chunk.fileName)?.importedCss.size) {
831+
if (getChunkMetadata(chunk.name)?.importedCss.size) {
832832
let hash = ''
833-
for (const id of getChunkMetadata(chunk.fileName)!.importedCss) {
833+
for (const id of getChunkMetadata(chunk.name)!.importedCss) {
834834
hash += id
835835
}
836836
return hash
@@ -923,10 +923,10 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
923923
if (pureCssChunkNames.includes(file)) {
924924
const { importedCss, importedAssets } = getChunkMetadata((bundle[file] as OutputChunk).fileName)!
925925
importedCss.forEach((file) =>
926-
getChunkMetadata(chunk.fileName)!.importedCss.add(file),
926+
getChunkMetadata(chunk.name)!.importedCss.add(file),
927927
)
928928
importedAssets.forEach((file) =>
929-
getChunkMetadata(chunk.fileName)!.importedAssets.add(file),
929+
getChunkMetadata(chunk.name)!.importedAssets.add(file),
930930
)
931931
chunkImportsPureCssChunk = true
932932
return false

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
759759
})
760760
}
761761

762-
getChunkMetadata(chunk.fileName)!.importedCss.forEach((file) => {
762+
getChunkMetadata(chunk.name)!.importedCss.forEach((file) => {
763763
if (!seen.has(file)) {
764764
seen.add(file)
765765
tags.push({
@@ -907,7 +907,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
907907
result = result.replace(assetUrlRE, (_, fileHash, postfix = '') => {
908908
const file = this.getFileName(fileHash)
909909
if (chunk) {
910-
getChunkMetadata(chunk.fileName)!.importedAssets.add(cleanUrl(file))
910+
getChunkMetadata(chunk.name)!.importedAssets.add(cleanUrl(file))
911911
}
912912
return encodeURIPath(toOutputAssetFilePath(file)) + postfix
913913
})

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
543543
chunk.imports.forEach(addDeps)
544544
// Ensure that the css imported by current chunk is loaded after the dependencies.
545545
// So the style of current chunk won't be overwritten unexpectedly.
546-
getChunkMetadata(chunk.fileName)!.importedCss.forEach((file) => {
546+
getChunkMetadata(chunk.name)!.importedCss.forEach((file) => {
547547
deps.add(file)
548548
})
549549
}
@@ -552,8 +552,8 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
552552
removedPureCssFilesCache.get(config)!
553553
const chunk = removedPureCssFiles.get(filename)
554554
if (chunk) {
555-
if (getChunkMetadata(chunk.fileName)!.importedCss.size) {
556-
getChunkMetadata(chunk.fileName)!.importedCss.forEach((file) => {
555+
if (getChunkMetadata(chunk.name)!.importedCss.size) {
556+
getChunkMetadata(chunk.name)!.importedCss.forEach((file) => {
557557
deps.add(file)
558558
})
559559
hasRemovedPureCssChunk = true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
8989
}
9090
}
9191

92-
if (getChunkMetadata(chunk.fileName)?.importedCss.size) {
93-
manifestChunk.css = [...getChunkMetadata(chunk.fileName)!.importedCss]
92+
if (getChunkMetadata(chunk.name)?.importedCss.size) {
93+
manifestChunk.css = [...getChunkMetadata(chunk.name)!.importedCss]
9494
}
95-
if (getChunkMetadata(chunk.fileName)?.importedAssets.size) {
96-
manifestChunk.assets = [...getChunkMetadata(chunk.fileName)!.importedAssets]
95+
if (getChunkMetadata(chunk.name)?.importedAssets.size) {
96+
manifestChunk.assets = [...getChunkMetadata(chunk.name)!.importedAssets]
9797
}
9898

9999
return manifestChunk

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function metadataPlugin(): Plugin {
1717
async renderChunk(_code, chunk) {
1818
// Since the chunk come from rust side, mutate it directly will not sync back to rust side.
1919
// The next usage will lost the metadata
20-
chunkMetadataMap.set(chunk.fileName, {
20+
chunkMetadataMap.set(chunk.name, {
2121
importedAssets: new Set(),
2222
importedCss: new Set(),
2323
})
@@ -26,6 +26,6 @@ export function metadataPlugin(): Plugin {
2626
}
2727
}
2828

29-
export function getChunkMetadata(fileName: string): ChunkMetadata | undefined {
30-
return chunkMetadataMap.get(fileName)
29+
export function getChunkMetadata(name: string): ChunkMetadata | undefined {
30+
return chunkMetadataMap.get(name)
3131
}

packages/vite/src/node/ssr/ssrManifestPlugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ export function ssrManifestPlugin(config: ResolvedConfig): Plugin {
3636
mappedChunks.push(joinUrlSegments(base, chunk.fileName))
3737
// <link> tags for entry chunks are already generated in static HTML,
3838
// so we only need to record info for non-entry chunks.
39-
getChunkMetadata(chunk.fileName)!.importedCss.forEach((file) => {
39+
getChunkMetadata(chunk.name)!.importedCss.forEach((file) => {
4040
mappedChunks.push(joinUrlSegments(base, file))
4141
})
4242
}
43-
getChunkMetadata(chunk.fileName)!.importedAssets.forEach((file) => {
43+
getChunkMetadata(chunk.name)!.importedAssets.forEach((file) => {
4444
mappedChunks.push(joinUrlSegments(base, file))
4545
})
4646
}
@@ -78,7 +78,7 @@ export function ssrManifestPlugin(config: ResolvedConfig): Plugin {
7878
analyzed.add(filename)
7979
const chunk = bundle[filename] as OutputChunk | undefined
8080
if (chunk) {
81-
getChunkMetadata(chunk.fileName)!.importedCss.forEach((file) => {
81+
getChunkMetadata(chunk.name)!.importedCss.forEach((file) => {
8282
deps.push(joinUrlSegments(base, file)) // TODO:base
8383
})
8484
chunk.imports.forEach(addDeps)

0 commit comments

Comments
 (0)