@ubean/build 0.7.1 → 0.7.3

package/dist/codegen/index.d.ts

@@ -165,9 +165,10 @@ interface I18nTypesOptions {
 /** Convert a JSON message tree into a TypeScript object type body. */
 export declare function messagesToTsType(value: unknown, indent?: number): string;
 /**
- * Generate `.ubean/i18n.d.ts` augmenting vue-i18n `DefineLocaleMessage`
- * from the default locale JSON. Users can also hand-write the same
- * module augmentation if they prefer.
+ * Generate `.ubean/i18n.d.ts` augmenting vue-i18n `DefineLocaleMessage` from
+ * the default locale JSON, plus `GeneratedTypeConfig['locale']` from the
+ * scanned locale codes. The two halves are independent: message keys need a
+ * JSON source, the locale union only needs the locale files to exist.
  */
 export declare function generateI18nTypes(result: ScanResult, options: I18nTypesOptions): Promise<string | null>;
 //#endregion

package/dist/codegen/index.js

@@ -1 +1 @@
-export { d as BUILTIN_PRESETS, t as CODEGEN_CONTRACT_VERSION, n as CODEGEN_FILES, r as CODEGEN_NON_CONTRACT_FILES, p as HONO_OPENAPI_PRESET, m as UBEAN_CLIENT_PRESET, h as UBEAN_SERVER_PRESET, g as VUE_I18N_PRESET, _ as VUE_MACROS_PRESET, v as VUE_PRESET, y as VUE_ROUTER_PRESET, b as generateAutoImports, l as generateI18nTypes, x as generateImportsTransform, a as generateOpenApiTypes, o as generateOpenApiTypesFromServer, s as generatePageTypes, c as generateRouteTypes, i as generateTypes, S as getAutoImportPresets, C as getBuiltinComposables, w as getUbeanAutoImportConfig, T as getUbeanComponentsConfig, u as messagesToTsType, E as resolveAutoImportsConfig, D as resolveComponentsConfig, O as toArray } from "../codegen-Dw-uws16.js";
+export { d as BUILTIN_PRESETS, t as CODEGEN_CONTRACT_VERSION, n as CODEGEN_FILES, r as CODEGEN_NON_CONTRACT_FILES, p as HONO_OPENAPI_PRESET, m as UBEAN_CLIENT_PRESET, h as UBEAN_SERVER_PRESET, g as VUE_I18N_PRESET, _ as VUE_MACROS_PRESET, v as VUE_PRESET, y as VUE_ROUTER_PRESET, b as generateAutoImports, l as generateI18nTypes, x as generateImportsTransform, a as generateOpenApiTypes, o as generateOpenApiTypesFromServer, s as generatePageTypes, c as generateRouteTypes, i as generateTypes, S as getAutoImportPresets, C as getBuiltinComposables, w as getUbeanAutoImportConfig, T as getUbeanComponentsConfig, u as messagesToTsType, E as resolveAutoImportsConfig, D as resolveComponentsConfig, O as toArray } from "../codegen-DUQT79IR.js";

package/dist/{codegen-Dw-uws16.js → codegen-DUQT79IR.js}

@@ -753,34 +753,55 @@ function pickDefaultLocaleFile(locales, defaultLocale) {
 	return jsonFiles.find((l) => l.isDefault) || jsonFiles[0];
 }
 /**
-* Generate `.ubean/i18n.d.ts` augmenting vue-i18n `DefineLocaleMessage`
-* from the default locale JSON. Users can also hand-write the same
-* module augmentation if they prefer.
+* Locale codes scanned from `src/locales/` → vue-i18n `GeneratedTypeConfig`.
+*
+* `@intlify/core-base` derives `Locale = GeneratedLocale` from this interface
+* (`core-base.d.ts`: `Locale = IsNever<GeneratedLocale> extends true ? string : GeneratedLocale`),
+* so every `Composer.locale` / `createI18n({ locale })` surface narrows to the
+* union. Requires the leading `export {}` in the emitted file — without it the
+* `declare module` is not a module augmentation and silently does nothing.
+*/
+function localeUnionType(locales) {
+	const codes = [...new Set(locales.map((l) => l.code))];
+	if (codes.length === 0) return null;
+	return codes.map((c) => JSON.stringify(c)).join(" | ");
+}
+/**
+* Generate `.ubean/i18n.d.ts` augmenting vue-i18n `DefineLocaleMessage` from
+* the default locale JSON, plus `GeneratedTypeConfig['locale']` from the
+* scanned locale codes. The two halves are independent: message keys need a
+* JSON source, the locale union only needs the locale files to exist.
 */
 async function generateI18nTypes(result, options) {
 	const { outDir, fileName = "i18n.d.ts", defaultLocale } = options;
-	const source = pickDefaultLocaleFile(result.locales || [], defaultLocale);
-	if (!source) return null;
-	let raw;
-	try {
+	const locales = result.locales || [];
+	const localeUnion = localeUnionType(locales);
+	const source = pickDefaultLocaleFile(locales, defaultLocale);
+	let messages = null;
+	if (source) try {
 		const text = await readFile(source.fullPath, "utf8");
-		raw = JSON.parse(text);
+		messages = unwrapMessages(JSON.parse(text));
 	} catch {
-		return null;
+		messages = null;
 	}
-	const messages = unwrapMessages(raw);
-	if (!messages) return null;
-	const typeBody = messagesToTsType(messages, 2);
-	const contents = `// Auto-generated by ubean from ${source.relativePath} — do not edit manually
-// Typed \`t('key')\` via vue-i18n \`DefineLocaleMessage\`.
-// Override by adding your own \`declare module 'vue-i18n'\` in src/.
+	if (!messages && !localeUnion) return null;
+	const contents = `${`// Auto-generated by ubean ${source ? `from ${source.relativePath}` : "from scanned locale codes"} — do not edit manually
+// Typed \`t('key')\` via vue-i18n \`DefineLocaleMessage\` and \`Locale\` via
+// \`@intlify/core-base\` \`GeneratedTypeConfig\`.
+// Override by adding your own \`declare module\` in src/.
 /* eslint-disable */
 export {};
-
+`}${messages ? `
 declare module 'vue-i18n' {
-  export interface DefineLocaleMessage ${typeBody}
+  export interface DefineLocaleMessage ${messagesToTsType(messages, 2)}
+}
+` : ""}${localeUnion ? `
+declare module '@intlify/core-base' {
+  export interface GeneratedTypeConfig {
+    locale: ${localeUnion};
+  }
 }
-`;
+` : ""}`;
 	await mkdir(outDir, { recursive: true });
 	const outPath = join(outDir, fileName);
 	await writeFile(outPath, contents, "utf8");
@@ -882,6 +903,10 @@ async function generatePageTypes(result, options) {
 		"    pageMeta?: unknown;",
 		"    /** `definePage({ redirect })`。 */",
 		"    redirect?: string | null;",
+		"    /** 是否为框架内置路由（Root / NotFound）。宿主生成菜单时应过滤。 */",
+		"    isBuiltin?: boolean;",
+		"    /** 是否为全局捕获路由（`pages/404.vue`）。 */",
+		"    isGlobalCatchAll?: boolean;",
 		"  }",
 		"",
 		"  export interface LayoutInfo {",
@@ -984,7 +1009,7 @@ const CODEGEN_FILES = [
 		name: "i18n.d.ts",
 		module: "vue-i18n",
 		required: false,
-		types: ["DefineLocaleMessage"]
+		types: ["DefineLocaleMessage", "GeneratedTypeConfig"]
 	},
 	{
 		name: "auto-imports.d.ts",
@@ -1025,7 +1050,10 @@ async function generateTypes(result, options) {
 	generated.push(routeTypesPath);
 	const pageTypesPath = await generatePageTypes(result, { outDir });
 	generated.push(pageTypesPath);
-	const i18nTypesPath = await generateI18nTypes(result, { outDir });
+	const i18nTypesPath = await generateI18nTypes(result, {
+		outDir,
+		defaultLocale: result.defaultLocale
+	});
 	if (i18nTypesPath) generated.push(i18nTypesPath);
 	const envTypesPath = await generateEnvTypes({
 		outDir,

package/dist/index.d.ts

@@ -116,6 +116,8 @@ interface PagesModulePage extends CompiledPage {
   pageKind?: 'component' | 'reuse' | 'meta';
   pageMeta?: unknown;
   redirect?: string;
+  isBuiltin?: boolean;
+  isGlobalCatchAll?: boolean;
 }
 export declare function createRoutingVirtualModule(routes: CompiledRoute[], middlewares: CompiledMiddleware[], cwd: string): VirtualModule;
 export declare function createPagesVirtualModule(pages: PagesModulePage[], layouts: CompiledLayout[], cwd: string): VirtualModule;

package/dist/index.js

@@ -1,3 +1,3 @@
 import { _ as defineVirtualModule, a as ssrSingletonProdOptimizeExclude, b as useVirtualRegistry, c as getComponentResolvers, d as registerComponentResolver, f as registerCssImport, g as createVirtualRegistry, h as VirtualModuleRegistry, i as ssrSingletonDevPolicy, l as getCssImports, m as resetModuleRegistry, n as SSR_SINGLETON_OPTIMIZE_EXCLUDE, o as ssrSingletonProdSsr, p as registerHeadScript, r as SSR_SINGLETON_PACKAGES, t as SSR_SINGLETON_DEDUPE, u as getHeadScripts, v as defineVirtualModulePrefix, y as resetVirtualRegistry } from "./ssr-singleton-CUHZLgiO.js";
-import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, o as stripMacros, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-DXIIB-zM.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, o as stripMacros, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-AXf0lNb0.js";
 export { SSR_SINGLETON_DEDUPE, SSR_SINGLETON_OPTIMIZE_EXCLUDE, SSR_SINGLETON_PACKAGES, VirtualModuleRegistry, createAppVirtualModule, createLocalesVirtualModule, createMetaVirtualModule, createPagesVirtualModule, createRoutingVirtualModule, createVirtualRegistry, defineVirtualModule, defineVirtualModulePrefix, getComponentResolvers, getCssImports, getHeadScripts, registerComponentResolver, registerCssImport, registerHeadScript, resetModuleRegistry, resetVirtualRegistry, ssrSingletonDevPolicy, ssrSingletonProdOptimizeExclude, ssrSingletonProdSsr, stripMacros, transformMacros, useVirtualRegistry };

package/dist/prerender.js

@@ -77,6 +77,7 @@ function collectPrerenderRoutes(pages, options = {}) {
 	const allPageRoutes = [];
 	for (const page of pages) {
 		if (page.routable === false) continue;
+		if (page.isGlobalCatchAll) continue;
 		if (isRedirectPage(page)) {
 			redirectPaths.add(normalizePagePath(page.path));
 			continue;

package/dist/production.js

@@ -1 +1 @@
-export { T as buildWithEnvironments, v as createIslandsSsrStubPlugin, y as generateCloudflareWorkerEntry, b as generateNodeServerEntry, x as generateStandardHandlerEntry, S as generateVirtualModulesToDisk, C as getPresetBuildConfig, w as serializePagesForEntry } from "./vite-CGvlml0h.js";
+export { T as buildWithEnvironments, v as createIslandsSsrStubPlugin, y as generateCloudflareWorkerEntry, b as generateNodeServerEntry, x as generateStandardHandlerEntry, S as generateVirtualModulesToDisk, C as getPresetBuildConfig, w as serializePagesForEntry } from "./vite-Cwx2gAN6.js";

package/dist/static-render.js

@@ -203,7 +203,7 @@ async function createStaticSsgRenderer(cwd, manifest, init) {
 		return;
 	}
 	const renderStaticPage = mod.renderStaticPage;
-	const compiled = init.pages.map(compilePageRoute);
+	const compiled = init.pages.filter((p) => !p.isGlobalCatchAll).map(compilePageRoute);
 	const i18nEnabled = init.i18n != null && init.i18n.enabled !== false;
 	const localeCodes = i18nEnabled ? (init.i18n?.locales || []).map((l) => typeof l === "string" ? l : l.code) : [];
 	const strategy = i18nEnabled ? init.i18n?.strategy || "prefix_except_default" : "no_prefix";

package/dist/{virtual-modules-DXIIB-zM.js → virtual-modules-AXf0lNb0.js}

@@ -150,7 +150,7 @@ function createRoutingVirtualModule(routes, middlewares, cwd) {
 }
 function createPagesVirtualModule(pages, layouts, cwd) {
 	return defineVirtualModule("ubean:pages", () => {
-		return `export const pages = {\n${pages.map((p) => `  ${JSON.stringify(p.name)}: { name: ${JSON.stringify(p.name)}, path: ${JSON.stringify(p.path)}, filePath: ${JSON.stringify(toPortableFilePath(p.filePath, cwd))}, layout: ${JSON.stringify(p.layout)}, pageKind: ${JSON.stringify(resolvePageKind(p))}, routable: ${p.routable !== false}, reuseTarget: ${JSON.stringify(p.reuseTarget)}, pageMeta: ${JSON.stringify(p.pageMeta ?? null)}, redirect: ${JSON.stringify(p.redirect ?? null)} }`).join(",\n")}\n};\nexport const pageEntries = pages;\nexport const layouts = {\n${layouts.map((l) => `  ${JSON.stringify(l.name)}: { name: ${JSON.stringify(l.name)}, filePath: ${JSON.stringify(toPortableFilePath(l.filePath, cwd))}, isDefault: ${l.isDefault} }`).join(",\n")}\n};\nexport default { pages, layouts, pageEntries };`;
+		return `export const pages = {\n${pages.map((p) => `  ${JSON.stringify(p.name)}: { name: ${JSON.stringify(p.name)}, path: ${JSON.stringify(p.path)}, filePath: ${JSON.stringify(toPortableFilePath(p.filePath, cwd))}, layout: ${JSON.stringify(p.layout)}, pageKind: ${JSON.stringify(resolvePageKind(p))}, routable: ${p.routable !== false}, reuseTarget: ${JSON.stringify(p.reuseTarget)}, pageMeta: ${JSON.stringify(p.pageMeta ?? null)}, redirect: ${JSON.stringify(p.redirect ?? null)}, isBuiltin: ${p.isBuiltin === true}, isGlobalCatchAll: ${p.isGlobalCatchAll === true} }`).join(",\n")}\n};\nexport const pageEntries = pages;\nexport const layouts = {\n${layouts.map((l) => `  ${JSON.stringify(l.name)}: { name: ${JSON.stringify(l.name)}, filePath: ${JSON.stringify(toPortableFilePath(l.filePath, cwd))}, isDefault: ${l.isDefault} }`).join(",\n")}\n};\nexport default { pages, layouts, pageEntries };`;
 	});
 }
 function createMetaVirtualModule() {

package/dist/{vite-CGvlml0h.js → vite-Cwx2gAN6.js}

@@ -1,7 +1,7 @@
 import { a as ssrSingletonProdOptimizeExclude, g as createVirtualRegistry, o as ssrSingletonProdSsr, x as __exportAll } from "./ssr-singleton-CUHZLgiO.js";
-import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-DXIIB-zM.js";
-import { a as generateOpenApiTypes, i as generateTypes } from "./codegen-Dw-uws16.js";
-import { _ as sendWebResponse, a as createServerEntryVirtualModule, d as ensureDevApp, i as createClientEntryVirtualModule, n as ubeanVite, o as createVueAppEntryVirtualModule, r as composeHeadScripts, s as createVuePagesVirtualModule, v as toWebRequest, x as getDevScanCoordinator } from "./vue-DLig_WHk.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-AXf0lNb0.js";
+import { a as generateOpenApiTypes, i as generateTypes } from "./codegen-DUQT79IR.js";
+import { _ as sendWebResponse, a as createServerEntryVirtualModule, d as ensureDevApp, i as createClientEntryVirtualModule, n as ubeanVite, o as createVueAppEntryVirtualModule, r as composeHeadScripts, s as createVuePagesVirtualModule, v as toWebRequest, x as getDevScanCoordinator } from "./vue-Cr9byirH.js";
 import { createStaticSsgRenderer } from "./static-render.js";
 import { prerender, resolvePrerenderStaticDir } from "./prerender.js";
 import { resolvePageKind } from "@ubean/vue";
@@ -134,6 +134,10 @@ const _routeGroups = new Map();
 for (const _p of _pages) {
   // routable: false 的页面不建路由（与客户端 virtual:ubean-pages 同形）。
   if (_p.routable === false) continue;
+  // 内置全局捕获路由不在这里注册 —— 它的 URL 形态是 vue-router 的 repeatable 参数（客户端），
+  // 而 SSG 靠下面的静态 /404 路由渲染产物（静态段优先于 repeatable 参数，
+  // 不会被用户的 [...slug].vue 抢走）。两条都注册会得到重复的 'NotFound' 路由名。
+  if (_p.isGlobalCatchAll) continue;
   const _key = _p.route;
   const _group = _routeGroups.get(_key) || { slots: [] };
   if (_p.slot) _group.slots.push(_p);
@@ -1503,7 +1507,9 @@ function serializePagesForEntry(pages) {
 		pageMeta: p.pageMeta,
 		matchers: p.matchers,
 		slot: p.slot,
-		redirect: p.redirect
+		redirect: p.redirect,
+		isBuiltin: p.isBuiltin,
+		isGlobalCatchAll: p.isGlobalCatchAll
 	})));
 }
 async function generateVirtualModulesToDisk(cwd, config, scanResult, virtualDir, preset, registry, contentSnapshot) {
@@ -1538,7 +1544,9 @@ async function generateVirtualModulesToDisk(cwd, config, scanResult, virtualDir,
 			routable: p.routable,
 			pageKind: p.pageKind,
 			pageMeta: p.pageMeta,
-			redirect: p.redirect
+			redirect: p.redirect,
+			isBuiltin: p.isBuiltin,
+			isGlobalCatchAll: p.isGlobalCatchAll
 		})), scanResult.layouts.map((l) => ({
 			name: l.name,
 			filePath: l.fullPath,
@@ -2911,7 +2919,9 @@ function ubeanPlugin(options) {
 			routable: p.routable,
 			pageKind: p.pageKind,
 			pageMeta: p.pageMeta,
-			redirect: p.redirect
+			redirect: p.redirect,
+			isBuiltin: p.isBuiltin,
+			isGlobalCatchAll: p.isGlobalCatchAll
 		})), result.layouts.map((l) => ({
 			name: l.name,
 			filePath: l.fullPath,

package/dist/vite.d.ts

@@ -432,16 +432,14 @@ interface DevSsrRoutesOptions {
   loadComponent: (fullPath: string) => Promise<unknown>;
   /** 与客户端 `virtual:ubean-pages` 相同的 locale param（如 `:locale(zh)?`）。 */
   localeVueParam?: string;
-  /** `pages/404.vue` 经扫描得到的条目；缺省则不注册 catch-all。 */
-  notFoundPage?: ScannedPageRoute;
 }
 /**
  * 构建 SSR 路由表。
  *
  * 顺序与形状刻意对齐客户端：页面按扫描顺序、reuse 路由复用目标页面的组件、
- * 最后是 404 catch-all。catch-all 用 `/:locale?/:pathMatch(.*)*` —— SSR 渲染的是
- * **请求 URL 本身**（不像 SSG 渲染静态产物、可以用 `/404`），必须与客户端同形才能
- * 让两侧 `useRoute()` 解析出同一份 matched 结构。
+ * 全局捕获路由（`pages/404.vue` / `pages/not-found.vue`）排最后。catch-all 用
+ * `/:locale?/:pathMatch(.*)*` —— SSR 渲染的是**请求 URL 本身**（不像 SSG 渲染静态产物、
+ * 可以用 `/404`），必须与客户端同形才能让两侧 `useRoute()` 解析出同一份 matched 结构。
  */
 export declare function buildDevSsrRoutes(options: DevSsrRoutesOptions): DevSsrRoute[];
 //#endregion

package/dist/vite.js

@@ -1,4 +1,4 @@
 import { g as createVirtualRegistry } from "./ssr-singleton-CUHZLgiO.js";
-import { A as buildDevSsrRoutes, C as peekDevScanCoordinator, D as resolveDevSecurityHeaders, E as createDevAppReady, O as resolveLocaleVueParam, S as onDevScan, T as createDevApp, _ as sendWebResponse, b as createDevScanCoordinator, c as DEVTOOLS_PASS_THROUGH_PREFIXES, d as ensureDevApp, f as getDevApp, g as ubeanDevRequestPlugin, h as isViteResourceRequest, j as toVueRouterPagePath, k as enhanceDevApp, l as collectDevCssLinks, m as isFrameworkHtmlPage, p as injectStylesheetLinks, u as createUbeanRequestHandlers, v as toWebRequest, w as bootstrapDevApp, x as getDevScanCoordinator, y as DEV_SCAN_DIRS } from "./vue-DLig_WHk.js";
-import { D as createCloudflarePreviewRunner, E as MINIFLARE_INSTALL_HINT, O as defaultLoadMiniflare, _ as ubeanPreviewPlugin, a as createEnvRunnerTransport, c as getDevWorkerEntrySource, d as attachPreviewMiddleware, f as createPreviewMiddleware, g as sendPreviewStatus, h as sendPreviewFile, i as bridgeEnvRunnerInvokes, k as readCompatibilityDate, l as invalidateDevWorkerModules, m as resolvePreviewFile, n as UBEAN_DEV_ENV_NAME, o as createUbeanDevEnvironmentFactory, p as previewMimeType, r as UbeanDevEnvironment, s as DEV_WORKER_FILE, t as ubeanPlugin, u as writeDevWorkerEntry } from "./vite-CGvlml0h.js";
+import { A as buildDevSsrRoutes, C as peekDevScanCoordinator, D as resolveDevSecurityHeaders, E as createDevAppReady, O as resolveLocaleVueParam, S as onDevScan, T as createDevApp, _ as sendWebResponse, b as createDevScanCoordinator, c as DEVTOOLS_PASS_THROUGH_PREFIXES, d as ensureDevApp, f as getDevApp, g as ubeanDevRequestPlugin, h as isViteResourceRequest, j as toVueRouterPagePath, k as enhanceDevApp, l as collectDevCssLinks, m as isFrameworkHtmlPage, p as injectStylesheetLinks, u as createUbeanRequestHandlers, v as toWebRequest, w as bootstrapDevApp, x as getDevScanCoordinator, y as DEV_SCAN_DIRS } from "./vue-Cr9byirH.js";
+import { D as createCloudflarePreviewRunner, E as MINIFLARE_INSTALL_HINT, O as defaultLoadMiniflare, _ as ubeanPreviewPlugin, a as createEnvRunnerTransport, c as getDevWorkerEntrySource, d as attachPreviewMiddleware, f as createPreviewMiddleware, g as sendPreviewStatus, h as sendPreviewFile, i as bridgeEnvRunnerInvokes, k as readCompatibilityDate, l as invalidateDevWorkerModules, m as resolvePreviewFile, n as UBEAN_DEV_ENV_NAME, o as createUbeanDevEnvironmentFactory, p as previewMimeType, r as UbeanDevEnvironment, s as DEV_WORKER_FILE, t as ubeanPlugin, u as writeDevWorkerEntry } from "./vite-Cwx2gAN6.js";
 export { DEVTOOLS_PASS_THROUGH_PREFIXES, DEV_SCAN_DIRS, DEV_WORKER_FILE, MINIFLARE_INSTALL_HINT, UBEAN_DEV_ENV_NAME, UbeanDevEnvironment, attachPreviewMiddleware, bootstrapDevApp, bridgeEnvRunnerInvokes, buildDevSsrRoutes, collectDevCssLinks, createCloudflarePreviewRunner, createDevApp, createDevAppReady, createDevScanCoordinator, createEnvRunnerTransport, createPreviewMiddleware, createUbeanDevEnvironmentFactory, createUbeanRequestHandlers, createVirtualRegistry, defaultLoadMiniflare, enhanceDevApp, ensureDevApp, getDevApp, getDevScanCoordinator, getDevWorkerEntrySource, injectStylesheetLinks, invalidateDevWorkerModules, isFrameworkHtmlPage, isViteResourceRequest, onDevScan, peekDevScanCoordinator, previewMimeType, readCompatibilityDate, resolveDevSecurityHeaders, resolveLocaleVueParam, resolvePreviewFile, sendPreviewFile, sendPreviewStatus, sendWebResponse, toVueRouterPagePath, toWebRequest, ubeanDevRequestPlugin, ubeanPlugin, ubeanPreviewPlugin, writeDevWorkerEntry };

package/dist/{vue-DLig_WHk.js → vue-Cr9byirH.js}

@@ -1,8 +1,8 @@
 import { _ as defineVirtualModule, c as getComponentResolvers, g as createVirtualRegistry, i as ssrSingletonDevPolicy, l as getCssImports, u as getHeadScripts } from "./ssr-singleton-CUHZLgiO.js";
-import { D as resolveComponentsConfig, E as resolveAutoImportsConfig, O as toArray, S as getAutoImportPresets, f as COMPONENT_HALF_GLOBS } from "./codegen-Dw-uws16.js";
+import { D as resolveComponentsConfig, E as resolveAutoImportsConfig, O as toArray, S as getAutoImportPresets, f as COMPONENT_HALF_GLOBS } from "./codegen-DUQT79IR.js";
 import { createRequire } from "node:module";
 import { generatePagesModuleSource } from "@ubean/vue/vite";
-import { resolvePageKind } from "@ubean/vue";
+import { NOT_FOUND_ROUTE_PATH, resolvePageKind, sortPagesForRouting } from "@ubean/vue";
 import { isAbsolute, join, normalize, relative, resolve } from "pathe";
 import { existsSync } from "node:fs";
 import { loadUbeanConfig, localePathsOf, resolvePageCompilers } from "@ubean/config";
@@ -56,14 +56,14 @@ function redirectTarget(target, localeVueParam) {
 * 构建 SSR 路由表。
 *
 * 顺序与形状刻意对齐客户端：页面按扫描顺序、reuse 路由复用目标页面的组件、
-* 最后是 404 catch-all。catch-all 用 `/:locale?/:pathMatch(.*)*` —— SSR 渲染的是
-* **请求 URL 本身**（不像 SSG 渲染静态产物、可以用 `/404`），必须与客户端同形才能
-* 让两侧 `useRoute()` 解析出同一份 matched 结构。
+* 全局捕获路由（`pages/404.vue` / `pages/not-found.vue`）排最后。catch-all 用
+* `/:locale?/:pathMatch(.*)*` —— SSR 渲染的是**请求 URL 本身**（不像 SSG 渲染静态产物、
+* 可以用 `/404`），必须与客户端同形才能让两侧 `useRoute()` 解析出同一份 matched 结构。
 */
 function buildDevSsrRoutes(options) {
-	const { pages, layouts, loadComponent, localeVueParam, notFoundPage } = options;
+	const { pages, layouts, loadComponent, localeVueParam } = options;
 	const defaultLayout = layouts.find((l) => l.isDefault)?.name ?? null;
-	const routablePages = pages.filter((p) => p.routable !== false);
+	const routablePages = sortPagesForRouting(pages.filter((p) => p.routable !== false));
 	const withLocale = (path) => localeVueParam ? toVueRouterLocalePath(path, localeVueParam) : path;
 	const pageByName = /* @__PURE__ */ new Map();
 	for (const page of routablePages) pageByName.set(page.name, page);
@@ -72,7 +72,7 @@ function buildDevSsrRoutes(options) {
 		return async () => await loadComponent(fullPath);
 	};
 	const routeFor = (page) => ({
-		path: withLocale(toVueRouterPagePath(page.route)),
+		path: withLocale(page.isGlobalCatchAll ? NOT_FOUND_ROUTE_PATH : toVueRouterPagePath(page.route)),
 		name: page.name,
 		...page.redirect ? { redirect: redirectTarget(page.redirect, localeVueParam) } : { component: componentFor(page) },
 		meta: {
@@ -103,15 +103,6 @@ function buildDevSsrRoutes(options) {
 		}
 		routes.push(route);
 	}
-	if (notFoundPage) routes.push({
-		path: withLocale("/:pathMatch(.*)*"),
-		name: "NotFound",
-		component: async () => await loadComponent(notFoundPage.fullPath),
-		meta: {
-			layout: notFoundPage.layout === false ? false : notFoundPage.layout || defaultLayout,
-			pageName: "NotFound"
-		}
-	});
 	return routes;
 }
 //#endregion
@@ -161,8 +152,7 @@ function enhanceDevApp(options) {
 		pages: app.options.pages || [],
 		layouts,
 		localeVueParam,
-		loadComponent: loadModule,
-		notFoundPage: app.options.notFoundPage
+		loadComponent: loadModule
 	});
 	let appConfigModule = null;
 	const getAppConfigModule = () => {

package/dist/vue.js

@@ -1 +1 @@
-export { t as VUE_PLUGIN_INCLUDE, r as composeHeadScripts, i as createClientEntryVirtualModule, a as createServerEntryVirtualModule, o as createVueAppEntryVirtualModule, s as createVuePagesVirtualModule, n as default, n as ubeanVite } from "./vue-DLig_WHk.js";
+export { t as VUE_PLUGIN_INCLUDE, r as composeHeadScripts, i as createClientEntryVirtualModule, a as createServerEntryVirtualModule, o as createVueAppEntryVirtualModule, s as createVuePagesVirtualModule, n as default, n as ubeanVite } from "./vue-Cr9byirH.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/build",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Vite plugins, production build, SSG prerender, type codegen, and Server Actions plugin for ubean",
   "files": [
     "dist"
@@ -49,19 +49,19 @@
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "11.2.7",
-    "@ubean/app": "0.7.1",
-    "@ubean/client": "0.7.1",
-    "@ubean/config": "0.7.1",
-    "@ubean/i18n": "0.7.1",
-    "@ubean/islands": "0.7.1",
-    "@ubean/markdown": "0.7.1",
-    "@ubean/pages": "0.7.1",
-    "@ubean/preset": "0.7.1",
-    "@ubean/routes": "0.7.1",
-    "@ubean/scan": "0.7.1",
-    "@ubean/server": "0.7.1",
-    "@ubean/shared": "0.7.1",
-    "@ubean/vue": "0.7.1",
+    "@ubean/app": "0.7.3",
+    "@ubean/client": "0.7.3",
+    "@ubean/config": "0.7.3",
+    "@ubean/i18n": "0.7.3",
+    "@ubean/islands": "0.7.3",
+    "@ubean/markdown": "0.7.3",
+    "@ubean/pages": "0.7.3",
+    "@ubean/preset": "0.7.3",
+    "@ubean/routes": "0.7.3",
+    "@ubean/scan": "0.7.3",
+    "@ubean/server": "0.7.3",
+    "@ubean/shared": "0.7.3",
+    "@ubean/vue": "0.7.3",
     "@vitejs/plugin-vue": "^6.0.10",
     "@vitejs/plugin-vue-jsx": "^5.1.6",
     "openapi-typescript": "^7.13.0",