From 47357426673633c7f93eb0e6847fbc4ce05f28c1 Mon Sep 17 00:00:00 2001
From: productdevbook <hi@productdevbook.com>
Date: Wed, 8 Mar 2023 19:39:13 +0300
Subject: [PATCH 1/3] fix: exclude nitro output dir from typescript

---
 packages/nuxt/src/core/nitro.ts | 8 +++++++-
 tsconfig.json                   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index e4c94f5d63f8..7b83ceffdffa 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -1,5 +1,5 @@
 import { existsSync, promises as fsp } from 'node:fs'
-import { resolve, join } from 'pathe'
+import { resolve, join, relative } from 'pathe'
 import { createNitro, createDevServer, build, prepare, copyPublicAssets, writeTypes, scanHandlers, prerender } from 'nitropack'
 import type { NitroConfig, Nitro } from 'nitropack'
 import { logger, resolvePath } from '@nuxt/kit'
@@ -226,6 +226,12 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       await scanHandlers(nitro)
       await writeTypes(nitro)
     }
+    // Exclude nitro output dir from typescript
+    if (!opts.tsConfig.exclude) {
+      opts.tsConfig.exclude = []
+    } else {
+      opts.tsConfig.exclude.push(relative(nuxt.options.buildDir, resolve(nuxt.options.rootDir, nitro.options.output.dir)))
+    }
     opts.references.push({ path: resolve(nuxt.options.buildDir, 'types/nitro.d.ts') })
   })
 
diff --git a/tsconfig.json b/tsconfig.json
index ad18daf7ab3a..4f69a3a4283a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
     "skipLibCheck": true,
     "target": "ESNext",
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "node",
     "strict": true,
     "noImplicitAny": true,
     "allowJs": true,

From 58c048f586a093f3211751541195a4eabb4ac0af Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 8 Mar 2023 09:05:19 -0800
Subject: [PATCH 2/3] refactor: simplify normalising opts

---
 packages/nuxt/src/core/nitro.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts
index 7b83ceffdffa..5c5a0d59eef8 100644
--- a/packages/nuxt/src/core/nitro.ts
+++ b/packages/nuxt/src/core/nitro.ts
@@ -227,11 +227,8 @@ export async function initNitro (nuxt: Nuxt & { _nitro?: Nitro }) {
       await writeTypes(nitro)
     }
     // Exclude nitro output dir from typescript
-    if (!opts.tsConfig.exclude) {
-      opts.tsConfig.exclude = []
-    } else {
-      opts.tsConfig.exclude.push(relative(nuxt.options.buildDir, resolve(nuxt.options.rootDir, nitro.options.output.dir)))
-    }
+    opts.tsConfig.exclude = opts.tsConfig.exclude || []
+    opts.tsConfig.exclude.push(relative(nuxt.options.buildDir, resolve(nuxt.options.rootDir, nitro.options.output.dir)))
     opts.references.push({ path: resolve(nuxt.options.buildDir, 'types/nitro.d.ts') })
   })
 

From df9ed18f28ec7f72b62d704e8ef9b0aae084bb70 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 8 Mar 2023 09:05:44 -0800
Subject: [PATCH 3/3] chore: revert case change

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 4f69a3a4283a..ad18daf7ab3a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
     "skipLibCheck": true,
     "target": "ESNext",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "Node",
     "strict": true,
     "noImplicitAny": true,
     "allowJs": true,