Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

feat(nuxt, kit): auto import defineNuxtConfig #7497

Merged
merged 4 commits into from Sep 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/kit/src/loader/config.ts
Expand Up @@ -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',
Expand All @@ -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!

Expand Down
7 changes: 4 additions & 3 deletions packages/nuxt/src/core/nuxt.ts
Expand Up @@ -234,10 +234,11 @@ 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' */
export type { NuxtConfig }
/** @deprecated Use `import type { NuxtConfig } from 'nuxt/config'`. */
type _NuxtConfig = NuxtConfig
export type { _NuxtConfig as NuxtConfig }
4 changes: 4 additions & 0 deletions 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']
}
4 changes: 2 additions & 2 deletions playground/nuxt.config.ts
@@ -1,3 +1,3 @@
import { defineNuxtConfig } from 'nuxt/config'
export default defineNuxtConfig({

export default defineNuxtConfig({})
})