From 09e50a4d9c905d36940b99801bb0c4ca264f015b Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 16:50:03 +0100
Subject: [PATCH 01/15] feat(nuxt): config default keepalive, page & layout
 transitions

---
 .../2.guide/3.directory-structure/10.pages.md |  4 +++
 packages/nuxt/src/app/components/layout.ts    |  4 +--
 packages/nuxt/src/core/templates.ts           |  8 +++++
 packages/nuxt/src/head/module.ts              | 17 +---------
 packages/nuxt/src/head/runtime/plugin.ts      |  4 +--
 packages/nuxt/src/pages/runtime/page.ts       |  6 ++--
 packages/schema/src/config/_app.ts            | 31 +++++++++++++++++++
 7 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/docs/content/2.guide/3.directory-structure/10.pages.md b/docs/content/2.guide/3.directory-structure/10.pages.md
index 60781036c94..f24440614d9 100644
--- a/docs/content/2.guide/3.directory-structure/10.pages.md
+++ b/docs/content/2.guide/3.directory-structure/10.pages.md
@@ -267,6 +267,8 @@ Of course, you are welcome to define metadata for your own use throughout your a
 
 Nuxt will automatically wrap your page in [the Vue `<KeepAlive>` component](https://vuejs.org/guide/built-ins/keep-alive.html#keepalive) if you set `keepalive: true` in your `definePageMeta`. This might be useful to do, for example, in a parent route that has dynamic child routes, if you want to preserve page state across route changes. You can also set props to be passed to `<KeepAlive>` (see a full list [here](https://vuejs.org/api/built-in-components.html#keepalive)).
 
+You can set a default value for this property [in your `nuxt.config`](/api/configuration/nuxt.config#keepalive).
+
 #### `key`
 
 [See above](#child-route-keys).
@@ -283,6 +285,8 @@ You can define middleware to apply before loading this page. It will be merged w
 
 You can define transition properties for the `<transition>` component that wraps your pages and layouts, or pass `false` to disable the `<transition>` wrapper for that route. You can see a list of options that can be passed [here](https://vuejs.org/api/built-in-components.html#transition) or read [more about how transitions work](https://vuejs.org/guide/built-ins/transition.html#transition).
 
+You can set default values for these properties [in your `nuxt.config`](/api/configuration/nuxt.config#layouttransition).
+
 #### `alias`
 
 You can define page aliases. They allow you to access the same page from different paths. It can be either a string or an array of strings as defined [here](https://router.vuejs.org/guide/essentials/redirect-and-alias.html#alias) on vue-router documentation.
diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index 4a307ca4636..33ca8b7f5f5 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -3,8 +3,8 @@ import { _wrapIf } from './utils'
 import { useRoute } from '#app'
 // @ts-ignore
 import layouts from '#build/layouts'
-
-const defaultLayoutTransition = { name: 'layout', mode: 'out-in' }
+// @ts-ignore
+import { layoutTransition as defaultLayoutTransition } from '#build/app.config.mjs'
 
 export default defineComponent({
   props: {
diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 81a5e95b4e7..6774728625c 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -70,6 +70,14 @@ export const serverPluginTemplate = {
   }
 }
 
+// Add app configuration
+export const appConfigTemplate = {
+  filename: 'app.config.mjs',
+  getContents: (ctx: TemplateContext) => {
+    return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${k} = ${JSON.stringify(v)}`).join('\n\n')
+  }
+}
+
 export const appViewTemplate = {
   filename: 'views/document.template.mjs',
   write: true,
diff --git a/packages/nuxt/src/head/module.ts b/packages/nuxt/src/head/module.ts
index a8dcccbdaec..9689b75b509 100644
--- a/packages/nuxt/src/head/module.ts
+++ b/packages/nuxt/src/head/module.ts
@@ -1,8 +1,6 @@
 import { resolve } from 'pathe'
-import { addPlugin, addTemplate, defineNuxtModule } from '@nuxt/kit'
-import defu from 'defu'
+import { addPlugin, defineNuxtModule } from '@nuxt/kit'
 import { distDir } from '../dirs'
-import type { MetaObject } from './runtime'
 
 export default defineNuxtModule({
   meta: {
@@ -21,19 +19,6 @@ export default defineNuxtModule({
     // Add #head alias
     nuxt.options.alias['#head'] = runtimeDir
 
-    // Global meta -for Bridge, this is necessary to repeat here
-    // and in packages/schema/src/config/_app.ts
-    const globalMeta: MetaObject = defu(nuxt.options.app.head, {
-      charset: options.charset,
-      viewport: options.viewport
-    })
-
-    // Add global meta configuration
-    addTemplate({
-      filename: 'meta.config.mjs',
-      getContents: () => 'export default ' + JSON.stringify({ globalMeta })
-    })
-
     // Add generic plugin
     addPlugin({ src: resolve(runtimeDir, 'plugin') })
 
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index 476bba28803..f90f679797f 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -3,7 +3,7 @@ import * as Components from './components'
 import { useHead } from './composables'
 import { defineNuxtPlugin, useNuxtApp } from '#app'
 // @ts-ignore
-import metaConfig from '#build/meta.config.mjs'
+import { head as globalMeta } from '#build/app.config.mjs'
 
 type MetaComponents = typeof Components
 declare module 'vue' {
@@ -28,7 +28,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...metaConfig.globalMeta }))
+  useHead(markRaw({ title: '', ...globalMeta }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index a42c77c37ac..cedf609e31c 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -4,6 +4,8 @@ import { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouterView } fr
 import { generateRouteKey, RouterViewSlotProps, wrapInKeepAlive } from './utils'
 import { useNuxtApp } from '#app'
 import { _wrapIf } from '#app/components/utils'
+// @ts-ignore
+import { pageTransition as defaultPageTransition, keepalive as defaultKeepaliveConfig } from '#build/app.config.mjs'
 
 const isNestedKey = Symbol('isNested')
 
@@ -32,7 +34,7 @@ export default defineComponent({
       return h(RouterView, { name: props.name, route: props.route, ...attrs }, {
         default: (routeProps: RouterViewSlotProps) => routeProps.Component &&
             _wrapIf(Transition, routeProps.route.meta.pageTransition ?? defaultPageTransition,
-              wrapInKeepAlive(routeProps.route.meta.keepalive,
+              wrapInKeepAlive(routeProps.route.meta.keepalive ?? defaultKeepaliveConfig,
                 isNested && nuxtApp.isHydrating
                   // Include route children in parent suspense
                   ? h(routeProps.Component, { key: generateRouteKey(props.pageKey, routeProps) } as {})
@@ -50,5 +52,3 @@ export default defineComponent({
   pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string)
   [key: string]: any
 }>
-
-const defaultPageTransition = { name: 'page', mode: 'out-in' }
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 9a4ce871cba..62dd53d2b4e 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -111,6 +111,37 @@ export default {
         })
       }
     },
+
+    /**
+     * Default values for layout transitions.
+     *
+     * This can be overridden with `definePageMeta` on an individual page.
+     * Only JSON-serializable values are allowed.
+     *
+     * @see https://vuejs.org/api/built-in-components.html#transition
+     * @type {boolean | typeof import('vue').TransitionProps}
+     */
+    layoutTransition: { name: 'layout', mode: 'out-in' },
+    /**
+     * Default values for page transitions.
+     *
+     * This can be overridden with `definePageMeta` on an individual page.
+     * Only JSON-serializable values are allowed.
+     *
+     * @see https://vuejs.org/api/built-in-components.html#transition
+     * @type {boolean | typeof import('vue').TransitionProps}
+     */
+    pageTransition: { name: 'page', mode: 'out-in' },
+    /**
+     * Default values for KeepAlive configuration between pages.
+     *
+     * This can be overridden with `definePageMeta` on an individual page.
+     * Only JSON-serializable values are allowed.
+     *
+     * @see https://vuejs.org/api/built-in-components.html#keepalive
+     * @type {boolean | typeof import('vue').KeepAliveProps}
+     */
+    keepalive: false,
   },
   /**
    * The path to a templated HTML file for rendering Nuxt responses.

From fe376f5a893be3e062ef0d73162563d287d665ee Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 12 Jul 2022 16:54:24 +0100
Subject: [PATCH 02/15] fix: move head defaults to schema

---
 packages/nuxt/src/head/module.ts   | 4 ----
 packages/schema/src/config/_app.ts | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/head/module.ts b/packages/nuxt/src/head/module.ts
index 9689b75b509..68c5cfec26e 100644
--- a/packages/nuxt/src/head/module.ts
+++ b/packages/nuxt/src/head/module.ts
@@ -6,10 +6,6 @@ export default defineNuxtModule({
   meta: {
     name: 'meta'
   },
-  defaults: {
-    charset: 'utf-8',
-    viewport: 'width=device-width, initial-scale=1'
-  },
   setup (options, nuxt) {
     const runtimeDir = nuxt.options.alias['#head'] || resolve(distDir, 'head/runtime')
 
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 62dd53d2b4e..e1e7b601f03 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -210,7 +210,9 @@ export default {
     /** Each item in the array maps to a newly-created `<style>` element, where object properties map to attributes. */
     style: [],
     /** Each item in the array maps to a newly-created `<script>` element, where object properties map to attributes. */
-    script: []
+    script: [],
+    charset: 'utf-8',
+    viewport: 'width=device-width, initial-scale=1'
   },
 
   /**

From 33912d4a79839f4ecf5bf0a28ef31c985e7800ef Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pooya@pi0.io>
Date: Wed, 27 Jul 2022 15:28:14 +0200
Subject: [PATCH 03/15] fix merge issue

---
 packages/nuxt/src/core/templates.ts | 36 +++++++----------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index 8b64647d351..bb76eb7e9b3 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -74,34 +74,6 @@ export const serverPluginTemplate = {
   }
 }
 
-// Add app configuration
-export const appConfigTemplate = {
-  filename: 'app.config.mjs',
-  getContents: (ctx: TemplateContext) => {
-    return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${k} = ${JSON.stringify(v)}`).join('\n\n')
-  }
-}
-
-export const appViewTemplate = {
-  filename: 'views/document.template.mjs',
-  write: true,
-  getContents () {
-    return `export default (params) => \`<!DOCTYPE html>
-<html \${params.HTML_ATTRS}>
-
-<head \${params.HEAD_ATTRS}>
-  \${params.HEAD}
-</head>
-
-<body \${params.BODY_ATTRS}>\${params.BODY_PREPEND}
-  \${params.APP}
-</body>
-
-</html>\`
-`
-  }
-}
-
 export const pluginsDeclaration = {
   filename: 'types/plugins.d.ts',
   getContents: (ctx: TemplateContext) => {
@@ -230,3 +202,11 @@ export const publicPathTemplate: NuxtTemplate = {
     ].filter(Boolean).join('\n')
   }
 }
+
+// Add app configuration
+export const appConfigTemplate = {
+  filename: 'app.config.mjs',
+  getContents: (ctx: TemplateContext) => {
+    return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${k} = ${JSON.stringify(v)}`).join('\n\n')
+  }
+}

From a9477322ab23c0fe51382e5d704f6edd95f87a93 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 15:24:07 +0100
Subject: [PATCH 04/15] refactor: use new app config feature for accessing
 `app` options

---
 packages/nuxt/src/app/components/layout.ts |  7 +++----
 packages/nuxt/src/core/templates.ts        | 14 +++++---------
 packages/nuxt/src/head/runtime/plugin.ts   |  6 ++----
 packages/nuxt/src/pages/runtime/page.ts    | 11 +++++------
 test/basic.test.ts                         |  6 ++++++
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index 33ca8b7f5f5..a841f55572b 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -1,10 +1,8 @@
 import { defineComponent, isRef, Ref, Transition } from 'vue'
 import { _wrapIf } from './utils'
-import { useRoute } from '#app'
+import { useAppConfig, useRoute } from '#app'
 // @ts-ignore
 import layouts from '#build/layouts'
-// @ts-ignore
-import { layoutTransition as defaultLayoutTransition } from '#build/app.config.mjs'
 
 export default defineComponent({
   props: {
@@ -15,6 +13,7 @@ export default defineComponent({
   },
   setup (props, context) {
     const route = useRoute()
+    const appConfig = useAppConfig()
 
     return () => {
       const layout = (isRef(props.name) ? props.name.value : props.name) ?? route.meta.layout as string ?? 'default'
@@ -25,7 +24,7 @@ export default defineComponent({
       }
 
       // We avoid rendering layout transition if there is no layout to render
-      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? defaultLayoutTransition),
+      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig.nuxt.layoutTransition),
         _wrapIf(layouts[layout], hasLayout, context.slots)
       ).default()
     }
diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index ffb9615e069..b79ed6b611a 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -205,13 +205,17 @@ export const appConfigTemplate: NuxtTemplate = {
   filename: 'app.config.mjs',
   write: true,
   getContents: ({ app, nuxt }) => {
+    const nuxtKeysToOmit = ['baseURL', 'buildAssetsDir', 'assetsPath', 'cdnURL']
     return `
 import defu from 'defu'
 
 const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
+const nuxtConfig = {
+  nuxt: ${JSON.stringify({ ...nuxt.options.app, ...Object.fromEntries(nuxtKeysToOmit.map(k => [k])) }, null, 2)},
+}
 
 ${app.configs.map((id: string, index: number) => `import ${`cfg${index}`} from ${JSON.stringify(id)}`).join('\n')}
-export default defu(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig']).join(', ')})
+export default defu(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig', 'nuxtConfig']).join(', ')})
 `
   }
 }
@@ -242,11 +246,3 @@ export const publicPathTemplate: NuxtTemplate = {
     ].filter(Boolean).join('\n')
   }
 }
-
-// Add app configuration
-export const appConfigTemplate = {
-  filename: 'app.config.mjs',
-  getContents: (ctx: TemplateContext) => {
-    return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${k} = ${JSON.stringify(v)}`).join('\n\n')
-  }
-}
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index 73ac9c6421e..d869791e846 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -1,9 +1,7 @@
 import { computed, getCurrentInstance, markRaw } from 'vue'
 import * as Components from './components'
 import { useHead } from './composables'
-import { defineNuxtPlugin, useNuxtApp } from '#app'
-// @ts-ignore
-import { head as globalMeta } from '#build/app.config.mjs'
+import { defineNuxtPlugin, useAppConfig, useNuxtApp } from '#app'
 
 type MetaComponents = typeof Components
 declare module 'vue' {
@@ -28,7 +26,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...globalMeta }))
+  useHead(markRaw({ title: '', ...useAppConfig().nuxt.head }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index 17b7c0b0f25..5f2a7b2fc28 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -2,10 +2,8 @@ import { computed, DefineComponent, defineComponent, h, inject, provide, reactiv
 import { RouteLocation, RouteLocationNormalized, RouteLocationNormalizedLoaded, RouterView } from 'vue-router'
 
 import { generateRouteKey, RouterViewSlotProps, wrapInKeepAlive } from './utils'
-import { useNuxtApp } from '#app'
+import { useAppConfig, useNuxtApp } from '#app'
 import { _wrapIf } from '#app/components/utils'
-// @ts-ignore
-import { pageTransition as defaultPageTransition, keepalive as defaultKeepaliveConfig } from '#build/app.config.mjs'
 
 const isNestedKey = Symbol('isNested')
 
@@ -26,6 +24,7 @@ export default defineComponent({
   },
   setup (props, { attrs }) {
     const nuxtApp = useNuxtApp()
+    const appConfig = useAppConfig()
 
     const isNested = inject(isNestedKey, false)
     provide(isNestedKey, true)
@@ -37,9 +36,9 @@ export default defineComponent({
 
           const key = generateRouteKey(props.pageKey, routeProps)
 
-          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? defaultPageTransition,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? defaultKeepaliveConfig, isNested && nuxtApp.isHydrating
-            // Include route children in parent suspense
+          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig.nuxt.pageTransition,
+            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig.nuxt.keepalive, isNested && nuxtApp.isHydrating
+              // Include route children in parent suspense
               ? h(Component, { key, routeProps, pageKey: key } as {})
               : h(Suspense, {
                 onPending: () => nuxtApp.callHook('page:start', routeProps.Component),
diff --git a/test/basic.test.ts b/test/basic.test.ts
index 16f388dbe50..0d1a1b67426 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -471,6 +471,12 @@ describe('app config', () => {
     const html = await $fetch('/app-config')
 
     const expectedAppConfig = {
+      nuxt: {
+        head: { meta: [], link: [], style: [], script: [], noscript: [], charset: 'utf-8', viewport: 'width=1024, initial-scale=1' },
+        layoutTransition: { name: 'layout', mode: 'out-in' },
+        pageTransition: { name: 'page', mode: 'out-in' },
+        keepalive: false
+      },
       fromNuxtConfig: true,
       nested: {
         val: 2

From 2e7265b62897db6161eb22a19d7f35d3d8d634a6 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 15:53:59 +0100
Subject: [PATCH 05/15] fix: remove unused import

---
 packages/nuxt/src/head/module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/head/module.ts b/packages/nuxt/src/head/module.ts
index eb22ba8cbeb..68c5cfec26e 100644
--- a/packages/nuxt/src/head/module.ts
+++ b/packages/nuxt/src/head/module.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'pathe'
-import { addPlugin, addTemplate, defineNuxtModule } from '@nuxt/kit'
+import { addPlugin, defineNuxtModule } from '@nuxt/kit'
 import { distDir } from '../dirs'
 
 export default defineNuxtModule({

From 0e1fd964c6eb9ea04ccbf3d38e8dfc9d495061bf Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 15:55:20 +0100
Subject: [PATCH 06/15] fix: ignore types for appConfig.nuxt

---
 packages/nuxt/src/app/components/layout.ts | 2 +-
 packages/nuxt/src/head/runtime/plugin.ts   | 4 ++--
 packages/nuxt/src/pages/runtime/page.ts    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index a841f55572b..94d010552f2 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -24,7 +24,7 @@ export default defineComponent({
       }
 
       // We avoid rendering layout transition if there is no layout to render
-      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig.nuxt.layoutTransition),
+      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? (appConfig as any).nuxt.layoutTransition),
         _wrapIf(layouts[layout], hasLayout, context.slots)
       ).default()
     }
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index d869791e846..746ab56f3de 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -5,7 +5,7 @@ import { defineNuxtPlugin, useAppConfig, useNuxtApp } from '#app'
 
 type MetaComponents = typeof Components
 declare module 'vue' {
-  export interface GlobalComponents extends MetaComponents {}
+  export interface GlobalComponents extends MetaComponents { }
 }
 
 const metaMixin = {
@@ -26,7 +26,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...useAppConfig().nuxt.head }))
+  useHead(markRaw({ title: '', ...(useAppConfig() as any).nuxt.head }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index 5f2a7b2fc28..6c91c5ed13c 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -36,8 +36,8 @@ export default defineComponent({
 
           const key = generateRouteKey(props.pageKey, routeProps)
 
-          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig.nuxt.pageTransition,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig.nuxt.keepalive, isNested && nuxtApp.isHydrating
+          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? (appConfig as any).nuxt.pageTransition,
+            wrapInKeepAlive(routeProps.route.meta.keepalive ?? (appConfig as any).nuxt.keepalive, isNested && nuxtApp.isHydrating
               // Include route children in parent suspense
               ? h(Component, { key, routeProps, pageKey: key } as {})
               : h(Suspense, {

From e6d14d7350974a4f1c553dcea966ecdf2ce259d9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 16:34:16 +0100
Subject: [PATCH 07/15] feat: type appconfig.nuxt from schema

---
 packages/nuxt/src/app/components/layout.ts |  2 +-
 packages/nuxt/src/head/runtime/plugin.ts   |  2 +-
 packages/nuxt/src/pages/runtime/page.ts    |  4 ++--
 packages/schema/src/config/_app.ts         |  4 +---
 packages/schema/src/types/config.ts        | 11 ++++++-----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index 94d010552f2..a841f55572b 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -24,7 +24,7 @@ export default defineComponent({
       }
 
       // We avoid rendering layout transition if there is no layout to render
-      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? (appConfig as any).nuxt.layoutTransition),
+      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig.nuxt.layoutTransition),
         _wrapIf(layouts[layout], hasLayout, context.slots)
       ).default()
     }
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index 746ab56f3de..b0dbbc1d899 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -26,7 +26,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...(useAppConfig() as any).nuxt.head }))
+  useHead(markRaw({ title: '', ...useAppConfig().nuxt.head }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index 6c91c5ed13c..5f2a7b2fc28 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -36,8 +36,8 @@ export default defineComponent({
 
           const key = generateRouteKey(props.pageKey, routeProps)
 
-          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? (appConfig as any).nuxt.pageTransition,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? (appConfig as any).nuxt.keepalive, isNested && nuxtApp.isHydrating
+          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig.nuxt.pageTransition,
+            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig.nuxt.keepalive, isNested && nuxtApp.isHydrating
               // Include route children in parent suspense
               ? h(Component, { key, routeProps, pageKey: key } as {})
               : h(Suspense, {
diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 174f7bd1778..28361a1f34b 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -223,9 +223,7 @@ export default {
     /** Each item in the array maps to a newly-created `<style>` element, where object properties map to attributes. */
     style: [],
     /** Each item in the array maps to a newly-created `<script>` element, where object properties map to attributes. */
-    script: [],
-    charset: 'utf-8',
-    viewport: 'width=device-width, initial-scale=1'
+    script: []
   },
 
   /**
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index 66b902a4f92..f2264f5e28a 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -13,8 +13,8 @@ export interface NuxtConfig extends DeepPartial<Omit<ConfigSchema, 'vite'>> {
 
 // TODO: Expose ConfigLayer<T> from c12
 interface ConfigLayer<T> {
-  config: T;
-  cwd: string;
+  config: T
+  cwd: string
   configFile: string
 }
 export type NuxtConfigLayer = ConfigLayer<NuxtConfig & {
@@ -65,10 +65,11 @@ export interface RuntimeConfig extends PrivateRuntimeConfig, RuntimeConfigNamesp
 export interface AppConfigInput extends Record<string, any> {
   /** @deprecated reserved */
   private?: never
-  /** @deprecated reserved */
-  nuxt?: never
+  nuxt?: DeepPartial<Omit<ConfigSchema['app'], 'baseURL' | 'buildAssetsDir' | 'assetsPath' | 'cdnURL'>>
   /** @deprecated reserved */
   nitro?: never
 }
 
-export interface AppConfig { }
+export interface AppConfig {
+  nuxt: Omit<ConfigSchema['app'], 'baseURL' | 'buildAssetsDir' | 'assetsPath' | 'cdnURL'>
+}

From 4f460213d80a2b379c16f47eeacb4560106b22c5 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:11:41 +0100
Subject: [PATCH 08/15] refactor: move types from app schema -> internal
 `NuxtAppConfig` interface

---
 packages/schema/src/config/_app.ts  |  8 ++++----
 packages/schema/src/types/config.ts | 13 +++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 28361a1f34b..5d46fe7486c 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -100,7 +100,7 @@ export default {
      *   }
      * }
      * ```
-     * @type {typeof import('../src/types/meta').MetaObject}
+     * @type {typeof import('../src/types/config').NuxtAppConfig['head']}
      * @version 3
      */
     head: {
@@ -132,7 +132,7 @@ export default {
      * Only JSON-serializable values are allowed.
      *
      * @see https://vuejs.org/api/built-in-components.html#transition
-     * @type {boolean | typeof import('vue').TransitionProps}
+     * @type {typeof import('../src/types/config').NuxtAppConfig['layoutTransition']}
      */
     layoutTransition: { name: 'layout', mode: 'out-in' },
     /**
@@ -142,7 +142,7 @@ export default {
      * Only JSON-serializable values are allowed.
      *
      * @see https://vuejs.org/api/built-in-components.html#transition
-     * @type {boolean | typeof import('vue').TransitionProps}
+     * @type {typeof import('../src/types/config').NuxtAppConfig['pageTransition']}
      */
     pageTransition: { name: 'page', mode: 'out-in' },
     /**
@@ -152,7 +152,7 @@ export default {
      * Only JSON-serializable values are allowed.
      *
      * @see https://vuejs.org/api/built-in-components.html#keepalive
-     * @type {boolean | typeof import('vue').KeepAliveProps}
+     * @type {typeof import('../src/types/config').NuxtAppConfig['keepalive']}
      */
     keepalive: false,
   },
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index f2264f5e28a..976dbb887aa 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -1,6 +1,8 @@
+import type { KeepAliveProps, TransitionProps } from 'vue'
 import { ConfigSchema } from '../../schema/config'
 import type { UserConfig as ViteUserConfig } from 'vite'
 import type { Options as VuePluginOptions } from '@vitejs/plugin-vue'
+import { MetaObject } from './meta'
 
 type DeepPartial<T> = T extends Function ? T : T extends Record<string, any> ? { [P in keyof T]?: DeepPartial<T[P]> } : T
 
@@ -65,11 +67,18 @@ export interface RuntimeConfig extends PrivateRuntimeConfig, RuntimeConfigNamesp
 export interface AppConfigInput extends Record<string, any> {
   /** @deprecated reserved */
   private?: never
-  nuxt?: DeepPartial<Omit<ConfigSchema['app'], 'baseURL' | 'buildAssetsDir' | 'assetsPath' | 'cdnURL'>>
+  nuxt?: never
   /** @deprecated reserved */
   nitro?: never
 }
 
+export interface NuxtAppConfig {
+  head: MetaObject
+  layoutTransition: boolean | TransitionProps
+  pageTransition: boolean | TransitionProps
+  keepalive: boolean | KeepAliveProps
+}
+
 export interface AppConfig {
-  nuxt: Omit<ConfigSchema['app'], 'baseURL' | 'buildAssetsDir' | 'assetsPath' | 'cdnURL'>
+  nuxt: NuxtAppConfig
 }

From 5a2ddf85230428ae20d26911ce17b6f9ff5da7a9 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:12:44 +0100
Subject: [PATCH 09/15] style: remove blank line

---
 packages/schema/src/config/_app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schema/src/config/_app.ts b/packages/schema/src/config/_app.ts
index 5d46fe7486c..045bd6ee37a 100644
--- a/packages/schema/src/config/_app.ts
+++ b/packages/schema/src/config/_app.ts
@@ -124,7 +124,6 @@ export default {
         return resolved
       }
     },
-
     /**
      * Default values for layout transitions.
      *

From 9e3635d57289cbcb7a6433a5251ee3c96e32c1bd Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:13:59 +0100
Subject: [PATCH 10/15] fix: revert changes

---
 packages/schema/src/types/config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index 976dbb887aa..9a4ca08982f 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -2,7 +2,7 @@ import type { KeepAliveProps, TransitionProps } from 'vue'
 import { ConfigSchema } from '../../schema/config'
 import type { UserConfig as ViteUserConfig } from 'vite'
 import type { Options as VuePluginOptions } from '@vitejs/plugin-vue'
-import { MetaObject } from './meta'
+import type { MetaObject } from './meta'
 
 type DeepPartial<T> = T extends Function ? T : T extends Record<string, any> ? { [P in keyof T]?: DeepPartial<T[P]> } : T
 
@@ -67,6 +67,7 @@ export interface RuntimeConfig extends PrivateRuntimeConfig, RuntimeConfigNamesp
 export interface AppConfigInput extends Record<string, any> {
   /** @deprecated reserved */
   private?: never
+  /** @deprecated reserved */
   nuxt?: never
   /** @deprecated reserved */
   nitro?: never

From b3bd9f7285075a1a2c1fbad2d17dd17dbc11053d Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:34:46 +0100
Subject: [PATCH 11/15] refactor: rename to _nuxt

---
 packages/nuxt/src/app/components/layout.ts | 2 +-
 packages/nuxt/src/head/runtime/plugin.ts   | 2 +-
 packages/nuxt/src/pages/runtime/page.ts    | 4 ++--
 packages/schema/src/types/config.ts        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index a841f55572b..16f92dd9b6a 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -24,7 +24,7 @@ export default defineComponent({
       }
 
       // We avoid rendering layout transition if there is no layout to render
-      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig.nuxt.layoutTransition),
+      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig._nuxt.layoutTransition),
         _wrapIf(layouts[layout], hasLayout, context.slots)
       ).default()
     }
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index b0dbbc1d899..6fba909a0e8 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -26,7 +26,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...useAppConfig().nuxt.head }))
+  useHead(markRaw({ title: '', ...useAppConfig()._nuxt.head }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index 5f2a7b2fc28..8d345d680e6 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -36,8 +36,8 @@ export default defineComponent({
 
           const key = generateRouteKey(props.pageKey, routeProps)
 
-          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig.nuxt.pageTransition,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig.nuxt.keepalive, isNested && nuxtApp.isHydrating
+          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig._nuxt.pageTransition,
+            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig._nuxt.keepalive, isNested && nuxtApp.isHydrating
               // Include route children in parent suspense
               ? h(Component, { key, routeProps, pageKey: key } as {})
               : h(Suspense, {
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index 9a4ca08982f..dafec84f072 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -81,5 +81,5 @@ export interface NuxtAppConfig {
 }
 
 export interface AppConfig {
-  nuxt: NuxtAppConfig
+  _nuxt: NuxtAppConfig
 }

From 670b94954b7a328d6986cbb4f75607c2e165b997 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:48:48 +0100
Subject: [PATCH 12/15] test: update fixture

---
 test/basic.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index 0d1a1b67426..bc259e80cee 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -471,7 +471,7 @@ describe('app config', () => {
     const html = await $fetch('/app-config')
 
     const expectedAppConfig = {
-      nuxt: {
+      _nuxt: {
         head: { meta: [], link: [], style: [], script: [], noscript: [], charset: 'utf-8', viewport: 'width=1024, initial-scale=1' },
         layoutTransition: { name: 'layout', mode: 'out-in' },
         pageTransition: { name: 'page', mode: 'out-in' },

From 3a47df8f7a0796db8102acaebac22f244dce9ded Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Mon, 22 Aug 2022 17:54:09 +0100
Subject: [PATCH 13/15] =?UTF-8?q?fix:=20=F0=9F=99=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nuxt/src/core/templates.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index b79ed6b611a..e4827a53001 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -211,7 +211,7 @@ import defu from 'defu'
 
 const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
 const nuxtConfig = {
-  nuxt: ${JSON.stringify({ ...nuxt.options.app, ...Object.fromEntries(nuxtKeysToOmit.map(k => [k])) }, null, 2)},
+  _nuxt: ${JSON.stringify({ ...nuxt.options.app, ...Object.fromEntries(nuxtKeysToOmit.map(k => [k])) }, null, 2)},
 }
 
 ${app.configs.map((id: string, index: number) => `import ${`cfg${index}`} from ${JSON.stringify(id)}`).join('\n')}

From 7e6486900e55c2503bc91f6b302e4c8e9a905811 Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 23 Aug 2022 12:56:31 +0100
Subject: [PATCH 14/15] refactor: use `nuxt.config.mjs` to serialize nuxt app
 options

---
 packages/nuxt/src/app/components/layout.ts |  7 +--
 packages/nuxt/src/core/templates.ts        | 15 ++++--
 packages/nuxt/src/head/runtime/plugin.ts   |  6 ++-
 packages/nuxt/src/pages/runtime/page.ts    | 53 ++++++----------------
 packages/schema/src/types/config.ts        |  4 +-
 5 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/packages/nuxt/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts
index 16f92dd9b6a..bb6deee4ccb 100644
--- a/packages/nuxt/src/app/components/layout.ts
+++ b/packages/nuxt/src/app/components/layout.ts
@@ -1,8 +1,10 @@
 import { defineComponent, isRef, Ref, Transition } from 'vue'
 import { _wrapIf } from './utils'
-import { useAppConfig, useRoute } from '#app'
+import { useRoute } from '#app'
 // @ts-ignore
 import layouts from '#build/layouts'
+// @ts-ignore
+import { appLayoutTransition as defaultLayoutTransition } from '#build/nuxt.config.mjs'
 
 export default defineComponent({
   props: {
@@ -13,7 +15,6 @@ export default defineComponent({
   },
   setup (props, context) {
     const route = useRoute()
-    const appConfig = useAppConfig()
 
     return () => {
       const layout = (isRef(props.name) ? props.name.value : props.name) ?? route.meta.layout as string ?? 'default'
@@ -24,7 +25,7 @@ export default defineComponent({
       }
 
       // We avoid rendering layout transition if there is no layout to render
-      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? appConfig._nuxt.layoutTransition),
+      return _wrapIf(Transition, hasLayout && (route.meta.layoutTransition ?? defaultLayoutTransition),
         _wrapIf(layouts[layout], hasLayout, context.slots)
       ).default()
     }
diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index e4827a53001..d4c423a1344 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -5,6 +5,7 @@ import { isAbsolute, join, relative } from 'pathe'
 import { resolveSchema, generateTypes } from 'untyped'
 import escapeRE from 'escape-string-regexp'
 import { hash } from 'ohash'
+import { camelCase } from 'scule'
 
 export interface TemplateContext {
   nuxt: Nuxt
@@ -205,17 +206,13 @@ export const appConfigTemplate: NuxtTemplate = {
   filename: 'app.config.mjs',
   write: true,
   getContents: ({ app, nuxt }) => {
-    const nuxtKeysToOmit = ['baseURL', 'buildAssetsDir', 'assetsPath', 'cdnURL']
     return `
 import defu from 'defu'
 
 const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
-const nuxtConfig = {
-  _nuxt: ${JSON.stringify({ ...nuxt.options.app, ...Object.fromEntries(nuxtKeysToOmit.map(k => [k])) }, null, 2)},
-}
 
 ${app.configs.map((id: string, index: number) => `import ${`cfg${index}`} from ${JSON.stringify(id)}`).join('\n')}
-export default defu(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig', 'nuxtConfig']).join(', ')})
+export default defu(${app.configs.map((_id: string, index: number) => `cfg${index}`).concat(['inlineConfig']).join(', ')})
 `
   }
 }
@@ -246,3 +243,11 @@ export const publicPathTemplate: NuxtTemplate = {
     ].filter(Boolean).join('\n')
   }
 }
+
+// Allow direct access to specific exposed nuxt.config
+export const nuxtConfigTemplate = {
+  filename: 'nuxt.config.mjs',
+  getContents: (ctx: TemplateContext) => {
+    return Object.entries(ctx.nuxt.options.app).map(([k, v]) => `export const ${camelCase('app-' + k)} = ${JSON.stringify(v)}`).join('\n\n')
+  }
+}
diff --git a/packages/nuxt/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts
index 6fba909a0e8..7d945fc7355 100644
--- a/packages/nuxt/src/head/runtime/plugin.ts
+++ b/packages/nuxt/src/head/runtime/plugin.ts
@@ -1,7 +1,9 @@
 import { computed, getCurrentInstance, markRaw } from 'vue'
 import * as Components from './components'
 import { useHead } from './composables'
-import { defineNuxtPlugin, useAppConfig, useNuxtApp } from '#app'
+import { defineNuxtPlugin, useNuxtApp } from '#app'
+// @ts-ignore
+import { appHead } from '#build/nuxt.config.mjs'
 
 type MetaComponents = typeof Components
 declare module 'vue' {
@@ -26,7 +28,7 @@ const metaMixin = {
 }
 
 export default defineNuxtPlugin((nuxtApp) => {
-  useHead(markRaw({ title: '', ...useAppConfig()._nuxt.head }))
+  useHead(markRaw({ title: '', ...appHead }))
 
   nuxtApp.vueApp.mixin(metaMixin)
 
diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts
index 8d345d680e6..7667dc94c3a 100644
--- a/packages/nuxt/src/pages/runtime/page.ts
+++ b/packages/nuxt/src/pages/runtime/page.ts
@@ -1,9 +1,11 @@
-import { computed, DefineComponent, defineComponent, h, inject, provide, reactive, Suspense, Transition } from 'vue'
-import { RouteLocation, RouteLocationNormalized, RouteLocationNormalizedLoaded, RouterView } from 'vue-router'
+import { DefineComponent, defineComponent, h, inject, provide, Suspense, Transition } from 'vue'
+import { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouterView } from 'vue-router'
 
 import { generateRouteKey, RouterViewSlotProps, wrapInKeepAlive } from './utils'
-import { useAppConfig, useNuxtApp } from '#app'
+import { useNuxtApp } from '#app'
 import { _wrapIf } from '#app/components/utils'
+// @ts-ignore
+import { appPageTransition as defaultPageTransition, appKeepalive as defaultKeepaliveConfig } from '#build/nuxt.config.mjs'
 
 const isNestedKey = Symbol('isNested')
 
@@ -24,28 +26,23 @@ export default defineComponent({
   },
   setup (props, { attrs }) {
     const nuxtApp = useNuxtApp()
-    const appConfig = useAppConfig()
 
     const isNested = inject(isNestedKey, false)
     provide(isNestedKey, true)
 
     return () => {
       return h(RouterView, { name: props.name, route: props.route, ...attrs }, {
-        default: (routeProps: RouterViewSlotProps) => {
-          if (!routeProps.Component) { return }
-
-          const key = generateRouteKey(props.pageKey, routeProps)
-
-          return _wrapIf(Transition, routeProps.route.meta.pageTransition ?? appConfig._nuxt.pageTransition,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? appConfig._nuxt.keepalive, isNested && nuxtApp.isHydrating
-              // Include route children in parent suspense
-              ? h(Component, { key, routeProps, pageKey: key } as {})
-              : h(Suspense, {
-                onPending: () => nuxtApp.callHook('page:start', routeProps.Component),
-                onResolve: () => nuxtApp.callHook('page:finish', routeProps.Component)
-              }, { default: () => h(Component, { key, routeProps, pageKey: key } as {}) })
+        default: (routeProps: RouterViewSlotProps) => routeProps.Component &&
+          _wrapIf(Transition, routeProps.route.meta.pageTransition ?? defaultPageTransition,
+            wrapInKeepAlive(routeProps.route.meta.keepalive ?? defaultKeepaliveConfig,
+              isNested && nuxtApp.isHydrating
+                // Include route children in parent suspense
+                ? h(routeProps.Component, { key: generateRouteKey(props.pageKey, routeProps) } as {})
+                : h(Suspense, {
+                  onPending: () => nuxtApp.callHook('page:start', routeProps.Component),
+                  onResolve: () => nuxtApp.callHook('page:finish', routeProps.Component)
+                }, { default: () => h(routeProps.Component, { key: generateRouteKey(props.pageKey, routeProps) } as {}) })
             )).default()
-        }
       })
     }
   }
@@ -55,23 +52,3 @@ export default defineComponent({
   pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string)
   [key: string]: any
 }>
-
-const Component = defineComponent({
-  // TODO: Type props
-  // eslint-disable-next-line vue/require-prop-types
-  props: ['routeProps', 'pageKey'],
-  setup (props) {
-    // Prevent reactivity when the page will be rerendered in a different suspense fork
-    const previousKey = props.pageKey
-    const previousRoute = props.routeProps.route
-
-    // Provide a reactive route within the page
-    const route = {} as RouteLocation
-    for (const key in props.routeProps.route) {
-      (route as any)[key] = computed(() => previousKey === props.pageKey ? props.routeProps.route[key] : previousRoute[key])
-    }
-
-    provide('_route', reactive(route))
-    return () => h(props.routeProps.Component)
-  }
-})
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index dafec84f072..3fda92c80c4 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -80,6 +80,4 @@ export interface NuxtAppConfig {
   keepalive: boolean | KeepAliveProps
 }
 
-export interface AppConfig {
-  _nuxt: NuxtAppConfig
-}
+export interface AppConfig { }

From a414fcd4765f7cd816337908bc95ea81ec244eea Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Tue, 23 Aug 2022 13:06:34 +0100
Subject: [PATCH 15/15] test: update config

---
 test/basic.test.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/basic.test.ts b/test/basic.test.ts
index a398e272cfb..cee7e7c7e82 100644
--- a/test/basic.test.ts
+++ b/test/basic.test.ts
@@ -494,12 +494,6 @@ describe('app config', () => {
     const html = await $fetch('/app-config')
 
     const expectedAppConfig = {
-      _nuxt: {
-        head: { meta: [], link: [], style: [], script: [], noscript: [], charset: 'utf-8', viewport: 'width=1024, initial-scale=1' },
-        layoutTransition: { name: 'layout', mode: 'out-in' },
-        pageTransition: { name: 'page', mode: 'out-in' },
-        keepalive: false
-      },
       fromNuxtConfig: true,
       nested: {
         val: 2