Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
pooya parsa 2022-09-14 13:10:10 +02:00 committed by GitHub
parent aaac46980c
commit ac0b3a63a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/kit/src/loader/config.ts
View File

@ -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!

7
packages/nuxt/src/core/nuxt.ts
View File

@ -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
packages/nuxt/types.d.ts vendored
View File

@ -1,2 +1,6 @@
/// <reference types="nitropack" />
export * from './dist/index'
declare global {
const defineNuxtConfig: typeof import('nuxt/config')['defineNuxtConfig']
}

4
playground/nuxt.config.ts
View File

@ -1,3 +1,3 @@
import { defineNuxtConfig } from 'nuxt/config'
export default defineNuxtConfig({
export default defineNuxtConfig({})
})