diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts index ceff0fd6257..5cfe7b4cbcb 100644 --- a/packages/nuxt/src/core/runtime/nitro/renderer.ts +++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts @@ -289,19 +289,15 @@ function renderHTMLDocument (html: NuxtRenderHTMLContext) { } async function renderInlineStyles (usedModules: Set | string[]) { - const { entryCSS } = await getClientManifest() const styleMap = await getSSRStyles() const inlinedStyles = new Set() - for (const mod of ['entry', ...usedModules]) { + for (const mod of usedModules) { if (mod in styleMap) { for (const style of await styleMap[mod]()) { inlinedStyles.add(``) } } } - for (const css of entryCSS?.css || []) { - inlinedStyles.add(``) - } return Array.from(inlinedStyles).join('') } diff --git a/packages/vite/src/plugins/ssr-styles.ts b/packages/vite/src/plugins/ssr-styles.ts index e65ac5e9743..2f47b952eeb 100644 --- a/packages/vite/src/plugins/ssr-styles.ts +++ b/packages/vite/src/plugins/ssr-styles.ts @@ -5,7 +5,6 @@ import { dirname, relative } from 'pathe' import { genObjectFromRawEntries } from 'knitwork' import { filename } from 'pathe/utils' import { parseQuery, parseURL } from 'ufo' -import { isCSS } from '../utils' interface SSRStylePluginOptions { srcDir: string @@ -16,7 +15,6 @@ interface SSRStylePluginOptions { export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin { const cssMap: Record = {} const idRefMap: Record = {} - const globalStyles = new Set() const relativeToSrcDir = (path: string) => relative(options.srcDir, path) @@ -49,8 +47,6 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin { }) } - const globalStylesArray = Array.from(globalStyles).map(css => idRefMap[css] && this.getFileName(idRefMap[css])).filter(Boolean) - for (const key in emitted) { // Track the chunks we are inlining CSS for so we can omit including links to the .css files options.chunksWithInlinedCSS.add(key) @@ -61,12 +57,10 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin { fileName: 'styles.mjs', source: [ - ...globalStylesArray.map((css, i) => `import style_${i} from './${css}';`), 'const interopDefault = r => r.default || r || []', - `export default ${genObjectFromRawEntries([ - ['entry', `() => [${globalStylesArray.map((_, i) => `style_${i}`).join(', ')}]`], - ...Object.entries(emitted).map(([key, value]) => [key, `() => import('./${this.getFileName(value)}').then(interopDefault)`]) as [string, string][] - ])}` + `export default ${genObjectFromRawEntries( + Object.entries(emitted).map(([key, value]) => [key, `() => import('./${this.getFileName(value)}').then(interopDefault)`]) as [string, string][] + )}` ].join('\n') }) }, @@ -80,14 +74,6 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin { } } - if (chunk.isEntry) { - // Entry - for (const mod in chunk.modules) { - if (isCSS(mod) && !mod.includes('&used')) { - globalStyles.add(relativeToSrcDir(mod)) - } - } - } return null }, async transform (code, id) { diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 5d0b419bab5..b39fb6d54b7 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -126,16 +126,6 @@ export async function buildServer (ctx: ViteBuildContext) { if (shouldRemoveCSS) { entry.css = [] } - // Add entry CSS as prefetch (non-blocking) - if (entry.isEntry) { - manifest.entryCSS = { - file: '', - css: entry.css - } - entry.css = [] - entry.dynamicImports = entry.dynamicImports || [] - entry.dynamicImports.push('entryCSS') - } } }) } diff --git a/test/basic.test.ts b/test/basic.test.ts index a016df07b6d..1a79fea1087 100644 --- a/test/basic.test.ts +++ b/test/basic.test.ts @@ -598,19 +598,18 @@ describe.skipIf(process.env.NUXT_TEST_DEV || process.env.TEST_WITH_WEBPACK)('inl for (const style of [ '{--assets:"assets"}', //