@depup/nuxt 4.2.2-depup.0 → 4.3.0-depup.0

package/dist/pages/runtime/composables.d.ts

@@ -2,6 +2,9 @@ import type { KeepAliveProps, TransitionProps, UnwrapRef } from 'vue';
 import type { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouteRecordRaw, RouteRecordRedirectOption } from 'vue-router';
 import type { NitroRouteConfig } from 'nitropack/types';
 import type { NuxtError } from 'nuxt/app';
+import type { SerializableValue } from './utils.js';
+export interface NuxtLayouts {
+}
 export interface PageMeta {
     [key: string]: unknown;
     /**
@@ -9,7 +12,7 @@ export interface PageMeta {
      *
      * Return true if it is valid, or false if not. If another match can't be found,
      * this will mean a 404. You can also directly return an object with
-     * statusCode/statusMessage to respond immediately with an error (other matches
+     * status/statusText to respond immediately with an error (other matches
      * will not be checked).
      */
     validate?: (route: RouteLocationNormalized) => boolean | Partial<NuxtError> | Promise<boolean | Partial<NuxtError>>;
@@ -33,6 +36,8 @@ export interface PageMeta {
     name?: string;
     /** You may define a path matcher, if you have a more complex pattern than can be expressed with the file name. */
     path?: string;
+    /** Route groups based on the file path, like `/(protected)/users/profile` -> ['protected'] */
+    groups?: string[];
     /**
      * Allows accessing the route `params` as props passed to the page component.
      * @see https://router.vuejs.org/guide/essentials/passing-props
@@ -43,6 +48,10 @@ export interface PageMeta {
 }
 declare module 'vue-router' {
     interface RouteMeta extends UnwrapRef<PageMeta> {
+        /**
+         * @internal
+         */
+        layoutProps?: Record<string, SerializableValue>;
     }
 }
 export declare const definePageMeta: (meta: PageMeta) => void;

package/dist/pages/runtime/index.d.ts

@@ -1,3 +1,3 @@
 export { definePageMeta, defineRouteRules } from './composables.js';
-export type { PageMeta } from './composables.js';
+export type { PageMeta, NuxtLayouts } from './composables.js';
 export type { NuxtPageProps } from './page.js';

package/dist/pages/runtime/page.js

