From 87e01ccf0e22c2e359d90e78a5fde66a656e930c Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 30 Jun 2023 05:25:43 +0100
Subject: [PATCH] fix(nuxt): handle injecting multiple entry ids for styles
 (#21864)

---
 packages/nuxt/src/core/runtime/nitro/renderer.ts | 15 +++++++++------
 packages/vite/src/vite.ts                        |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts
index 3cc1bc37c4..840e01281a 100644
--- a/packages/nuxt/src/core/runtime/nitro/renderer.ts
+++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts
@@ -66,7 +66,10 @@ const getClientManifest: () => Promise<Manifest> = () => import('#build/dist/ser
   .then(r => r.default || r)
   .then(r => typeof r === 'function' ? r() : r) as Promise<ClientManifest>
 
-const getEntryId: () => Promise<string> = () => getClientManifest().then(r => Object.values(r).find(r => r.isEntry)!.src!)
+const getEntryIds: () => Promise<string[]> = () => getClientManifest().then(r => Object.values(r).filter(r =>
+  // @ts-expect-error internal key set by CSS inlining configuration
+  r._globalCSS
+).map(r => r.src!))
 
 // @ts-expect-error virtual file
 const getStaticRenderedHead = (): Promise<NuxtMeta> => import('#head-static').then(r => r.default || r)
@@ -289,11 +292,11 @@ export default defineRenderHandler(async (event): Promise<Partial<RenderResponse
   const renderedMeta = await ssrContext.renderMeta?.() ?? {}
 
   if (process.env.NUXT_INLINE_STYLES && !islandContext) {
-    const entryId = await getEntryId()
-    if (ssrContext.modules) {
-      ssrContext.modules.add(entryId)
-    } else if (ssrContext._registeredComponents) {
-      ssrContext._registeredComponents.add(entryId)
+    const source = ssrContext.modules ?? ssrContext._registeredComponents
+    if (source) {
+      for (const id of await getEntryIds()) {
+        source.add(id)
+      }
     }
   }
 
diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts
index 3ca8f86c6c..d48d1b455f 100644
--- a/packages/vite/src/vite.ts
+++ b/packages/vite/src/vite.ts
@@ -166,6 +166,10 @@ export async function bundle (nuxt: Nuxt) {
       for (const key in manifest) {
         const entry = manifest[key]
         const shouldRemoveCSS = chunksWithInlinedCSS.has(key) && !entry.isEntry
+        if (entry.isEntry && chunksWithInlinedCSS.has(key)) {
+          // @ts-expect-error internal key
+          entry._globalCSS = true
+        }
         if (shouldRemoveCSS && entry.css) {
           entry.css = []
         }