From 747ed7665ff7b3106712819cd5cf3e13375ff4cf Mon Sep 17 00:00:00 2001
From: julien huang <julien.huang@outlook.fr>
Date: Thu, 13 Oct 2022 00:17:49 +0200
Subject: [PATCH 1/5] feat(nuxt): add NuxtPage to #components

---
 packages/nuxt/src/core/nuxt.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 81305b82691..9f76bbf2b93 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -157,6 +157,12 @@ async function initNuxt (nuxt: Nuxt) {
     filePath: resolve(nuxt.options.appDir, 'components/nuxt-loading-indicator')
   })
 
+  // Add <NuxtPage>
+  addComponent({
+    name: 'NuxtPage',
+    filePath: resolve(distDir, 'pages/runtime/page')
+  })
+
   // Deprecate hooks
   nuxt.hooks.deprecateHooks({
     'autoImports:sources': {

From be28db981ce125557ba22172dc4541948a1ee834 Mon Sep 17 00:00:00 2001
From: julien huang <julien.huang@outlook.fr>
Date: Thu, 13 Oct 2022 00:56:42 +0200
Subject: [PATCH 2/5] fix(nuxt): prefer add NuxtPage in page module

---
 packages/nuxt/src/core/nuxt.ts    | 6 ------
 packages/nuxt/src/pages/module.ts | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts
index 9f76bbf2b93..81305b82691 100644
--- a/packages/nuxt/src/core/nuxt.ts
+++ b/packages/nuxt/src/core/nuxt.ts
@@ -157,12 +157,6 @@ async function initNuxt (nuxt: Nuxt) {
     filePath: resolve(nuxt.options.appDir, 'components/nuxt-loading-indicator')
   })
 
-  // Add <NuxtPage>
-  addComponent({
-    name: 'NuxtPage',
-    filePath: resolve(distDir, 'pages/runtime/page')
-  })
-
   // Deprecate hooks
   nuxt.hooks.deprecateHooks({
     'autoImports:sources': {
diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts
index 0388c3a032d..4b8e487275d 100644
--- 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'
@@ -185,6 +185,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') })

From 78b31a013d3f78fe81f5291d90aafa8b2189d297 Mon Sep 17 00:00:00 2001
From: julien huang <julien.huang@outlook.fr>
Date: Thu, 13 Oct 2022 21:58:10 +0200
Subject: [PATCH 3/5] perf(nuxt): remove NuxtPage manual register in router

---
 packages/nuxt/src/pages/runtime/app.vue   | 4 ++++
 packages/nuxt/src/pages/runtime/router.ts | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/pages/runtime/app.vue b/packages/nuxt/src/pages/runtime/app.vue
index f8eacfa737e..beb0074e3f5 100644
--- a/packages/nuxt/src/pages/runtime/app.vue
+++ b/packages/nuxt/src/pages/runtime/app.vue
@@ -3,3 +3,7 @@
     <NuxtPage />
   </NuxtLayout>
 </template>
+
+<script setup>
+import { NuxtPage, NuxtLayout } from '#components'
+</script>
diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts
index 03bc591227c..e747b494ae3 100644
--- 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`

From 0b0bee897d20f699097160a74b121a0af89bff05 Mon Sep 17 00:00:00 2001
From: julien huang <julien.huang@outlook.fr>
Date: Thu, 13 Oct 2022 22:56:33 +0200
Subject: [PATCH 4/5] refactor(nuxt): prefer relative path for NuxtPage

---
 packages/nuxt/src/pages/runtime/app.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/pages/runtime/app.vue b/packages/nuxt/src/pages/runtime/app.vue
index beb0074e3f5..55db2d493bc 100644
--- a/packages/nuxt/src/pages/runtime/app.vue
+++ b/packages/nuxt/src/pages/runtime/app.vue
@@ -5,5 +5,5 @@
 </template>
 
 <script setup>
-import { NuxtPage, NuxtLayout } from '#components'
+import NuxtPage from './page'
 </script>

From 6beb09994ed4080be4cd34104056e2efee919b29 Mon Sep 17 00:00:00 2001
From: julien huang <julien.huang@outlook.fr>
Date: Fri, 14 Oct 2022 00:56:19 +0200
Subject: [PATCH 5/5] revert(nuxt): rely on component loader for App.vue

---
 packages/nuxt/src/pages/runtime/app.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/nuxt/src/pages/runtime/app.vue b/packages/nuxt/src/pages/runtime/app.vue
index 55db2d493bc..f8eacfa737e 100644
--- a/packages/nuxt/src/pages/runtime/app.vue
+++ b/packages/nuxt/src/pages/runtime/app.vue
@@ -3,7 +3,3 @@
     <NuxtPage />
   </NuxtLayout>
 </template>
-
-<script setup>
-import NuxtPage from './page'
-</script>