From 3a60bf69cebbcc832c713679378ff8095076dd86 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 14 Sep 2022 12:37:30 +0200 Subject: [PATCH] perf(nuxt): import `defineNuxtConfig` from `nuxt/config` (#7485) --- packages/nuxt/config.cjs | 7 +++++++ packages/nuxt/config.d.ts | 4 ++++ packages/nuxt/config.mjs | 5 +++++ packages/nuxt/package.json | 8 +++++++- packages/nuxt/src/core/nuxt.ts | 3 ++- playground/nuxt.config.ts | 2 +- 6 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 packages/nuxt/config.cjs create mode 100644 packages/nuxt/config.d.ts create mode 100644 packages/nuxt/config.mjs diff --git a/packages/nuxt/config.cjs b/packages/nuxt/config.cjs new file mode 100644 index 00000000000..cfdf3f8aa98 --- /dev/null +++ b/packages/nuxt/config.cjs @@ -0,0 +1,7 @@ +function defineNuxtConfig (config) { + return config +} + +module.exports = { + defineNuxtConfig +} diff --git a/packages/nuxt/config.d.ts b/packages/nuxt/config.d.ts new file mode 100644 index 00000000000..a1dd455ddf4 --- /dev/null +++ b/packages/nuxt/config.d.ts @@ -0,0 +1,4 @@ +import { NuxtConfig } from '@nuxt/schema' +export { NuxtConfig } from '@nuxt/schema' + +export declare function defineNuxtConfig(config: NuxtConfig): NuxtConfig diff --git a/packages/nuxt/config.mjs b/packages/nuxt/config.mjs new file mode 100644 index 00000000000..a063cde6ed7 --- /dev/null +++ b/packages/nuxt/config.mjs @@ -0,0 +1,5 @@ +function defineNuxtConfig (config) { + return config +} + +export { defineNuxtConfig } diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 7fbcfb71937..b6e7ec2ad30 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -12,6 +12,11 @@ }, "exports": { ".": "./dist/index.mjs", + "./config": { + "import": "./config.mjs", + "require": "./config.cjs", + "types": "./config.d.ts" + }, "./app": "./dist/app/index.mjs", "./package.json": "./package.json" }, @@ -24,7 +29,8 @@ "app.d.ts", "bin", "types.d.ts", - "dist" + "dist", + "config.*" ], "scripts": { "prepack": "unbuild" diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts index f4192f34c02..b0883c59073 100644 --- a/packages/nuxt/src/core/nuxt.ts +++ b/packages/nuxt/src/core/nuxt.ts @@ -234,9 +234,10 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise { return nuxt } +/** @deprecated Use import { defineNuxtConfig } from 'nuxt/config' */ export function defineNuxtConfig (config: NuxtConfig): NuxtConfig { return config } -// For a convenience import together with `defineNuxtConfig` +/** @deprecated Use import type { NuxtConfig } from 'nuxt/config' */ export type { NuxtConfig } diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts index 2221b92fc94..f716d9f9da9 100644 --- a/playground/nuxt.config.ts +++ b/playground/nuxt.config.ts @@ -1,3 +1,3 @@ -import { defineNuxtConfig } from 'nuxt' +import { defineNuxtConfig } from 'nuxt/config' export default defineNuxtConfig({})