From 3acc9aee79e9039ce13e863bb5ed405afabc1fed Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 14 Sep 2022 12:49:43 +0200
Subject: [PATCH 1/4] feat(nuxt, kit): auto import `defineNuxtConfig`

---
 packages/kit/src/loader/config.ts | 2 ++
 packages/nuxt/src/index.ts        | 4 ++++
 playground/nuxt.config.ts         | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/kit/src/loader/config.ts b/packages/kit/src/loader/config.ts
index 3b6f893e203..0f893f1bfd3 100644
--- a/packages/kit/src/loader/config.ts
+++ b/packages/kit/src/loader/config.ts
@@ -7,6 +7,7 @@ import { NuxtConfigSchema } from '@nuxt/schema'
 export interface LoadNuxtConfigOptions extends LoadConfigOptions<NuxtConfig> {}
 
 export async function loadNuxtConfig (opts: LoadNuxtConfigOptions): Promise<NuxtOptions> {
+  (globalThis as any).defineNuxtConfig = (c: any) => c
   const result = await loadConfig<NuxtConfig>({
     name: 'nuxt',
     configFile: 'nuxt.config',
@@ -16,6 +17,7 @@ export async function loadNuxtConfig (opts: LoadNuxtConfigOptions): Promise<Nuxt
     globalRc: true,
     ...opts
   })
+  delete (globalThis as any).defineNuxtConfig
   const { configFile, layers = [], cwd } = result
   const nuxtConfig = result.config!
 
diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts
index 4940b0db94f..91b7aa005cf 100644
--- a/packages/nuxt/src/index.ts
+++ b/packages/nuxt/src/index.ts
@@ -1,2 +1,6 @@
 export * from './core/nuxt'
 export * from './core/builder'
+
+declare global {
+  const defineNuxtConfig: typeof import('nuxt/config')['defineNuxtConfig']
+}
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
index f716d9f9da9..896312f044e 100644
--- a/playground/nuxt.config.ts
+++ b/playground/nuxt.config.ts
@@ -1,3 +1,3 @@
-import { defineNuxtConfig } from 'nuxt/config'
+export default defineNuxtConfig({
 
-export default defineNuxtConfig({})
+})

From 39b54bee4192a114115b6f479892e4c5462eba66 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 14 Sep 2022 12:56:48 +0200
Subject: [PATCH 2/4] update deprecation message

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

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index b0883c59073..4d7e6aed7a8 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -234,10 +234,10 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
   return nuxt
 }
 
-/** @deprecated Use import { defineNuxtConfig } from  'nuxt/config' */
+/** @deprecated `defineNuxtConfig` is auto imported! Remove import or (alternatively) use `import { defineNuxtConfig } from  'nuxt/config'` */
 export function defineNuxtConfig (config: NuxtConfig): NuxtConfig {
   return config
 }
 
-/** @deprecated Use import type { NuxtConfig } from  'nuxt/config' */
+/** @deprecated Use import type { NuxtConfig } from  'nuxt/config' or remove import  */
 export type { NuxtConfig }

From c283b2da49819f7bd18c5739207ce9bf99b159db Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 14 Sep 2022 12:58:21 +0200
Subject: [PATCH 3/4] move to types.d.ts

---
 packages/nuxt/src/index.ts | 4 ----
 packages/nuxt/types.d.ts   | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts
index 91b7aa005cf..4940b0db94f 100644
--- a/packages/nuxt/src/index.ts
+++ b/packages/nuxt/src/index.ts
@@ -1,6 +1,2 @@
 export * from './core/nuxt'
 export * from './core/builder'
-
-declare global {
-  const defineNuxtConfig: typeof import('nuxt/config')['defineNuxtConfig']
-}
diff --git a/packages/nuxt/types.d.ts b/packages/nuxt/types.d.ts
index 94b9b21857d..cd4d4a037f7 100644
--- a/packages/nuxt/types.d.ts
+++ b/packages/nuxt/types.d.ts
@@ -1,2 +1,6 @@
 /// <reference types="nitropack" />
 export * from './dist/index'
+
+declare global {
+  const defineNuxtConfig: typeof import('nuxt/config')['defineNuxtConfig']
+}

From 4ca6bcba5124f4395678fe3523e5f2e08d92d554 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 14 Sep 2022 13:03:44 +0200
Subject: [PATCH 4/4] update deprecated message

---
 packages/nuxt/src/core/nuxt.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 4d7e6aed7a8..419650e227c 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -234,10 +234,11 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
   return nuxt
 }
 
-/** @deprecated `defineNuxtConfig` is auto imported! Remove import or (alternatively) use `import { defineNuxtConfig } from  'nuxt/config'` */
+/** @deprecated `defineNuxtConfig` is auto imported. Remove import or alternatively use `import { defineNuxtConfig } from  'nuxt/config'`. */
 export function defineNuxtConfig (config: NuxtConfig): NuxtConfig {
   return config
 }
 
-/** @deprecated Use import type { NuxtConfig } from  'nuxt/config' or remove import  */
-export type { NuxtConfig }
+/** @deprecated Use `import type { NuxtConfig } from  'nuxt/config'`.  */
+type _NuxtConfig = NuxtConfig
+export type { _NuxtConfig as NuxtConfig }