Merge branch 'main' into docs/getting-started/routing

package.json

@@ -50,7 +50,7 @@
     "@actions/core": "^1.9.1",
     "@nuxtjs/eslint-config-typescript": "^11.0.0",
     "@types/crawler": "^1.2.2",
-    "@types/node": "^16.11.58",
+    "@types/node": "^16.11.59",
     "@types/rimraf": "^3",
     "@unocss/reset": "^0.45.21",
     "case-police": "^0.5.10",

packages/kit/src/loader/config.ts

@@ -7,6 +7,7 @@ import { NuxtConfigSchema } from '@nuxt/schema'
 export interface LoadNuxtConfigOptions extends LoadConfigOptions<NuxtConfig> {}
 
 export async function loadNuxtConfig (opts: LoadNuxtConfigOptions): Promise<NuxtOptions> {
+  (globalThis as any).defineNuxtConfig = (c: any) => c
   const result = await loadConfig<NuxtConfig>({
     name: 'nuxt',
     configFile: 'nuxt.config',
@@ -16,6 +17,7 @@ export async function loadNuxtConfig (opts: LoadNuxtConfigOptions): Promise<Nuxt
     globalRc: true,
     ...opts
   })
+  delete (globalThis as any).defineNuxtConfig
   const { configFile, layers = [], cwd } = result
   const nuxtConfig = result.config!
 

packages/nuxi/package.json

@@ -34,7 +34,7 @@
     "destr": "^1.1.1",
     "execa": "^6.1.0",
     "flat": "^5.0.2",
-    "giget": "^0.1.5",
+    "giget": "^0.1.6",
     "jiti": "^1.15.0",
     "listhen": "^0.2.15",
     "mlly": "^0.5.14",

packages/nuxt/config.cjs

@@ -0,0 +1,7 @@
+function defineNuxtConfig (config) {
+  return config
+}
+
+module.exports = {
+  defineNuxtConfig
+}

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

packages/nuxt/config.mjs

@@ -0,0 +1,5 @@
+function defineNuxtConfig (config) {
+  return config
+}
+
+export { defineNuxtConfig }

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"

packages/nuxt/src/app/plugins/payload.client.ts

@@ -2,7 +2,7 @@ import { defineNuxtPlugin, loadPayload, addRouteMiddleware, isPrerendered } from
 
 export default defineNuxtPlugin((nuxtApp) => {
   // Only enable behavior if initial page is prerendered
-  // TOOD: Support hybrid
+  // TOOD: Support hybrid and dev
   if (!isPrerendered()) {
     return
   }

packages/nuxt/src/core/nuxt.ts

@@ -174,7 +174,9 @@ async function initNuxt (nuxt: Nuxt) {
   })
 
   // Add prerender payload support
-  addPlugin(resolve(nuxt.options.appDir, 'plugins/payload.client'))
+  if (!nuxt.options.dev) {
+    addPlugin(resolve(nuxt.options.appDir, 'plugins/payload.client'))
+  }
 
   // Track components used to render for webpack
   if (nuxt.options.builder === '@nuxt/webpack-builder') {
@@ -234,9 +236,11 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
   return nuxt
 }
 
+/** @deprecated `defineNuxtConfig` is auto imported. Remove import or alternatively use `import { defineNuxtConfig } from  'nuxt/config'`. */
 export function defineNuxtConfig (config: NuxtConfig): NuxtConfig {
   return config
 }
 
-// For a convenience import together with `defineNuxtConfig`
-export type { NuxtConfig }
+/** @deprecated Use `import type { NuxtConfig } from  'nuxt/config'`.  */
+type _NuxtConfig = NuxtConfig
+export type { _NuxtConfig as NuxtConfig }

packages/nuxt/src/pages/runtime/page.ts

@@ -1,4 +1,4 @@
-import { computed, defineComponent, h, inject, provide, reactive, onMounted, nextTick, Suspense, Transition } from 'vue'
+import { computed, defineComponent, h, inject, provide, reactive, onMounted, nextTick, Suspense, Transition, KeepAliveProps, TransitionProps } from 'vue'
 import type { DefineComponent, VNode } from 'vue'
 import { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouterView } from 'vue-router'
 import type { RouteLocation } from 'vue-router'
@@ -18,6 +18,14 @@ export default defineComponent({
     name: {
       type: String
     },
+    transition: {
+      type: [Boolean, Object] as any as () => boolean | TransitionProps,
+      default: undefined
+    },
+    keepalive: {
+      type: [Boolean, Object] as any as () => boolean | KeepAliveProps,
+      default: undefined
+    },
     route: {
       type: Object as () => RouteLocationNormalized
     },
@@ -38,10 +46,10 @@ export default defineComponent({
           if (!routeProps.Component) { return }
 
           const key = generateRouteKey(props.pageKey, routeProps)
-          const transitionProps = routeProps.route.meta.pageTransition ?? defaultPageTransition
+          const transitionProps = props.transition ?? routeProps.route.meta.pageTransition ?? (defaultPageTransition as TransitionProps)
 
           return _wrapIf(Transition, transitionProps,
-            wrapInKeepAlive(routeProps.route.meta.keepalive ?? defaultKeepaliveConfig, isNested && nuxtApp.isHydrating
+            wrapInKeepAlive(props.keepalive ?? routeProps.route.meta.keepalive ?? (defaultKeepaliveConfig as KeepAliveProps), isNested && nuxtApp.isHydrating
               // Include route children in parent suspense
               ? h(Component, { key, routeProps, pageKey: key, hasTransition: !!transitionProps } as {})
               : h(Suspense, {

packages/nuxt/types.d.ts

@@ -1,2 +1,6 @@
 /// <reference types="nitropack" />
 export * from './dist/index'
+
+declare global {
+  const defineNuxtConfig: typeof import('nuxt/config')['defineNuxtConfig']
+}

packages/schema/src/config/experimental.ts

@@ -26,7 +26,7 @@ export default defineUntypedSchema({
      * Tree shakes contents of client-only components from server bundle.
      * @see https://github.com/nuxt/framework/pull/5750
      */
-    treeshakeClientOnly: false,
+    treeshakeClientOnly: true,
 
     /**
      * Use vite-node for on-demand server chunk loading

playground/nuxt.config.ts

@@ -1,3 +1,3 @@
-import { defineNuxtConfig } from 'nuxt'
+export default defineNuxtConfig({
 
-export default defineNuxtConfig({})
+})

yarn.lock

@@ -2595,10 +2595,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^16.11.58":
-  version: 16.11.58
-  resolution: "@types/node@npm:16.11.58"
-  checksum: efdf14c62e6c1a8e758416aaa3ae4b81015ffd4e1f31c05680d1242817ba23f0b4b1345886fe5aeb3c05d818bcaed1a7af4d637e7cca5723a5e4ac8b759d3ace
+"@types/node@npm:^16.11.59":
+  version: 16.11.59
+  resolution: "@types/node@npm:16.11.59"
+  checksum: b3a2986ef8f8216bb7fd1187dcf2e69aca3e6b6b5fdfd6abf4cf11c44e3cdd587fae875a28dc4ef257e2b369e2c5290642aff6a0a9d702f3385a78f561293259
   languageName: node
   linkType: hard
 
@@ -7776,18 +7776,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"giget@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "giget@npm:0.1.5"
+"giget@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "giget@npm:0.1.6"
   dependencies:
     colorette: ^2.0.19
+    defu: ^6.1.0
     mri: ^1.2.0
     node-fetch-native: ^0.1.4
     pathe: ^0.3.7
     tar: ^6.1.11
   bin:
     giget: dist/cli.mjs
-  checksum: 3f9e50f3bd4f9109c7cb511427449daa66c54f466a7e3169bd2475984b60b83e5e840dc35b71373ee137be22458ad1a31564fa2f99e9fc50ec760849d4d30e62
+  checksum: d41a8cb2eb794a1910672663d4319a20a799135149d48e15dc35d3ab18e87910df5344c140fcc1018a4672f14c8312d8068c30577b17cbde7a48fe554c64e96a
   languageName: node
   linkType: hard
 
@@ -10646,7 +10647,7 @@ __metadata:
     execa: ^6.1.0
     flat: ^5.0.2
     fsevents: ~2.3.2
-    giget: ^0.1.5
+    giget: ^0.1.6
     jiti: ^1.15.0
     listhen: ^0.2.15
     mlly: ^0.5.14
@@ -10672,7 +10673,7 @@ __metadata:
     "@actions/core": ^1.9.1
     "@nuxtjs/eslint-config-typescript": ^11.0.0
     "@types/crawler": ^1.2.2
-    "@types/node": ^16.11.58
+    "@types/node": ^16.11.59
     "@types/rimraf": ^3
     "@unocss/reset": ^0.45.21
     case-police: ^0.5.10