From b319087c9fcfb6e22782d03cbbb2a60e6918cc0d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Fri, 25 Aug 2023 14:57:41 +0100
Subject: [PATCH] fix(vite): only mark nitro deps as externals when building
 (#22812)

---
 packages/vite/src/server.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts
index 741cd48d352f..03898ca7e3f6 100644
--- a/packages/vite/src/server.ts
+++ b/packages/vite/src/server.ts
@@ -15,7 +15,6 @@ import { transpile } from './utils/transpile'
 export async function buildServer (ctx: ViteBuildContext) {
   const helper = ctx.nuxt.options.nitro.imports !== false ? '' : 'globalThis.'
   const entry = ctx.nuxt.options.ssr ? ctx.entry : await resolvePath(resolve(ctx.nuxt.options.appDir, 'entry-spa'))
-  const nitroDependencies = await tryResolveModule('nitropack/package.json', ctx.nuxt.options.modulesDir).then(r => import(r!)).then(r => Object.keys(r.dependencies || {})).catch(() => [])
   const serverConfig: ViteConfig = vite.mergeConfig(ctx.config, vite.mergeConfig({
     configFile: false,
     base: ctx.nuxt.options.dev
@@ -62,11 +61,7 @@ export async function buildServer (ctx: ViteBuildContext) {
     },
     ssr: {
       external: [
-        '#internal/nitro', '#internal/nitro/utils',
-        // explicit dependencies we use in our ssr renderer - these can be inlined (if necessary) in the nitro build
-        'unhead', '@unhead/ssr', '@unhead/vue', 'unctx', 'h3', 'devalue', '@nuxt/devalue', 'radix3', 'unstorage', 'hookable',
-        // dependencies we might share with nitro - these can be inlined (if necessary) in the nitro build
-        ...nitroDependencies
+        '#internal/nitro', '#internal/nitro/utils'
       ],
       noExternal: [
         ...transpile({ isServer: true, isDev: ctx.nuxt.options.dev }),
@@ -112,6 +107,17 @@ export async function buildServer (ctx: ViteBuildContext) {
     ]
   } satisfies vite.InlineConfig, ctx.nuxt.options.vite.$server || {}))
 
+  if (!ctx.nuxt.options.dev) {
+    const nitroDependencies = await tryResolveModule('nitropack/package.json', ctx.nuxt.options.modulesDir)
+      .then(r => import(r!)).then(r => Object.keys(r.dependencies || {})).catch(() => [])
+    serverConfig.ssr!.external!.push(
+      // explicit dependencies we use in our ssr renderer - these can be inlined (if necessary) in the nitro build
+      'unhead', '@unhead/ssr', 'unctx', 'h3', 'devalue', '@nuxt/devalue', 'radix3', 'unstorage', 'hookable',
+      // dependencies we might share with nitro - these can be inlined (if necessary) in the nitro build
+      ...nitroDependencies
+    )
+  }
+
   serverConfig.customLogger = createViteLogger(serverConfig)
 
   await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true })