@@ -41,6 +41,8 @@ export default defineComponent({
     const _layoutMeta = inject(LayoutMetaSymbol, null);
     let vnode;
     const done = nuxtApp.deferHydration();
+    let isSuspensePending = false;
+    let suspenseKey = 0;
     if (import.meta.client && nuxtApp.isHydrating) {
       const removeErrorHook = nuxtApp.hooks.hookOnce("app:error", done);
       useRouter().beforeEach(removeErrorHook);
@@ -99,10 +101,15 @@ export default defineComponent({
           const willRenderAnotherChild = hasChildrenRoutes(forkRoute, routeProps.route, routeProps.Component);
           if (!nuxtApp.isHydrating && previousPageKey === key && !willRenderAnotherChild) {
             nextTick(() => {
-              pageLoadingEndHookAlreadyCalled = true;
-              nuxtApp.callHook("page:loading:end");
+              if (!pageLoadingEndHookAlreadyCalled) {
+                pageLoadingEndHookAlreadyCalled = true;
+                nuxtApp.callHook("page:loading:end");
+              }
             });
           }
+          if (isSuspensePending && previousPageKey !== key) {
+            suspenseKey++;
+          }
           previousPageKey = key;
           const hasTransition = !!(props.transition ?? routeProps.route.meta.pageTransition ?? defaultPageTransition);
           const transitionProps = hasTransition && _mergeTransitionProps([
@@ -122,16 +129,19 @@ export default defineComponent({
             wrapInKeepAlive(
               keepaliveConfig,
               h(Suspense, {
+                key: suspenseKey,
                 suspensible: true,
                 onPending: () => {
+                  isSuspensePending = true;
                   if (hasTransition) {
                     nuxtApp._runningTransition = true;
                   }
                   nuxtApp.callHook("page:start", routeProps.Component);
                 },
                 onResolve: async () => {
-                  await nextTick();
+                  isSuspensePending = false;
                   try {
+                    await nextTick();
                     nuxtApp._route.sync?.();
                     await nuxtApp.callHook("page:finish", routeProps.Component);
                     delete nuxtApp._runningTransition;

package/dist/pages/runtime/plugins/prerender.server.js

@@ -1,13 +1,12 @@
 import { joinURL } from "ufo";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import defu from "defu";
-import { defineNuxtPlugin, useRuntimeConfig } from "#app/nuxt";
+import { defineNuxtPlugin } from "#app/nuxt";
 import { prerenderRoutes } from "#app/composables/ssr";
 import _routes from "#build/routes";
-import routerOptions, { hashMode } from "#build/router.options";
+import routerOptions, { hashMode } from "#build/router.options.mjs";
 import { crawlLinks } from "#build/nuxt.config.mjs";
+import _routeRulesMatcher from "#build/route-rules.mjs";
+const routeRulesMatcher = _routeRulesMatcher;
 let routes;
-let _routeRulesMatcher = void 0;
 export default defineNuxtPlugin(async () => {
   if (!import.meta.server || !import.meta.prerender || hashMode) {
     return;
@@ -15,17 +14,13 @@ export default defineNuxtPlugin(async () => {
   if (routes && !routes.length) {
     return;
   }
-  const routeRules = useRuntimeConfig().nitro.routeRules;
-  if (!crawlLinks && routeRules && Object.values(routeRules).some((r) => r.prerender)) {
-    _routeRulesMatcher = toRouteMatcher(createRadixRouter({ routes: routeRules }));
-  }
   routes ||= Array.from(processRoutes(await routerOptions.routes?.(_routes) ?? _routes));
   const batch = routes.splice(0, 10);
   prerenderRoutes(batch);
 });
 const OPTIONAL_PARAM_RE = /^\/?:.*(?:\?|\(\.\*\)\*)$/;
 function shouldPrerender(path) {
-  return !_routeRulesMatcher || defu({}, ..._routeRulesMatcher.matchAll(path).reverse()).prerender;
+  return crawlLinks || !!routeRulesMatcher(path).prerender;
 }
 function processRoutes(routes2, currentPath = "/", routesToPrerender = /* @__PURE__ */ new Set()) {
   for (const route of routes2) {

package/dist/pages/runtime/plugins/router.js

@@ -1,14 +1,13 @@
 import { isReadonly, reactive, shallowReactive, shallowRef } from "vue";
 import { START_LOCATION, createMemoryHistory, createRouter, createWebHashHistory, createWebHistory } from "vue-router";
-import { isSamePath, withoutBase } from "ufo";
+import { decodePath, isSamePath, withoutBase } from "ufo";
 import { toArray } from "../utils.js";
 import { getRouteRules } from "#app/composables/manifest";
 import { defineNuxtPlugin, useRuntimeConfig } from "#app/nuxt";
 import { clearError, createError, isNuxtError, showError, useError } from "#app/composables/error";
 import { navigateTo } from "#app/composables/router";
-import { appManifest as isAppManifestEnabled } from "#build/nuxt.config.mjs";
 import _routes, { handleHotUpdate } from "#build/routes";
-import routerOptions, { hashMode } from "#build/router.options";
+import routerOptions, { hashMode } from "#build/router.options.mjs";
 import { globalMiddleware, namedMiddleware } from "#build/middleware";
 function createCurrentLocation(base, location, renderedPath) {
   const { pathname, search, hash } = location;
@@ -19,9 +18,9 @@ function createCurrentLocation(base, location, renderedPath) {
     if (pathFromHash[0] !== "/") {
       pathFromHash = "/" + pathFromHash;
     }
-    return withoutBase(pathFromHash, "");
+    return decodePath(withoutBase(pathFromHash, ""));
   }
-  const displayedPath = withoutBase(pathname, base);
+  const displayedPath = decodePath(withoutBase(pathname, base));
   const path = !renderedPath || isSamePath(displayedPath, renderedPath) ? displayedPath : renderedPath;
   return path + (path.includes("?") ? "" : search) + hash;
 }
@@ -143,15 +142,13 @@ const plugin = defineNuxtPlugin({
             middlewareEntries.add(entry);
           }
         }
-        if (isAppManifestEnabled) {
-          const routeRules = await nuxtApp.runWithContext(() => getRouteRules({ path: to.path }));
-          if (routeRules.appMiddleware) {
-            for (const key in routeRules.appMiddleware) {
-              if (routeRules.appMiddleware[key]) {
-                middlewareEntries.add(key);
-              } else {
-                middlewareEntries.delete(key);
-              }
+        const routeRules = getRouteRules({ path: to.path });
+        if (routeRules.appMiddleware) {
+          for (const key in routeRules.appMiddleware) {
+            if (routeRules.appMiddleware[key]) {
+              middlewareEntries.add(key);
+            } else {
+              middlewareEntries.delete(key);
             }
           }
         }
@@ -171,8 +168,8 @@ const plugin = defineNuxtPlugin({
             if (import.meta.server || !nuxtApp.payload.serverRendered && nuxtApp.isHydrating) {
               if (result === false || result instanceof Error) {
                 const error2 = result || createError({
-                  statusCode: 404,
-                  statusMessage: `Page Not Found: ${initialURL}`
+                  status: 404,
+                  statusText: `Page Not Found: ${initialURL}`
                 });
                 await nuxtApp.runWithContext(() => showError(error2));
                 return false;
@@ -207,9 +204,9 @@ const plugin = defineNuxtPlugin({
     router.afterEach((to) => {
       if (to.matched.length === 0) {
         return nuxtApp.runWithContext(() => showError(createError({
-          statusCode: 404,
+          status: 404,
           fatal: false,
-          statusMessage: `Page not found: ${to.fullPath}`,
+          statusText: `Page not found: ${to.fullPath}`,
           data: {
             path: to.fullPath
           }

package/dist/pages/runtime/utils.d.ts

@@ -2,6 +2,13 @@ import type { RouteLocationNormalizedLoaded, RouterView } from 'vue-router';
 type InstanceOf<T> = T extends new (...args: any[]) => infer R ? R : never;
 type RouterViewSlot = Exclude<InstanceOf<typeof RouterView>['$slots']['default'], undefined>;
 export type RouterViewSlotProps = Parameters<RouterViewSlot>[0];
+type SerializablePrimitive = string | number | boolean | null | undefined;
+/** JSON-serializable value (non-recursive definition to avoid excessive type depth) */
+export type SerializableValue = SerializablePrimitive | SerializablePrimitive[] | Record<string, unknown>;
+/** Constrains T to only contain serializable properties. Non-serializable properties become `never`. */
+export type MakeSerializableObject<T> = T extends Function | symbol ? never : {
+    [K in keyof T]: T[K] extends SerializablePrimitive ? T[K] : T[K] extends (infer U)[] ? U extends SerializablePrimitive ? T[K] : never : T[K] extends Record<string, unknown> ? T[K] : never;
+};
 export declare const generateRouteKey: (routeProps: RouterViewSlotProps, override?: string | ((route: RouteLocationNormalizedLoaded) => string)) => string | false | undefined;
 export declare const wrapInKeepAlive: (props: any, children: any) => {
     default: () => any;

package/dist/pages/runtime/validate.js

@@ -10,8 +10,10 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
   }
   const error = createError({
     fatal: import.meta.client,
-    statusCode: result && result.statusCode || 404,
-    statusMessage: result && result.statusMessage || `Page Not Found: ${to.fullPath}`,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    status: result && (result.status || result.statusCode) || 404,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    statusText: result && (result.statusText || result.statusMessage) || `Page Not Found: ${to.fullPath}`,
     data: {
       path: to.fullPath
     }

package/meta.d.ts

@@ -0,0 +1 @@
+export const runtimeDependencies: string[]

package/meta.js

@@ -0,0 +1,18 @@
+export const runtimeDependencies = [
+  // other deps
+  'devalue',
+  'klona',
+  // unjs ecosystem
+  'defu',
+  'ufo',
+  'h3',
+  'destr',
+  'consola',
+  'hookable',
+  'unctx',
+  'cookie-es',
+  'perfect-debounce',
+  'ohash',
+  'pathe',
+  'uncrypto',
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depup/nuxt",
-  "version": "4.2.2-depup.0",
+  "version": "4.3.0-depup.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -25,33 +25,16 @@
       "import": "./config.js",
       "require": "./config.cjs"
     },
-    "./schema": {
-      "types": "./schema.d.ts",
-      "import": "./schema.js"
-    },
-    "./kit": {
-      "types": "./kit.d.ts",
-      "import": "./kit.js"
-    },
-    "./app": {
-      "types": "./dist/app/index.d.ts",
-      "import": "./dist/app/index.js"
-    },
+    "./schema": "./schema.js",
+    "./kit": "./kit.js",
+    "./meta": "./meta.js",
+    "./app": "./dist/app/index.js",
     "./package.json": "./package.json"
   },
   "imports": {
-    "#app": {
-      "types": "./dist/app/index.d.ts",
-      "import": "./dist/app/index.js"
-    },
-    "#app/nuxt": {
-      "types": "./dist/app/nuxt.d.ts",
-      "import": "./dist/app/nuxt.js"
-    },
-    "#unhead/composables": {
-      "types": "./dist/head/runtime/composables.d.ts",
-      "import": "./dist/head/runtime/composables.js"
-    }
+    "#app": "./dist/app/index.js",
+    "#app/nuxt": "./dist/app/nuxt.js",
+    "#unhead/composables": "./dist/head/runtime/composables.js"
   },
   "files": [
     "app.d.ts",
@@ -61,6 +44,7 @@
     "dist",
     "config.*",
     "kit.*",
+    "meta.*",
     "schema.*"
   ],
   "dependencies": {
@@ -69,7 +53,7 @@
     "@nuxt/devtools": "^3.1.1",
     "@nuxt/telemetry": "^2.6.6",
     "@unhead/vue": "^2.1.2",
-    "@vue/shared": "^3.5.26",
+    "@vue/shared": "^3.5.27",
     "c12": "^3.3.3",
     "chokidar": "^5.0.0",
     "compatx": "^0.2.0",
@@ -77,11 +61,11 @@
     "cookie-es": "^2.0.0",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
-    "devalue": "^5.6.1",
+    "devalue": "^5.6.2",
     "errx": "^0.1.0",
     "escape-string-regexp": "^5.0.0",
     "exsolve": "^1.0.8",
-    "h3": "^2.0.1-rc.7",
+    "h3": "^2.0.1-rc.11",
     "hookable": "^6.0.1",
     "ignore": "^7.0.5",
     "impound": "^1.0.0",
@@ -91,47 +75,47 @@
     "magic-string": "^0.30.21",
     "mlly": "^1.8.0",
     "nanotar": "^0.2.0",
-    "nypm": "^0.6.2",
+    "nypm": "^0.6.4",
     "ofetch": "^1.5.1",
     "ohash": "^2.0.11",
     "on-change": "^6.0.1",
-    "oxc-minify": "^0.108.0",
-    "oxc-parser": "^0.108.0",
-    "oxc-transform": "^0.108.0",
-    "oxc-walker": "^0.6.0",
+    "oxc-minify": "^0.110.0",
+    "oxc-parser": "^0.110.0",
+    "oxc-transform": "^0.110.0",
+    "oxc-walker": "^0.7.0",
     "pathe": "^2.0.3",
-    "perfect-debounce": "^2.0.0",
+    "perfect-debounce": "^2.1.0",
     "pkg-types": "^2.3.0",
-    "radix3": "^1.1.2",
+    "rou3": "^0.7.12",
     "scule": "^1.3.0",
     "semver": "^7.7.3",
     "std-env": "^3.10.0",
     "tinyglobby": "^0.2.15",
-    "ufo": "^1.6.2",
+    "ufo": "^1.6.3",
     "ultrahtml": "^1.6.0",
     "uncrypto": "^0.1.3",
     "unctx": "^2.5.0",
     "unimport": "^5.6.0",
-    "unplugin": "^2.3.11",
+    "unplugin": "^3.0.0",
     "unplugin-vue-router": "^0.19.2",
     "untyped": "^2.0.0",
-    "vue": "^3.5.26",
+    "vue": "^3.5.27",
     "vue-router": "^4.6.4",
-    "@nuxt/kit": "4.2.2",
-    "@nuxt/nitro-server": "4.2.2",
-    "@nuxt/schema": "4.2.2",
-    "@nuxt/vite-builder": "4.2.2"
+    "@nuxt/kit": "4.3.0",
+    "@nuxt/nitro-server": "4.3.0",
+    "@nuxt/schema": "4.3.0",
+    "@nuxt/vite-builder": "4.3.0"
   },
   "devDependencies": {
-    "@nuxt/scripts": "^0.13.2",
-    "@parcel/watcher": "^2.5.4",
+    "@nuxt/scripts": "0.13.2",
+    "@parcel/watcher": "2.5.4",
     "@types/estree": "1.0.8",
-    "@vitejs/plugin-vue": "^6.0.3",
-    "@vitejs/plugin-vue-jsx": "^5.1.3",
-    "@vue/compiler-sfc": "^3.5.26",
+    "@vitejs/plugin-vue": "6.0.3",
+    "@vitejs/plugin-vue-jsx": "5.1.3",
+    "@vue/compiler-sfc": "3.5.27",
     "unbuild": "3.6.1",
-    "vite": "^7.3.1",
-    "vitest": "^4.0.17",
+    "vite": "7.3.1",
+    "vitest": "^4.0.18",
     "vue-bundle-renderer": "2.2.0",
     "vue-sfc-transformer": "0.1.17"
   },
@@ -151,6 +135,7 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "scripts": {
+    "build:stub": "unbuild --stub",
     "test:attw": "attw --pack"
   }
 }

package/types.d.ts

@@ -1,7 +1,7 @@
 import type { SchemaDefinition } from 'nuxt/schema'
 import type { DefineNuxtConfig } from 'nuxt/config'
 
-export * from './dist/index'
+export * from './dist/index.ts'
 
 declare global {
   const defineNuxtConfig: DefineNuxtConfig