Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(manifest): incorrect css entry files in manifest when falsy cssCodeSplit #14287

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vite/src/node/plugins/css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const styleAttrRE = /[?&]style-attr\b/
const usedRE = /[?&]used\b/
const varRE = /^var\(/i

const cssBundleName = 'style.css'
export const cssBundleName = 'style.css'

const enum PreprocessLang {
less = 'less',
Expand Down
16 changes: 16 additions & 0 deletions packages/vite/src/node/plugins/manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { ResolvedConfig } from '..'
import type { Plugin } from '../plugin'
import { normalizePath } from '../utils'
import { generatedAssets } from './asset'
import { cssBundleName } from './css'
import type { GeneratedAssetMeta } from './asset'

export type Manifest = Record<string, ManifestChunk>
Expand All @@ -20,6 +21,8 @@ export interface ManifestChunk {
dynamicImports?: string[]
}

const cssRE = /\.css$/

export function manifestPlugin(config: ResolvedConfig): Plugin {
const manifest: Manifest = {}

Expand Down Expand Up @@ -149,6 +152,19 @@ export function manifestPlugin(config: ResolvedConfig): Plugin {
}
})

if (!config.build.cssCodeSplit) {
for (const file in manifest) {
const { isEntry, isDynamicEntry } = manifest[file]
if (
file !== cssBundleName &&
cssRE.test(file) &&
(isEntry || isDynamicEntry)
) {
manifest[file].file = manifest[cssBundleName].file
}
}
}

outputCount++
const output = config.build.rollupOptions?.output
const outputLength = Array.isArray(output) ? output.length : 1
Expand Down
15 changes: 15 additions & 0 deletions playground/css/__tests__/manifest/manifest.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { describe, expect, test } from 'vitest'
import { findAssetFile, isBuild } from '~utils'

const baseDir = 'manifest'
const assets = './'

describe.runIf(isBuild)('manifest', () => {
test('manifest when cssCodeSplit is false', () => {
const manifest = JSON.parse(
findAssetFile(/manifest.json$/, baseDir, assets),
)
expect(manifest['async.css'].file).toMatch(manifest['style.css'].file)
expect(manifest['async/base.css'].file).toMatch(manifest['style.css'].file)
})
})
4 changes: 3 additions & 1 deletion playground/css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
"preview:relative-base": "vite --config ./vite.config-relative-base.js preview",
"dev:no-css-minify": "vite --config ./vite.config-no-css-minify.js dev",
"build:no-css-minify": "vite --config ./vite.config-no-css-minify.js build",
"preview:no-css-minify": "vite --config ./vite.config-no-css-minify.js preview"
"preview:no-css-minify": "vite --config ./vite.config-no-css-minify.js preview",
"build:manifest": "vite --config ./vite.config-manifest.js build",
"preview:manifest": "vite --config ./vite.config-manifest.js preview"
},
"devDependencies": {
"@vitejs/test-css-dep": "link:./css-dep",
Expand Down
20 changes: 20 additions & 0 deletions playground/css/vite.config-manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import path from 'node:path'
import { defineConfig } from 'vite'
import baseConfig from './vite.config.js'

export default defineConfig({
...baseConfig,
build: {
...baseConfig.build,
manifest: true,
cssCodeSplit: false,
outDir: 'dist/manifest',
rollupOptions: {
input: {
base: path.resolve(__dirname, 'async/base.css'),
async: path.resolve(__dirname, 'async.css'),
},
},
},
cacheDir: 'node_modules/.vite-css-manifest',
})