feat(nuxt)!: add <NuxtPage> to #components (#8145)

nuxt · Oct 14, 2022 · 23ad303 · 23ad303
1 parent 2083ed4
commit 23ad303
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts
@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs'
-import { defineNuxtModule, addTemplate, addPlugin, addVitePlugin, addWebpackPlugin, findPath } from '@nuxt/kit'
+import { defineNuxtModule, addTemplate, addPlugin, addVitePlugin, addWebpackPlugin, findPath, addComponent } from '@nuxt/kit'
 import { relative, resolve } from 'pathe'
 import { genString, genImport, genObjectFromRawEntries } from 'knitwork'
 import escapeRE from 'escape-string-regexp'
@@ -190,6 +190,12 @@ export default defineNuxtModule({
       }
     })
 
+    // Add <NuxtPage>
+    addComponent({
+      name: 'NuxtPage',
+      filePath: resolve(distDir, 'pages/runtime/page')
+    })
+
     // Add declarations for middleware keys
     nuxt.hook('prepare:types', ({ references }) => {
       references.push({ path: resolve(nuxt.options.buildDir, 'types/middleware.d.ts') })

diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
@@ -50,11 +50,6 @@ function createCurrentLocation (
 }
 
 export default defineNuxtPlugin(async (nuxtApp) => {
-  nuxtApp.vueApp.component('NuxtPage', NuxtPage)
-  // TODO: remove before release - present for backwards compatibility & intentionally undocumented
-  nuxtApp.vueApp.component('NuxtNestedPage', NuxtPage)
-  nuxtApp.vueApp.component('NuxtChild', NuxtPage)
-
   let routerBase = useRuntimeConfig().app.baseURL
   if (routerOptions.hashMode && !routerBase.includes('#')) {
     // allow the user to provide a `#` in the middle: `/base/#/app`