chore: build assets with the entry name when it is an entry point

REF: #4863 (comment)
vitejs · Jan 6, 2023 · 2b21f7d · 2b21f7d
1 parent 691e432
commit 2b21f7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -553,8 +553,12 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
  ? normalizePath(path.relative(config.root, chunk.facadeModuleId))
  : chunk.name
 
+ const isEntry = chunk.isEntry && isPureCssChunk
  const lang = path.extname(cssAssetName).slice(1)
- const cssFileName = ensureFileExt(cssAssetName, '.css')
+ const cssFileName = ensureFileExt(
+ isEntry ? chunk.name : cssAssetName,
+ '.css',
+ )
 
  chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssAssetName)
  chunkCSS = await finalizeCss(chunkCSS, true, config)
@@ -566,7 +570,6 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
  source: chunkCSS,
  })
  const originalName = isPreProcessor(lang) ? cssAssetName : cssFileName
- const isEntry = chunk.isEntry && isPureCssChunk
  generatedAssets
  .get(config)!
  .set(referenceId, { originalName, isEntry })

diff --git a/playground/backend-integration/__tests__/backend-integration.spec.ts b/playground/backend-integration/__tests__/backend-integration.spec.ts
@@ -37,7 +37,7 @@ describe.runIf(isBuild)('build', () => {
  const cssAssetEntry = manifest['global.css']
  const scssAssetEntry = manifest['nested/blue.scss']
  const imgAssetEntry = manifest['../images/logo.png']
- const dirFooAssetEntry = manifest['../../dir/foo.css'] // '\\' should not be used even on windows
+ const dirFooAssetEntry = manifest['foo.css']
  expect(htmlEntry.css.length).toEqual(1)
  expect(htmlEntry.assets.length).toEqual(1)
  expect(cssAssetEntry?.file).not.toBeUndefined()