From 616056122aad3672292179b6976a9269cccea3da Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 6 Jan 2025 12:09:40 +0000
Subject: [PATCH 1/4] perf: do not inline `writeTypes` from `@nuxt/kit`

---
 src/commands/prepare.ts   | 4 +---
 src/commands/typecheck.ts | 5 +----
 src/utils/kit.ts          | 7 +++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/commands/prepare.ts b/src/commands/prepare.ts
index 4893027bd..e0768511b 100644
--- a/src/commands/prepare.ts
+++ b/src/commands/prepare.ts
@@ -1,7 +1,5 @@
 import { relative, resolve } from 'pathe'
 import { consola } from 'consola'
-// we are deliberately inlining this code as a backup in case user has `@nuxt/schema<3.7`
-import { writeTypes as writeTypesLegacy } from '@nuxt/kit'
 
 import { defineCommand } from 'citty'
 import { clearBuildDir } from '../utils/fs'
@@ -26,7 +24,7 @@ export default defineCommand({
 
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
-    const { loadNuxt, buildNuxt, writeTypes = writeTypesLegacy } = await loadKit(cwd)
+    const { loadNuxt, buildNuxt, writeTypes } = await loadKit(cwd)
     const nuxt = await loadNuxt({
       cwd,
       dotenv: {
diff --git a/src/commands/typecheck.ts b/src/commands/typecheck.ts
index e8cba01bf..7cfbaea46 100644
--- a/src/commands/typecheck.ts
+++ b/src/commands/typecheck.ts
@@ -5,9 +5,6 @@ import { defineCommand } from 'citty'
 import { isBun } from 'std-env'
 import { createJiti } from 'jiti'
 
-// we are deliberately inlining this code as a backup in case user has `@nuxt/schema<3.7`
-import { writeTypes as writeTypesLegacy } from '@nuxt/kit'
-
 import { loadKit } from '../utils/kit'
 
 import { cwdArgs, legacyRootDirArgs, logLevelArgs } from './_shared'
@@ -27,7 +24,7 @@ export default defineCommand({
 
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
-    const { loadNuxt, buildNuxt, writeTypes = writeTypesLegacy } = await loadKit(cwd)
+    const { loadNuxt, buildNuxt, writeTypes } = await loadKit(cwd)
     const nuxt = await loadNuxt({
       cwd,
       overrides: {
diff --git a/src/utils/kit.ts b/src/utils/kit.ts
index f87ea0bd4..3fdd9f987 100644
--- a/src/utils/kit.ts
+++ b/src/utils/kit.ts
@@ -1,5 +1,4 @@
-// we are deliberately inlining this code as a backup in case user has `@nuxt/schema<3.7`
-import { writeTypes as writeTypesLegacy } from '@nuxt/kit'
+import { consola } from 'consola'
 import { createJiti } from 'jiti'
 
 export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit')> => {
@@ -9,10 +8,10 @@ export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit
     const localKit = jiti.esmResolve('@nuxt/kit', { try: true })
     // Otherwise, we resolve Nuxt _first_ as it is Nuxt's kit dependency that will be used
     const rootURL = localKit ? rootDir : (await tryResolveNuxt(rootDir)) || rootDir
-    let kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
+    const kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
     if (!kit.writeTypes) {
       // Polyfills for schema < 3.7
-      kit = { ...kit, writeTypes: writeTypesLegacy }
+      consola.warn('Using legacy Nuxt kit version. Please upgrade to Nuxt v3.7 or newer.')
     }
     return kit
   }

From e016f2339cffd2c3e99e7f433d018add8a1a4763 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 6 Jan 2025 12:10:58 +0000
Subject: [PATCH 2/4] chore: remove comment

---
 src/utils/kit.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/kit.ts b/src/utils/kit.ts
index 3fdd9f987..eee700b9d 100644
--- a/src/utils/kit.ts
+++ b/src/utils/kit.ts
@@ -10,7 +10,6 @@ export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit
     const rootURL = localKit ? rootDir : (await tryResolveNuxt(rootDir)) || rootDir
     const kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
     if (!kit.writeTypes) {
-      // Polyfills for schema < 3.7
       consola.warn('Using legacy Nuxt kit version. Please upgrade to Nuxt v3.7 or newer.')
     }
     return kit

From e40633d05211de0017d8fe73f0f698d974846490 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 6 Jan 2025 12:23:42 +0000
Subject: [PATCH 3/4] chore: update comment

---
 src/utils/kit.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/kit.ts b/src/utils/kit.ts
index eee700b9d..18a87cfce 100644
--- a/src/utils/kit.ts
+++ b/src/utils/kit.ts
@@ -10,7 +10,7 @@ export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit
     const rootURL = localKit ? rootDir : (await tryResolveNuxt(rootDir)) || rootDir
     const kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
     if (!kit.writeTypes) {
-      consola.warn('Using legacy Nuxt kit version. Please upgrade to Nuxt v3.7 or newer.')
+      consola.warn('Using legacy version of `@nuxt/kit`. Please upgrade to v3.7 or newer.')
     }
     return kit
   }

From af1f4cbeb7a791fe2c9e66bfe26729ce645c6513 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 6 Jan 2025 12:39:31 +0000
Subject: [PATCH 4/4] fix: throw error instead

---
 src/utils/kit.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/utils/kit.ts b/src/utils/kit.ts
index 18a87cfce..eab772357 100644
--- a/src/utils/kit.ts
+++ b/src/utils/kit.ts
@@ -1,4 +1,3 @@
-import { consola } from 'consola'
 import { createJiti } from 'jiti'
 
 export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit')> => {
@@ -8,9 +7,14 @@ export const loadKit = async (rootDir: string): Promise<typeof import('@nuxt/kit
     const localKit = jiti.esmResolve('@nuxt/kit', { try: true })
     // Otherwise, we resolve Nuxt _first_ as it is Nuxt's kit dependency that will be used
     const rootURL = localKit ? rootDir : (await tryResolveNuxt(rootDir)) || rootDir
-    const kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
+    let kit: typeof import('@nuxt/kit') = await jiti.import('@nuxt/kit', { parentURL: rootURL })
     if (!kit.writeTypes) {
-      consola.warn('Using legacy version of `@nuxt/kit`. Please upgrade to v3.7 or newer.')
+      kit = {
+        ...kit,
+        writeTypes: () => {
+          throw new Error('`writeTypes` is not available in this version of `@nuxt/kit`. Please upgrade to v3.7 or newer.')
+        },
+      }
     }
     return kit
   }