@ubean/build 0.6.8 → 0.7.0

package/README.md

@@ -383,7 +383,7 @@ const manifest = await buildWithEnvironments({
 | `createIslandsSsrStubPlugin()`                                                                          | Non-functional islands registry for SSR                                                      |
 
 **`serializePagesForEntry()` is a whitelist, and the whitelist is load-bearing.** It previously
-serialized only `relativePath` / `name` / `route` / `layout` / `reuseTarget` / `isReuse` / `pageMeta`,
+serialized only `relativePath` / `name` / `route` / `layout` / `reuseTarget` / `pageKind` / `pageMeta`,
 so `matchers` and `slot` **disappeared from production builds** — dev used the live scanned objects
 and behaved correctly, while a `[id=numeric]` route returned 404 in dev and 200 in production. Add a
 field to `ScannedPage` and you must add it here too; `packages/builder/test/page-metadata.test.ts`

package/README.zh-CN.md

@@ -373,7 +373,7 @@ const manifest = await buildWithEnvironments({
 | `createIslandsSsrStubPlugin()`                                                                          | SSR 期的 islands 注册表空壳                                                                   |
 
 **`serializePagesForEntry()` 是一份白名单，而这份白名单承载语义。** 它此前只序列化
-`relativePath` / `name` / `route` / `layout` / `reuseTarget` / `isReuse` / `pageMeta`，于是 `matchers` 与 `slot`
+`relativePath` / `name` / `route` / `layout` / `reuseTarget` / `pageKind` / `pageMeta`，于是 `matchers` 与 `slot`
 **在生产构建里消失** —— dev 用扫描得到的活对象因此一切正常，而带 `[id=numeric]` 的路由在 dev 返回 404、
 在生产返回 200。给 `ScannedPage` 加字段就必须同步加到这里；`packages/builder/test/page-metadata.test.ts`
 逐字段锁住这份名单。

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-CUlE95gB.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-ClIh5VKh.js";

package/dist/{codegen-CUlE95gB.js → codegen-ClIh5VKh.js}

@@ -1,4 +1,4 @@
-import { r as resolveEnvModules } from "./types-JZjwXWJd.js";
+import { r as resolveEnvModules } from "./types-C2WT1hXQ.js";
 import { isAbsolute, join, normalize, relative } from "pathe";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { glob } from "tinyglobby";
@@ -16,13 +16,6 @@ import openapiTS, { astToString } from "openapi-typescript";
 * `src/env.ts` 读了 `import.meta.env.VITE_API_PROXY_KEYS`，而 `src/typings/env.d.ts`
 * 里没有对应声明 —— 手写清单没有东西能提醒它过期。
 */
-const VITE_BUILTIN_ENV_KEYS = /* @__PURE__ */ new Set([
-	"MODE",
-	"DEV",
-	"PROD",
-	"BASE_URL",
-	"SSR"
-]);
 /**
 * 产物文件名（单一来源：`generateEnvTypes()` 的默认值与 `CODEGEN_NON_CONTRACT_FILES`
 * 都用它，免得改了一处漏另一处）。
@@ -33,32 +26,69 @@ function tsTypeOfLiteral(value) {
 	if (typeof value === "boolean") return "boolean";
 	return "string";
 }
-function renderModuleTypes(moduleId, fields) {
-	if (fields.length === 0) return `declare module '${moduleId}' {\n  // env.schema is empty\n}\n`;
-	return `declare module '${moduleId}' {\n${fields.map((f) => {
-		return `  export const ${f.key}: ${f.type}${f.optional ? " | undefined" : ""};`;
-	}).join("\n")}\n}\n`;
+/**
+* 把 `envField.*({ description })` 渲染成 JSDoc 行。
+*
+* 转义行内注释终止符：说明文字里出现它就提前闭合注释，后面的声明会变成语法错误 ——
+* 而报错位置指向生成的 `.d.ts`（用户不该去改的文件），完全看不出根因。
+* 多行说明逐行加 ` * ` 前缀，否则第二行会跑到注释外面。
+*/
+function renderJsDoc(description) {
+	const lines = description.replaceAll("*/", "*\\/").split(/\r?\n/).map((line) => line.trimEnd());
+	if (lines.length === 1) return [`  /** ${lines[0]} */`];
+	return [
+		"  /**",
+		...lines.map((line) => `   * ${line}`.trimEnd()),
+		"   */"
+	];
+}
+function renderModuleTypes(moduleId, fields, extraLines = []) {
+	const lines = fields.flatMap((f) => {
+		const decl = `  export const ${f.key}: ${f.type}${f.optional ? " | undefined" : ""};`;
+		return f.description ? [...renderJsDoc(f.description), decl] : [decl];
+	});
+	const body = [
+		...lines,
+		...lines.length > 0 && extraLines.length > 0 ? [""] : [],
+		...extraLines
+	];
+	if (body.length === 0) return `declare module '${moduleId}' {\n  // env.schema is empty\n}\n`;
+	return `declare module '${moduleId}' {\n${body.join("\n")}\n}\n`;
 }
 /**
-* 从 `import.meta.env` 快照生成 `ImportMetaEnv`。
+* 从 `import.meta.env` 快照生成 `ImportMetaEnv`，只声明 `VITE_` 前缀的 key。
 *
 * 值同时用于**类型**：字符串字面量能收窄成具体字符串 —— 但只在值是字面量时。这里选择
 * 宽化到 `string` / `number` / `boolean`，因为 `.env` 里的值一律是字符串，写成裸字面量
 * 会让 `VITE_API_ENV` 被推成 `"local"` 这种过窄类型，赋值时报错。
+*
+* **Vite 内建（`MODE` / `DEV` / `PROD` / `BASE_URL` / `SSR`）刻意不声明。** 它们已经由
+* `vite/client`（`dist/vite/types/importMeta.d.ts`）声明，且那边**没有** `readonly` 修饰符 ——
+* 重复声明会报 `TS2687: All declarations of 'MODE' must have identical modifiers`（实测
+* soybean-admin-v3：`--skipLibCheck false` 下 8 条）。默认的 `skipLibCheck: true` 会把它吞掉，
+* 于是这个冲突只对关掉 skipLibCheck 的项目可见。不声明就不冲突，而且那 5 个 key 是 Vite 常量，
+* 没有漂移可言。
+*
+* 没有 `VITE_*` key 时返回 `undefined`，整个 `interface ImportMetaEnv` 块都不产出 —— 只留一个
+* `readonly [key: string]: …` 兜底索引签名会反向削弱 `vite/client` 的声明（`strictImportMetaEnv`
+* 关掉时它自带 `Record<string, any>`；我们那份索引签名把 `import.meta.env.X` 从 `any` 收窄成
+* `string | boolean | undefined`，看着更严，实则是把 Vite 的类型面往下拉）。
 */
 function renderImportMetaEnv(importMetaEnv) {
-	const keys = Object.keys(importMetaEnv).filter((key) => key.startsWith("VITE_") || VITE_BUILTIN_ENV_KEYS.has(key)).sort();
-	if (keys.length === 0) return `interface ImportMetaEnv {\n  readonly [key: string]: string | boolean | undefined;\n}\n`;
-	return `interface ImportMetaEnv {\n${keys.map((key) => {
-		const value = importMetaEnv[key];
-		if (VITE_BUILTIN_ENV_KEYS.has(key)) {
-			if (key === "MODE" || key === "BASE_URL") return `  readonly ${key}: string;`;
-			return `  readonly ${key}: boolean;`;
-		}
-		return `  readonly ${key}: ${tsTypeOfLiteral(value)};`;
-	}).join("\n")}\n}\n`;
+	const keys = Object.keys(importMetaEnv).filter((key) => key.startsWith("VITE_")).sort();
+	if (keys.length === 0) return void 0;
+	return `interface ImportMetaEnv {\n${keys.map((key) => `  readonly ${key}: ${tsTypeOfLiteral(importMetaEnv[key])};`).join("\n")}\n}\n`;
 }
 /**
+* `renderEnvServerModule()` 生成的源码除了字段还会 `export function getSecret(key)`
+* （`packages/builder/src/env/types.ts`），但早先这里只声明字段 —— 用户按
+* `docs/contracts/env-v1.md` 的指引去 import 它，`tsc` 直接报 TS2305。
+*
+* 源码里还有一个 `__env`，它是生成代码的内部聚合对象，刻意**不**声明：声明了就等于
+* 把它纳入公开 API，而它有更好的具名导出可用。
+*/
+const ENV_SERVER_EXTRA_EXPORTS = ["  /** 读取未在 `env.schema` 里声明的变量（动态 / per-request 场景）。 */", "  export function getSecret(key: string): string | undefined;"];
+/**
 * 生成 `.ubean/env.d.ts`。
 *
 * 顶层**不能**出现 `export {}`：`ImportMetaEnv` 的声明必须留在全局作用域，一旦文件变成
@@ -67,17 +97,13 @@ function renderImportMetaEnv(importMetaEnv) {
 */
 async function generateEnvTypes(options) {
 	const { outDir, fileName = ENV_TYPES_FILE_NAME, modules, importMetaEnv = {} } = options;
+	const importMetaEnvBlock = renderImportMetaEnv(importMetaEnv);
 	const contents = `// Auto-generated by ubean from \`env.schema\` in ubean.config.ts — do not edit manually.
 // Provides typed access to \`ubean:env/client\` / \`ubean:env/server\` and declares ImportMetaEnv.
 /* eslint-disable */
 /// <reference types="vite/client" />
-
-${renderImportMetaEnv(importMetaEnv)}
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-${renderModuleTypes("ubean:env/client", modules.client)}${renderModuleTypes("ubean:env/server", modules.server)}`;
+${importMetaEnvBlock ? `\n${importMetaEnvBlock}interface ImportMeta {\n  readonly env: ImportMetaEnv;\n}\n` : ""}
+${renderModuleTypes("ubean:env/client", modules.client)}${renderModuleTypes("ubean:env/server", modules.server, ENV_SERVER_EXTRA_EXPORTS)}`;
 	await mkdir(outDir, { recursive: true });
 	const outPath = join(outDir, fileName);
 	await writeFile(outPath, contents, "utf8");
@@ -467,7 +493,7 @@ async function generateAutoImports(_scanResult, options) {
 			virtualComponents.push(...scanned.virtualComponents);
 		}
 	}
-	const componentsDts = generateComponentsDts(components, componentsDtsPath);
+	const componentsDts = generateComponentsDts(components, componentsDtsPath, await readComponentsDtsEntries(componentsDtsPath));
 	await writeFile(componentsDtsPath, componentsDts, "utf-8");
 	const virtualComponentsDtsPath = join(outDir, "virtual-components.d.ts");
 	await writeFile(virtualComponentsDtsPath, generateVirtualComponentsDts(virtualComponents, virtualComponentsDtsPath), "utf-8");
@@ -535,6 +561,39 @@ function generateVirtualComponentsDts(virtual, dtsPath) {
 	return `${lines.join("\n")}\n`;
 }
 /**
+* 读回 `components.d.ts` 里已有的条目（名字 → 声明）。
+*
+* 这个文件有**两个写入者**：本函数（每次重扫整体重写）与 unplugin-vue-components（dev 下
+* 按需重写，只扫它编译过的 SFC）。两边都只列自己知道的东西，所以必须**合并**而不是覆盖。
+*
+* 后果（实测 soybean-admin-v3）：`<SConfigProvider>` 只在 `src/app.vue` 里用，而 app.vue 只在
+* 渲染某个页面时才被加载 —— 于是 `SConfigProvider` / `SButton` 先被 unplugin 写进 d.ts，
+* 随后任意文件改动触发重扫，本函数把它们整个覆盖掉（我们只扫 `src/components` 与内置 4 个，
+* 既不认识模块注册的 resolver 也不认识 `RouterLink`/`RouterView`）。用户看到的就是
+* 「组件自动导入时有时无」。
+*
+* 为什么不去遍历模块注册的 resolver 拿候选名：`@vean/ui` 主入口不导出可枚举的组件清单
+* （161 个导出里只有一部分是组件），resolver 本身只能按名字查表。没有候选列表就只能合并。
+*
+* 不解析 AST：这是两个写入器共有的扁平接口，行格式稳定（`    Name: typeof import('…')['…']`）。
+*/
+async function readComponentsDtsEntries(dtsPath) {
+	const entries = /* @__PURE__ */ new Map();
+	let raw;
+	try {
+		raw = await readFile(dtsPath, "utf-8");
+	} catch {
+		return entries;
+	}
+	for (const line of raw.split("\n")) {
+		const match = /^ {4}(?:"((?:[^"\\]|\\.)*)"|([A-Za-z_$][\w$]*)): (typeof import\('.*'\)\[[^\]]+\])$/.exec(line);
+		if (!match) continue;
+		const name = match[1] !== void 0 ? JSON.parse(`"${match[1]}"`) : match[2];
+		entries.set(name, match[3]);
+	}
+	return entries;
+}
+/**
 * Generate the `.ubean/components.d.ts` in a format compatible with
 * unplugin-vue-components (both writers own the same file).
 *
@@ -544,10 +603,15 @@ function generateVirtualComponentsDts(virtual, dtsPath) {
 * `import`/`const` declaration lines. Entries must therefore be
 * self-contained inline `typeof import('...')` declarations so they stay
 * valid after unplugin merges them.
+*
+* 反向也必须成立：`previous`（上一份文件里的条目）**优先保留**。unplugin 在 dev 下按需
+* 收集（只扫它编译过的 SFC），我们只扫 `src/components` + 内置 4 个 —— 覆盖式重写会把
+* 它写进去的第三方组件（`SButton`/`SConfigProvider`/`RouterLink`…）全抹掉。
 */
-function generateComponentsDts(components, dtsPath) {
+function generateComponentsDts(components, dtsPath, previous = /* @__PURE__ */ new Map()) {
 	const dtsDir = fileDirname(toPosixPath(normalize(dtsPath)));
 	const entries = /* @__PURE__ */ new Map();
+	for (const [name, declaration] of previous) entries.set(name, declaration);
 	for (const name of [
 		"Link",
 		"Head",

package/dist/env/plugin.d.ts

@@ -20,6 +20,8 @@ interface EnvFieldSpec {
   /** TypeScript 字面量类型，直接写进 `.ubean/env.d.ts`。 */
   type: string;
   optional: boolean;
+  /** 字段说明（`envField.*({ description })`），写进 `.ubean/env.d.ts` 的 JSDoc。 */
+  description?: string;
   /**
    * 已解析的值：
    * - `context: 'client'` → 构建期内联用的字面量（来自 `import.meta.env` / `.env`，已含 default 回退）

package/dist/env/plugin.js

@@ -1,4 +1,4 @@
-import { n as renderEnvServerModule, r as resolveEnvModules, t as renderEnvClientModule } from "../types-JZjwXWJd.js";
+import { n as renderEnvServerModule, r as resolveEnvModules, t as renderEnvClientModule } from "../types-C2WT1hXQ.js";
 import { loadEnv } from "vite";
 //#region src/env/plugin.ts
 /**

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-C_Onkx4t.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-7mD1FgVQ.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.d.ts

@@ -38,6 +38,14 @@ export interface PrerendererOptions {
     statusCode: number;
   }>;
 }
+/**
+ * `definePage({ redirect })` 的页面是否在预渲染时应跳过。
+ *
+ * 静态产物里没有重定向的执行点：SSG 直接渲染路径会渲出源页面的 HTML，
+ * fullstack 管道下 fetcher 拿到的是空体的 302（写盘就是空文件）。两者都是错的，
+ * 所以两边共用这一个判据（调用方负责出 warn，本模块只负责跳过）。
+ */
+export declare function isRedirectPage(page: ScannedPageRoute): boolean;
 /**
  * 从 routeRules 中提取标记了 `prerender: true` 或 `ppr: true` 的路由模式
  * (P9-03 + P9-04)。

package/dist/prerender.js

@@ -18,6 +18,16 @@ const DATA_PAYLOAD_REGEX = new RegExp(`<script id="${DATA_PAYLOAD_ID}" type="app
 function isDynamicPath(path) {
 	return /\[.*?\]/.test(path) || path.includes(":");
 }
+/**
+* `definePage({ redirect })` 的页面是否在预渲染时应跳过。
+*
+* 静态产物里没有重定向的执行点：SSG 直接渲染路径会渲出源页面的 HTML，
+* fullstack 管道下 fetcher 拿到的是空体的 302（写盘就是空文件）。两者都是错的，
+* 所以两边共用这一个判据（调用方负责出 warn，本模块只负责跳过）。
+*/
+function isRedirectPage(page) {
+	return page.routable !== false && Boolean(page.redirect);
+}
 function normalizePagePath(filePath) {
 	let path = filePath.replace(/\.(vue|ts|js|tsx|jsx|md|mdx)$/, "");
 	if (path === "index" || path.endsWith("/index")) path = path.slice(0, -5);
@@ -63,9 +73,14 @@ function collectPrerenderRoutes(pages, options = {}) {
 		...extractPrerenderRoutesFromRules(options.routeRules),
 		...options.contentRoutes ?? []
 	];
+	const redirectPaths = /* @__PURE__ */ new Set();
 	const allPageRoutes = [];
 	for (const page of pages) {
 		if (page.routable === false) continue;
+		if (isRedirectPage(page)) {
+			redirectPaths.add(normalizePagePath(page.path));
+			continue;
+		}
 		const path = normalizePagePath(page.path);
 		if (!isDynamicPath(path)) allPageRoutes.push(path);
 	}
@@ -74,6 +89,7 @@ function collectPrerenderRoutes(pages, options = {}) {
 	else for (const pattern of include) if (pattern.includes("*")) {
 		for (const r of allPageRoutes) if (matchGlob(r, pattern)) matched.add(r);
 	} else matched.add(pattern.startsWith("/") ? pattern : `/${pattern}`);
+	for (const path of redirectPaths) matched.delete(path);
 	const skipped = [];
 	for (const r of matched) if (exclude.some((p) => matchGlob(r, p))) skipped.push(r);
 	for (const r of skipped) matched.delete(r);
@@ -232,6 +248,8 @@ async function prerender(options) {
 		contentRoutes: options.contentRoutes
 	});
 	const queue = [...options.expandRoutes ? options.expandRoutes(initialRoutes) : initialRoutes];
+	const redirectPages = options.pages.filter(isRedirectPage).map((p) => normalizePagePath(p.path));
+	if (redirectPages.length > 0) _logger.warn(`Skipping prerender for ${redirectPages.length} redirect page(s) (${redirectPages.join(", ")}) — static output has no redirect execution point`);
 	if (options.notFoundRoute) queue.unshift(STATIC_NOT_FOUND_ROUTE);
 	const visited = /* @__PURE__ */ new Set();
 	const results = [];
@@ -325,4 +343,4 @@ function generatePrerenderManifest(result, baseUrl = "/") {
 	};
 }
 //#endregion
-export { collectPrerenderRoutes, extractDataPayload, extractLinks, extractPrerenderRoutesFromRules, generatePrerenderManifest, prerender, resolvePrerenderStaticDir, routeToDataFilePath, routeToFilePath, writePrerenderedFile };
+export { collectPrerenderRoutes, extractDataPayload, extractLinks, extractPrerenderRoutesFromRules, generatePrerenderManifest, isRedirectPage, prerender, resolvePrerenderStaticDir, routeToDataFilePath, routeToFilePath, writePrerenderedFile };

package/dist/production.d.ts

@@ -46,7 +46,7 @@ export interface BuildManifest {
 /**
  * 把扫描到的页面序列化进服务端入口（`const _pages = [...]`）。
  *
- * **白名单必须覆盖语义字段**：此前只序列化了 `relativePath/name/route/layout/reuseTarget/isReuse/
+ * **白名单必须覆盖语义字段**：此前只序列化了 `relativePath/name/route/layout/reuseTarget/pageKind/
  * pageMeta`，于是 `matchers` / `slot` **在生产构建里丢失** ——
  * dev 用扫描得到的活对象（`enhanceDevApp` / `buildDevSsrRoutes` 直接拿 `scanResult.pages`），所以本地
  * 一切正常，只有构建产物坏掉：带着 `[id=numeric]` 的路由在 dev 返回 404、在生产返回 200（实测）。

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-C8I25VzP.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-C5MyVhMg.js";

package/dist/{types-JZjwXWJd.js → types-C2WT1hXQ.js}

@@ -10,6 +10,17 @@ import { isEnvFieldMeta } from "@ubean/shared";
 * 维度规则照抄 Astro `astro:env`：`client+public` / `server+public` / `server+secret` 三种合法，
 * `client+secret` 在**规范化阶段**就抛错（配置期失败，比构建期失败早）。
 */
+/**
+* 判断一个 schema 条目是不是**运行期**校验器（Standard Schema / `safeParse`）。
+*
+* 这类值不能进 `env.schema` —— 见 `resolveEnvModules()` 里的抛错说明。
+*/
+function isRuntimeSchema(def) {
+	if (typeof def !== "object" || def === null) return false;
+	const standard = def["~standard"];
+	if (typeof standard === "object" && standard !== null && typeof standard.validate === "function") return true;
+	return typeof def.safeParse === "function";
+}
 function typeOfField(def) {
 	if (isEnvFieldMeta(def)) {
 		if (def.type === "enum") return (def.values ?? []).map((v) => JSON.stringify(v)).join(" | ") || "string";
@@ -44,6 +55,8 @@ function resolveEnvModules(input) {
 	const client = [];
 	const server = [];
 	for (const [key, def] of Object.entries(schema)) {
+		if (isRuntimeSchema(def)) throw new Error(`Invalid env field "${key}": a runtime schema (Standard Schema / safeParse) cannot be used in \`env.schema\` in ubean.config.ts.\nGenerated env modules are source files and only carry plain metadata, so the validator would be silently dropped.
+Use \`envField.*({ context, access })\` here, or move the field into \`defineEnv({ schema })\` in server code if you need schema validation.`);
 		const { context, access } = dimensionsOf(def);
 		if (context === "client" && access === "secret") throw new Error(`Invalid env field "${key}": context 'client' cannot be combined with access 'secret'. Secrets never reach the client — use \`{ context: 'server', access: 'secret' }\`.`);
 		const meta = isEnvFieldMeta(def) ? def : null;
@@ -56,6 +69,7 @@ function resolveEnvModules(input) {
 			optional,
 			sourceKey: key
 		};
+		if (meta?.description) spec.description = meta.description;
 		if (context === "client") {
 			const raw = importMetaEnv[key] ?? dotEnv[key];
 			const resolved = raw === void 0 || raw === "" ? meta?.default : raw;

package/dist/{virtual-modules-C_Onkx4t.js → virtual-modules-7mD1FgVQ.js}

@@ -1,5 +1,6 @@
 import { _ as defineVirtualModule } from "./ssr-singleton-CUHZLgiO.js";
 import { extractScriptBlocks, parseScriptAst, statementCall } from "@ubean/vue/vite";
+import { resolvePageKind } from "@ubean/vue";
 import { isAbsolute, relative } from "pathe";
 //#region src/macros.ts
 /**
@@ -174,8 +175,7 @@ function createAppVirtualModule(apiRoutes, middlewares, pages, srcDir, pageExten
 			relativePath: p.relativePath,
 			name: p.name,
 			route: p.route,
-			isReuse: p.isReuse,
-			isMeta: p.isMeta,
+			pageKind: resolvePageKind(p),
 			routable: p.routable,
 			layout: p.layout
 		}));

package/dist/{vite-C8I25VzP.js → vite-C5MyVhMg.js}

@@ -1,9 +1,10 @@
 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-C_Onkx4t.js";
-import { a as generateOpenApiTypes, i as generateTypes } from "./codegen-CUlE95gB.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-QvsTw-R-.js";
+import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, s as transformMacros, t as createAppVirtualModule } from "./virtual-modules-7mD1FgVQ.js";
+import { a as generateOpenApiTypes, i as generateTypes } from "./codegen-ClIh5VKh.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-ClGXUBJz.js";
 import { createStaticSsgRenderer } from "./static-render.js";
 import { prerender, resolvePrerenderStaticDir } from "./prerender.js";
+import { resolvePageKind } from "@ubean/vue";
 import { dirname, isAbsolute, join, relative, resolve } from "pathe";
 import * as nodeFs from "node:fs";
 import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
@@ -93,13 +94,25 @@ const _localeVueParam = ${JSON.stringify(localeVueParam)};
 const _pageToRoute = p => {
   // For reuse routes, load the target page's module (the .reuse.ts file
   // only contains definePage metadata, not a Vue component).
-  const _targetPage = p.isReuse && p.reuseTarget ? _pages.find(tp => tp.name === p.reuseTarget) : undefined;
+  const _targetPage = p.pageKind === 'reuse' && p.reuseTarget ? _pages.find(tp => tp.name === p.reuseTarget) : undefined;
   const _loaderKey = _targetPage?.relativePath || p.relativePath;
+  const _routePath = p.route.replace(/\\*\\*:(\\w[\\w-]*)/g, ':$1(.*)*');
   return {
-    path: _localeVueParam
-      ? toVueRouterLocalePath(p.route.replace(/\\*\\*:(\\w[\\w-]*)/g, ':$1(.*)*'), _localeVueParam)
-      : p.route.replace(/\\*\\*:(\\w[\\w-]*)/g, ':$1(.*)*'),
+    path: _localeVueParam ? toVueRouterLocalePath(_routePath, _localeVueParam) : _routePath,
     name: p.name,
+    // \`definePage({ redirect })\`: 不渲染组件，访问时跳转（与服务端 302 同语义）。
+    // 字符串重定向不插值参数，带语言前缀时用函数形式拼 —— 与客户端 / dev 同形。
+    // 注意这里是**生成期模板**：\`p.redirect\` 必须原样落到产物里（运行期才按页取值）。
+    ...(p.redirect
+      ? {
+          redirect: _localeVueParam
+            ? to =>
+                to.params.locale
+                  ? '/' + to.params.locale + (p.redirect === '/' ? '' : p.redirect)
+                  : p.redirect
+            : p.redirect
+        }
+      : {}),
     component: async () => {
       const loader = pageLoaders[_loaderKey];
       if (!loader) throw new Error('Page loader not found: ' + _loaderKey);
@@ -109,7 +122,10 @@ const _pageToRoute = p => {
     meta: {
       layout: p.layout === false ? false : p.layout || _defaultLayout,
       pageName: p.name,
-      cache: p.cache === true ? true : undefined
+      cache: p.cache === true ? true : undefined,
+      /* 同客户端 buildRouteMeta：透传 definePage({ meta })。否则靠 meta（如 iframeUrl）
+         取参数的页面在 SSR 首屏渲染空态，水合后才有值。 */
+      ...(p.pageMeta?.meta || undefined)
     }
   };
 };
@@ -135,7 +151,7 @@ for (const _group of _routeGroups.values()) {
     // 注意组件加载器在 _record 上（_primary 是扫描得到的页面条目，没有 component 字段 ——
     // 写成 _primary.component 会得到 undefined，vue-router 报 Invalid route component）。
     const _components = {};
-    if (_group.default) _components.default = _record.component;
+    if (_group.default && !_group.default.redirect) _components.default = _record.component;
     for (const _slotPage of _group.slots) _components[_slotPage.slot] = _pageToRoute(_slotPage).component;
     delete _record.component;
     _record.components = _components;
@@ -293,7 +309,7 @@ export async function renderStaticPage(input) {
 
   // loader 检测 warn（模块加载有缓存，此处与渲染共用同一实例）
   const _targetPage =
-    page.isReuse && page.reuseTarget ? _pages.find(tp => tp.name === page.reuseTarget) : undefined;
+    page.pageKind === 'reuse' && page.reuseTarget ? _pages.find(tp => tp.name === page.reuseTarget) : undefined;
   const _loaderKey = (_targetPage && _targetPage.relativePath) || page.relativePath;
   const _modLoader = pageLoaders[_loaderKey];
   if (_modLoader && !_loaderWarned.has(page.name)) {
@@ -936,6 +952,23 @@ function createBuildEnvironments(input) {
 	return {
 		client: {
 			consumer: "client",
+			/**
+			* 客户端环境的顶层 `input` 用**虚拟模块 id**，而不是 `build.rollupOptions.input` 里的绝对路径。
+			*
+			* 原因：Vite 的依赖扫描（`computeEntries`）优先读顶层 `input`，并走
+			* `pluginContainer.resolveId()` —— 虚拟模块能被插件解析；而 `rollupOptions.input` 是
+			* 磁盘路径，在没有 `src/entry.client.ts` 的项目里指向 `.ubean/virtual/client-entry.mjs`，
+			* 那是**构建产物**：dev 从不写它。
+			*
+			* 后果（实测 soybean-admin-v3，v0.6.9）：扫描抛
+			* `failed to resolve rolldownOptions.input value: "…/.ubean/virtual/client-entry.mjs"`，
+			* 依赖预构建整段跳过 —— dev server 能起、页面能渲染，但依赖不预构建（首屏请求瀑布 + 慢），
+			* 且报错直接吐给用户。
+			*
+			* 用虚拟 id 还顺带让扫描真的爬进客户端入口（拿到 `vue` / `vue-router` / UI 库等依赖）。
+			* 构建期取值不变：解析后仍是同一个虚拟模块。
+			*/
+			input: "virtual:ubean-client-entry",
 			optimizeDeps: { exclude: clientOptimizeDepsExclude() },
 			build: {
 				outDir: outDirs.public,
@@ -1444,7 +1477,7 @@ function toVitePath(p) {
 /**
 * 把扫描到的页面序列化进服务端入口（`const _pages = [...]`）。
 *
-* **白名单必须覆盖语义字段**：此前只序列化了 `relativePath/name/route/layout/reuseTarget/isReuse/
+* **白名单必须覆盖语义字段**：此前只序列化了 `relativePath/name/route/layout/reuseTarget/pageKind/
 * pageMeta`，于是 `matchers` / `slot` **在生产构建里丢失** ——
 * dev 用扫描得到的活对象（`enhanceDevApp` / `buildDevSsrRoutes` 直接拿 `scanResult.pages`），所以本地
 * 一切正常，只有构建产物坏掉：带着 `[id=numeric]` 的路由在 dev 返回 404、在生产返回 200（实测）。
@@ -1463,14 +1496,14 @@ function serializePagesForEntry(pages) {
 		path: p.path,
 		layout: p.layout,
 		cache: p.cache,
-		isReuse: p.isReuse,
-		isMeta: p.isMeta,
+		pageKind: resolvePageKind(p),
 		routable: p.routable,
 		isMarkdown: p.isMarkdown,
 		reuseTarget: p.reuseTarget,
 		pageMeta: p.pageMeta,
 		matchers: p.matchers,
-		slot: p.slot
+		slot: p.slot,
+		redirect: p.redirect
 	})));
 }
 async function generateVirtualModulesToDisk(cwd, config, scanResult, virtualDir, preset, registry, contentSnapshot) {
@@ -1520,18 +1553,21 @@ async function generateVirtualModulesToDisk(cwd, config, scanResult, virtualDir,
 		const content = mod ? await mod.load() : "";
 		await writeFile(join(virtualDir, filename), header + content, "utf-8");
 	}
-	await writeModule("ubean:routes", "routes.mjs");
-	await writeModule("ubean:app-config", "app-config.mjs");
-	await writeModule("ubean:locales", "locales.mjs");
-	if (hasPages) {
-		await writeModule("ubean:pages", "pages.ts");
-		await writeModule("ubean:meta", "meta.mjs");
-		await writeModule("virtual:ubean-pages", "vue-pages.ts", "");
-		await writeModule("virtual:ubean-app", "vue-app.ts", "");
-		await writeModule("virtual:ubean-client-entry", "client-entry.mjs", "");
-	}
-	if (hasServer) await writeModule("virtual:ubean-server", "server-entry.ts", "");
-	await writeFile(join(virtualDir, "islands-registry.ts"), "export const islands = {};\n", "utf-8");
+	/**
+	* 只写**有磁盘消费者**的虚拟模块。
+	*
+	* 这里曾经把 12 个虚拟模块全写了一遍，其中 10 个没有任何读取方 —— 构建 / dev 都从注册表取
+	* 虚拟 id（`ubeanVite` 的 `resolveId`/`load`、dev 的 `loadModule`），磁盘副本纯装饰。代价不是
+	* 空间而是**类型检查**：scaffold 模板的 `include` 是 `.ubean` 全目录，这些文件会被 `vue-tsc` 扫进去，
+	* 而它们只带 `// @ts-nocheck` 头部（`server-entry.ts` 连头部都是空串）—— 实测 soybean-admin-v3
+	* 的 30 个类型错误**全部**来自生成产物，`src/` 一个都没有。
+	*
+	* 剩下的三个各自有真实读取方：
+	* - `client-entry.mjs`：`createBuildEnvironments()` 的 `clientInput` 回退路径（无 `src/entry.client.ts` 时）；
+	* - `server-entry.mjs`：`ubean` 环境的 `build.rollupOptions.input`，真正的构建入口；
+	* - `index.html`：`writeClientIndexHtml()` 在 `prepareBuild` 里单独写，见 `build-app.ts`。
+	*/
+	if (hasPages) await writeModule("virtual:ubean-client-entry", "client-entry.mjs", "");
 	const pagesGlob = JSON.stringify(`${viteSrcPrefix}/pages/**/*.{${pagesExts}}`);
 	const routesGlob = JSON.stringify(`${viteSrcPrefix}/routes/**/*.{ts,js,mjs}`);
 	const middlewareGlob = JSON.stringify(`${viteSrcPrefix}/middleware/**/*.{ts,js,mjs}`);

package/dist/vite.d.ts

@@ -392,6 +392,9 @@ export declare function ubeanPreviewPlugin(options?: UbeanPreviewPluginOptions):
 //#region src/dev/dev-ssr-routes.d.ts
 /** 扫描器方言 `**:slug`（catch-all）→ vue-router 的 `:slug(.*)*`。 */
 export declare function toVueRouterPagePath(route: string): string;
+interface DevSsrRedirectLocation {
+  params: Record<string, string | string[]>;
+}
 /** vue-router 路由记录的运行期形状（只声明 dev 侧真正用到的字段）。 */
 interface DevSsrRoute {
   path: string;
@@ -399,11 +402,24 @@ interface DevSsrRoute {
   /** 普通路由用 `component`；并行路由（`@slot/`）用 `components` 命名视图，二者互斥。 */
   component?: () => Promise<unknown>;
   components?: Record<string, () => Promise<unknown>>;
+  /**
+   * `definePage({ redirect })` 的目标 —— 本路由不渲染组件，访问时跳转。
+   *
+   * 与客户端 `virtual:ubean-pages` 同形：字符串是静态路径，带语言前缀时用
+   * 函数形式按 `to.params.locale` 补前缀（字符串重定向不插值参数）。
+   */
+  redirect?: string | ((to: DevSsrRedirectLocation) => string);
   meta: {
     /** 单层布局名、多层嵌套数组（P9-17）或 `false`（禁用）。 */
     layout: string | string[] | false | null;
     pageName: string;
     cache?: true;
+    /**
+     * 其余键是 `definePage({ meta })` 的透传（`iframeUrl` / `title` / `i18nKey` …）。
+     * 不声明的话，用到这些 meta 的页面（例如按 `meta.iframeUrl` 取地址的内嵌页）
+     * 在 SSR 首屏渲染成空态，水合后客户端才有值 —— 首屏与水合结果不一致。
+     */
+    [key: string]: unknown;
   };
 }
 interface DevSsrRoutesOptions {

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-QvsTw-R-.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-C8I25VzP.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-ClGXUBJz.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-C5MyVhMg.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-QvsTw-R-.js → vue-ClGXUBJz.js}

@@ -1,7 +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-CUlE95gB.js";
+import { D as resolveComponentsConfig, E as resolveAutoImportsConfig, O as toArray, S as getAutoImportPresets, f as COMPONENT_HALF_GLOBS } from "./codegen-ClIh5VKh.js";
 import { createRequire } from "node:module";
 import { generatePagesModuleSource } from "@ubean/vue/vite";
+import { resolvePageKind } from "@ubean/vue";
 import { isAbsolute, join, normalize, relative, resolve } from "pathe";
 import { existsSync } from "node:fs";
 import { loadUbeanConfig, localePathsOf, resolvePageCompilers } from "@ubean/config";
@@ -39,6 +40,19 @@ function toVueRouterPagePath(route) {
 	return route.replace(/\*\*:(\w[\w-]*)/g, ":$1(.*)*");
 }
 /**
+* `definePage({ redirect })` 的 vue-router 目标。
+*
+* 字符串重定向是**静态路径**，vue-router 不插值参数，所以带语言前缀时必须用
+* 函数形式拼一次（客户端 `generatePagesModuleSource` 生成的是同一个形状）。
+* `to.params.locale` 的运行期值就是 URL 段本身，不需要再查 locale 表；默认语言在
+* `prefix_except_default` / `prefix_and_default` 下没有 param，自然不带前缀。
+*/
+function redirectTarget(target, localeVueParam) {
+	if (!localeVueParam) return target;
+	const suffix = target === "/" ? "" : target;
+	return (to) => to.params.locale ? `/${to.params.locale}${suffix}` : target;
+}
+/**
 * 构建 SSR 路由表。
 *
 * 顺序与形状刻意对齐客户端：页面按扫描顺序、reuse 路由复用目标页面的组件、
@@ -54,17 +68,18 @@ function buildDevSsrRoutes(options) {
 	const pageByName = /* @__PURE__ */ new Map();
 	for (const page of routablePages) pageByName.set(page.name, page);
 	const componentFor = (page) => {
-		const fullPath = (page.isReuse && page.reuseTarget ? pageByName.get(page.reuseTarget) : void 0)?.fullPath || page.fullPath;
+		const fullPath = (resolvePageKind(page) === "reuse" && page.reuseTarget ? pageByName.get(page.reuseTarget) : void 0)?.fullPath || page.fullPath;
 		return async () => await loadComponent(fullPath);
 	};
 	const routeFor = (page) => ({
 		path: withLocale(toVueRouterPagePath(page.route)),
 		name: page.name,
-		component: componentFor(page),
+		...page.redirect ? { redirect: redirectTarget(page.redirect, localeVueParam) } : { component: componentFor(page) },
 		meta: {
 			layout: page.layout === false ? false : page.layout || defaultLayout,
 			pageName: page.name,
-			cache: page.cache === true ? true : void 0
+			cache: page.cache === true ? true : void 0,
+			...page.pageMeta?.meta
 		}
 	});
 	const grouped = /* @__PURE__ */ new Map();
@@ -81,7 +96,7 @@ function buildDevSsrRoutes(options) {
 		const route = routeFor(primary);
 		if (group.slots.length > 0) {
 			const components = {};
-			if (group.default) components.default = componentFor(group.default);
+			if (group.default && !group.default.redirect) components.default = componentFor(group.default);
 			for (const slotPage of group.slots) components[slotPage.slot] = componentFor(slotPage);
 			delete route.component;
 			route.components = components;
@@ -120,7 +135,7 @@ function enhanceDevApp(options) {
 	for (const page of app.options.pages || []) pageByName.set(page.name, page);
 	const pageLoaders = {};
 	for (const page of app.options.pages || []) {
-		const fullPath = (page.isReuse && page.reuseTarget ? pageByName.get(page.reuseTarget) : void 0)?.fullPath || page.fullPath;
+		const fullPath = (resolvePageKind(page) === "reuse" && page.reuseTarget ? pageByName.get(page.reuseTarget) : void 0)?.fullPath || page.fullPath;
 		pageLoaders[page.relativePath] = () => loadModule(fullPath);
 	}
 	app.options.pageLoaders = pageLoaders;

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-QvsTw-R-.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-ClGXUBJz.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/build",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "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.6.8",
-    "@ubean/client": "0.6.8",
-    "@ubean/config": "0.6.8",
-    "@ubean/i18n": "0.6.8",
-    "@ubean/islands": "0.6.8",
-    "@ubean/markdown": "0.6.8",
-    "@ubean/pages": "0.6.8",
-    "@ubean/preset": "0.6.8",
-    "@ubean/routes": "0.6.8",
-    "@ubean/scan": "0.6.8",
-    "@ubean/server": "0.6.8",
-    "@ubean/shared": "0.6.8",
-    "@ubean/vue": "0.6.8",
+    "@ubean/app": "0.7.0",
+    "@ubean/client": "0.7.0",
+    "@ubean/config": "0.7.0",
+    "@ubean/i18n": "0.7.0",
+    "@ubean/islands": "0.7.0",
+    "@ubean/markdown": "0.7.0",
+    "@ubean/pages": "0.7.0",
+    "@ubean/preset": "0.7.0",
+    "@ubean/routes": "0.7.0",
+    "@ubean/scan": "0.7.0",
+    "@ubean/server": "0.7.0",
+    "@ubean/shared": "0.7.0",
+    "@ubean/vue": "0.7.0",
     "@vitejs/plugin-vue": "^6.0.10",
     "@vitejs/plugin-vue-jsx": "^5.1.6",
     "openapi-typescript": "^7.13.0",