From 8c956db8662248df6658d2b015b87e180031ef78 Mon Sep 17 00:00:00 2001 From: Julien Huang Date: Mon, 9 Dec 2024 13:38:25 +0100 Subject: [PATCH] refactor(nuxt): prefix all core modules with `nuxt:` (#30028) --- packages/nuxt/src/components/module.ts | 2 +- packages/nuxt/src/core/schema.ts | 2 +- packages/nuxt/src/core/templates.ts | 3 +-- packages/nuxt/src/head/module.ts | 2 +- packages/nuxt/src/imports/module.ts | 2 +- packages/nuxt/src/pages/module.ts | 3 ++- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/nuxt/src/components/module.ts b/packages/nuxt/src/components/module.ts index a2a1d8ca7d..7a8d145eaf 100644 --- a/packages/nuxt/src/components/module.ts +++ b/packages/nuxt/src/components/module.ts @@ -28,7 +28,7 @@ export type getComponentsT = (mode?: 'client' | 'server' | 'all') => Component[] export default defineNuxtModule({ meta: { - name: 'components', + name: 'nuxt:components', configKey: 'components', }, defaults: { diff --git a/packages/nuxt/src/core/schema.ts b/packages/nuxt/src/core/schema.ts index a2bf41d7dd..5e3750bfc6 100644 --- a/packages/nuxt/src/core/schema.ts +++ b/packages/nuxt/src/core/schema.ts @@ -16,7 +16,7 @@ import { createJiti } from 'jiti' export default defineNuxtModule({ meta: { - name: 'nuxt-config-schema', + name: 'nuxt:nuxt-config-schema', }, async setup (_, nuxt) { const resolver = createResolver(import.meta.url) diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts index ed2dee8054..0ec7df4860 100644 --- a/packages/nuxt/src/core/templates.ts +++ b/packages/nuxt/src/core/templates.ts @@ -177,7 +177,6 @@ export { } }, } -const adHocModules = ['router', 'pages', 'imports', 'meta', 'components', 'nuxt-config-schema'] const IMPORT_NAME_RE = /\.\w+$/ const GIT_RE = /^git\+/ export const schemaTemplate: NuxtTemplate = { @@ -187,7 +186,7 @@ export const schemaTemplate: NuxtTemplate = { const getImportName = (name: string) => (name[0] === '.' ? './' + join(relativeRoot, name) : name).replace(IMPORT_NAME_RE, '') const modules = nuxt.options._installedModules - .filter(m => m.meta && m.meta.configKey && m.meta.name && !adHocModules.includes(m.meta.name)) + .filter(m => m.meta && m.meta.configKey && m.meta.name && !m.meta.name.startsWith('nuxt:') && m.meta.name !== 'nuxt-config-schema') .map(m => [genString(m.meta.configKey), getImportName(m.entryPath || m.meta.name), m] as const) const privateRuntimeConfig = Object.create(null) diff --git a/packages/nuxt/src/head/module.ts b/packages/nuxt/src/head/module.ts index d8b4d74a01..843eb45d5c 100644 --- a/packages/nuxt/src/head/module.ts +++ b/packages/nuxt/src/head/module.ts @@ -7,7 +7,7 @@ const components = ['NoScript', 'Link', 'Base', 'Title', 'Meta', 'Style', 'Head' export default defineNuxtModule({ meta: { - name: 'meta', + name: 'nuxt:meta', configKey: 'unhead', }, async setup (options, nuxt) { diff --git a/packages/nuxt/src/imports/module.ts b/packages/nuxt/src/imports/module.ts index 5465a180e2..2714470a43 100644 --- a/packages/nuxt/src/imports/module.ts +++ b/packages/nuxt/src/imports/module.ts @@ -13,7 +13,7 @@ import { defaultPresets } from './presets' export default defineNuxtModule>({ meta: { - name: 'imports', + name: 'nuxt:imports', configKey: 'imports', }, defaults: nuxt => ({ diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts index 8769ba2ae5..b1d3b24939 100644 --- a/packages/nuxt/src/pages/module.ts +++ b/packages/nuxt/src/pages/module.ts @@ -23,7 +23,8 @@ const OPTIONAL_PARAM_RE = /^\/?:.*(?:\?|\(\.\*\)\*)$/ export default defineNuxtModule({ meta: { - name: 'pages', + name: 'nuxt:pages', + configKey: 'pages', }, async setup (_options, nuxt) { const useExperimentalTypedPages = nuxt.options.experimental.typedPages