@ubean/build 0.5.2 → 0.6.0-beta.1

package/dist/actions-plugin.js

@@ -63,11 +63,16 @@ function findBalanced(code, openChar, closeChar, startIdx) {
 }
 /**
 * 计算项目相对路径(用于 action ID 生成)。
+*
+* **自己负责去掉 query 与虚拟前缀**：调用方可能传原始 id（`Page.vue?vue&type=script&lang.ts`），
+* 带 query 算出的 id 与不带 query 的不是同一个 —— 客户端 stub 与 服务端注册因此会对不上。
+* 插件入口已经规范化过一次，这里再兜一次，让这两个变换函数单独用也正确。
 */
 function toProjectRelative(filePath, root) {
-	let rel = filePath;
+	const cleanPath = filePath.split("?")[0].replace(/^\0/, "");
+	let rel = cleanPath;
 	if (root) try {
-		rel = relative(root, filePath);
+		rel = relative(root, cleanPath);
 	} catch {}
 	return rel.replace(/\\/g, "/");
 }
@@ -353,8 +358,51 @@ function transformActionsForClient(code, filePath, root) {
 		const replacement = `__ubean_createActionStub(${JSON.stringify(id)})`;
 		result = result.slice(0, call.start) + replacement + result.slice(call.end + 1);
 	}
+	result = stripUnusedSpecifiers(result, [
+		"defineAction",
+		"fail",
+		"ActionError",
+		"defineServerFn"
+	]);
 	const importStmt = `import { createActionStub as __ubean_createActionStub } from '@ubean/routes/runtime';\n`;
-	if (!result.includes("@ubean/routes/runtime'")) result = importStmt + result;
+	if (!result.includes("@ubean/routes/runtime'")) result = injectImport(result, importStmt);
+	return result;
+}
+/**
+* 注入 import：JS/TS 放到文件顶部；**SFC 放到 `<script>` 块内**。
+*
+* 必须是块内 —— `@vitejs/plugin-vue` 会把 script 块的 import 提升进它编译出的主模块，放在 SFC
+* 顶部（`<script>` 之前）会直接变成非法 SFC。这也是「转换必须落在主模块而不是 `?type=script`
+* 子请求」的原因：主模块才是 Vue 真正编译的那份（脚本子请求的转换结果不会被使用）。
+*/
+function injectImport(code, importStmt) {
+	if (!code.trimStart().startsWith("<")) return importStmt + code;
+	const scriptTag = /<script\b[^>]*>/.exec(code);
+	if (!scriptTag) return importStmt + code;
+	const insertAt = scriptTag.index + scriptTag[0].length;
+	return `${code.slice(0, insertAt)}\n${importStmt}${code.slice(insertAt)}`;
+}
+/**
+* 删除已无引用的具名 import 说明符（并清理空掉的 import 语句）。
+*
+* 只处理「命名导入 + from '…'」这一种形态（框架约定：服务端 API 从 `ubean/server` 等入口具名导入）。
+* 判定用「删除 import 语句后名字是否还出现」——够用且不引入解析器依赖；名字出现在字符串/注释里
+* 时会保守地保留该说明符（保留是安全的，删除才危险）。
+*/
+function stripUnusedSpecifiers(code, names) {
+	let result = code;
+	for (const name of new Set(names)) {
+		const match = new RegExp(`^import\\s*\\{([^}]*)\\}\\s*from\\s*(['"][^'"]+['"]);?[ \\t]*$`, "m").exec(result);
+		if (!match) continue;
+		const specifiers = match[1].split(",").map((part) => part.trim()).filter(Boolean);
+		const target = specifiers.find((spec) => spec === name || spec === `${name} as ${name}`);
+		if (!target) continue;
+		const withoutImport = result.replace(match[0], "");
+		if (new RegExp(`\\b${name}\\b`).test(withoutImport)) continue;
+		const remaining = specifiers.filter((spec) => spec !== target);
+		const replacement = remaining.length > 0 ? `import { ${remaining.join(", ")} } from ${match[2]};` : "";
+		result = result.replace(match[0], replacement);
+	}
 	return result;
 }
 /**
@@ -370,13 +418,14 @@ function ubeanServerActionsPlugin(options = {}) {
 		enforce: "pre",
 		transform(code, id, transformOptions) {
 			if (id.includes("/node_modules/") || id.includes("\0")) return null;
-			if (!/\.(ts|js|mts|mjs|tsx|jsx)$/.test(id)) return null;
+			const [filePath, query = ""] = id.split("?");
+			if (!(filePath.endsWith(".vue") && (!query || /(^|&)(vue|type=script)(&|$)/.test(query))) && !/\.(ts|js|mts|mjs|tsx|jsx)$/.test(filePath)) return null;
 			if (!hasDefineActionCall(code)) return null;
 			if (transformOptions?.ssr === true) {
-				const transformed = transformActionsForServer(code, id, root);
+				const transformed = transformActionsForServer(code, filePath, root);
 				return transformed ? { code: transformed } : null;
 			}
-			const transformed = transformActionsForClient(code, id, root);
+			const transformed = transformActionsForClient(code, filePath, root);
 			return transformed ? { code: transformed } : null;
 		}
 	};

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as defineVirtualModule, c as useVirtualRegistry, i as VirtualModuleTransform, n as VirtualModuleContext, o as defineVirtualModulePrefix, r as VirtualModuleRegistry, s as resetVirtualRegistry, t as VirtualModule } from "./virtual-registry-BF0jYPle.js";
+import { a as VirtualModuleTransform, c as defineVirtualModulePrefix, i as VirtualModuleResolver, l as resetVirtualRegistry, n as VirtualModuleContext, o as createVirtualRegistry, r as VirtualModuleRegistry, s as defineVirtualModule, t as VirtualModule, u as useVirtualRegistry } from "./virtual-registry-CaU8k-YP.js";
 import { CompiledLayout, CompiledMiddleware, CompiledPage, CompiledRoute } from "@ubean/routes";
 import { ScannedApiRoute, ScannedLocale, ScannedMiddleware, ScannedPageRoute } from "@ubean/scan";
 //#region src/macros.d.ts
@@ -96,4 +96,4 @@ export declare function createMetaVirtualModule(): VirtualModule;
 export declare function createAppVirtualModule(apiRoutes: ScannedApiRoute[], middlewares: ScannedMiddleware[], pages: ScannedPageRoute[], srcDir: string): VirtualModule;
 export declare function createLocalesVirtualModule(_locales: ScannedLocale[], defaultLocale: string | undefined, srcDir?: string, i18nConfigJson?: string): VirtualModule;
 //#endregion
-export { type VirtualModule, type VirtualModuleContext, VirtualModuleRegistry, type VirtualModuleTransform, defineVirtualModule, defineVirtualModulePrefix, resetVirtualRegistry, useVirtualRegistry };
+export { type VirtualModule, type VirtualModuleContext, VirtualModuleRegistry, type VirtualModuleResolver, type VirtualModuleTransform, createVirtualRegistry, defineVirtualModule, defineVirtualModulePrefix, resetVirtualRegistry, useVirtualRegistry };

package/dist/index.js

@@ -1,4 +1,3 @@
-import { a as useVirtualRegistry, i as resetVirtualRegistry, n as defineVirtualModule, r as defineVirtualModulePrefix, t as VirtualModuleRegistry } from "./virtual-registry-BWkaQHXN.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-vLkLkAfT.js";
-import { a as ssrSingletonProdOptimizeExclude, c as getCssImports, d as resetModuleRegistry, i as ssrSingletonDevPolicy, l as registerComponentResolver, n as SSR_SINGLETON_OPTIMIZE_EXCLUDE, o as ssrSingletonProdSsr, r as SSR_SINGLETON_PACKAGES, s as getComponentResolvers, t as SSR_SINGLETON_DEDUPE, u as registerCssImport } from "./ssr-singleton-CEQi_H6-.js";
-export { SSR_SINGLETON_DEDUPE, SSR_SINGLETON_OPTIMIZE_EXCLUDE, SSR_SINGLETON_PACKAGES, VirtualModuleRegistry, createAppVirtualModule, createLocalesVirtualModule, createMetaVirtualModule, createPagesVirtualModule, createRoutingVirtualModule, defineVirtualModule, defineVirtualModulePrefix, getComponentResolvers, getCssImports, registerComponentResolver, registerCssImport, resetModuleRegistry, resetVirtualRegistry, ssrSingletonDevPolicy, ssrSingletonProdOptimizeExclude, ssrSingletonProdSsr, stripMacros, transformMacros, useVirtualRegistry };
+import { _ as resetVirtualRegistry, a as ssrSingletonProdOptimizeExclude, c as getComponentResolvers, d as registerCssImport, f as resetModuleRegistry, g as defineVirtualModulePrefix, h as defineVirtualModule, i as ssrSingletonDevPolicy, l as getCssImports, m as createVirtualRegistry, n as SSR_SINGLETON_OPTIMIZE_EXCLUDE, o as ssrSingletonProdSsr, p as VirtualModuleRegistry, r as SSR_SINGLETON_PACKAGES, t as SSR_SINGLETON_DEDUPE, u as registerComponentResolver, v as useVirtualRegistry } from "./ssr-singleton-DPTawJSx.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-CvGWlsXj.js";
+export { SSR_SINGLETON_DEDUPE, SSR_SINGLETON_OPTIMIZE_EXCLUDE, SSR_SINGLETON_PACKAGES, VirtualModuleRegistry, createAppVirtualModule, createLocalesVirtualModule, createMetaVirtualModule, createPagesVirtualModule, createRoutingVirtualModule, createVirtualRegistry, defineVirtualModule, defineVirtualModulePrefix, getComponentResolvers, getCssImports, registerComponentResolver, registerCssImport, resetModuleRegistry, resetVirtualRegistry, ssrSingletonDevPolicy, ssrSingletonProdOptimizeExclude, ssrSingletonProdSsr, stripMacros, transformMacros, useVirtualRegistry };

package/dist/prerender.d.ts

@@ -1,4 +1,4 @@
-import { PrerenderConfig, PrerenderResult, RouteRule } from "@ubean/config";
+import { PrerenderConfig, PrerenderResult, ResolvedPrerenderConfig, RouteRule } from "@ubean/config";
 import { ScannedPageRoute } from "@ubean/scan";
 import { RouteRule as RouteRule$1 } from "@ubean/shared";
 //#region src/prerender.d.ts
@@ -128,6 +128,18 @@ export interface ExtractedPayload {
  */
 export declare function extractDataPayload(html: string, route: string): ExtractedPayload | null;
 export declare function writePrerenderedFile(filePath: string, html: string): Promise<void>;
+/**
+ * 预渲染产物的落盘目录（**唯一**计算处，`prerender()` 与搜索索引共用）。
+ *
+ * 优先用显式配置的 `prerender.staticDir`；未配置时从**本次构建的** `build.outputDir` 派生为
+ * `<outputDir>/public`。
+ *
+ * 为什么不能给 `staticDir` 一个写死的默认值（曾经是 `'dist/public'`）：`build.outputDir` 会被
+ * preset（`dist/aws` 等）与 `--outDir` 改动，而写死的默认值不跟着动 —— 实测 `ubean build --outDir
+ * .temp-x` 的客户端产物落在 `.temp-x/public`，预渲染 HTML 却写进了 `dist/public`：产物被劈成两
+ * 半，且失败是静默的（两边都不报错，只有产物树里少文件）。
+ */
+export declare function resolvePrerenderStaticDir(cwd: string, buildOutputDir: string, prerenderConfig: Pick<ResolvedPrerenderConfig, 'staticDir'>): string;
 export declare function prerender(options: PrerendererOptions): Promise<PrerenderResult>;
 export declare function generatePrerenderManifest(result: PrerenderResult, baseUrl?: string): {
   routes: string[];

package/dist/prerender.js

@@ -1,8 +1,8 @@
 import { STATIC_NOT_FOUND_ROUTE } from "./static-render.js";
-import { dirname, join } from "pathe";
+import { dirname, isAbsolute, join } from "pathe";
 import { resolvePrerenderConfig } from "@ubean/config";
-import { DATA_PAYLOAD_ID } from "@ubean/pages";
 import { mkdir, writeFile } from "node:fs/promises";
+import { DATA_PAYLOAD_ID } from "@ubean/pages";
 import { matchGlob } from "@ubean/shared";
 //#region src/prerender.ts
 const LINK_REGEX = /<a[^>]+href=["']([^"']+)["'][^>]*>/gi;
@@ -196,6 +196,21 @@ const _logger = {
 	success: (msg) => console.log(msg),
 	debug: (_msg) => {}
 };
+/**
+* 预渲染产物的落盘目录（**唯一**计算处，`prerender()` 与搜索索引共用）。
+*
+* 优先用显式配置的 `prerender.staticDir`；未配置时从**本次构建的** `build.outputDir` 派生为
+* `<outputDir>/public`。
+*
+* 为什么不能给 `staticDir` 一个写死的默认值（曾经是 `'dist/public'`）：`build.outputDir` 会被
+* preset（`dist/aws` 等）与 `--outDir` 改动，而写死的默认值不跟着动 —— 实测 `ubean build --outDir
+* .temp-x` 的客户端产物落在 `.temp-x/public`，预渲染 HTML 却写进了 `dist/public`：产物被劈成两
+* 半，且失败是静默的（两边都不报错，只有产物树里少文件）。
+*/
+function resolvePrerenderStaticDir(cwd, buildOutputDir, prerenderConfig) {
+	if (prerenderConfig.staticDir) return isAbsolute(prerenderConfig.staticDir) ? prerenderConfig.staticDir : join(cwd, prerenderConfig.staticDir);
+	return isAbsolute(buildOutputDir) ? join(buildOutputDir, "public") : join(cwd, buildOutputDir, "public");
+}
 async function prerender(options) {
 	const startTime = Date.now();
 	const config = resolvePrerenderConfig(options.prerender);
@@ -207,7 +222,7 @@ async function prerender(options) {
 		skipped: [],
 		duration: 0
 	};
-	const outputDir = join(options.cwd, config.staticDir);
+	const outputDir = resolvePrerenderStaticDir(options.cwd, options.outputDir, config);
 	const { routes: initialRoutes, skipped: initiallySkipped } = collectPrerenderRoutes(options.pages, {
 		all: config.all,
 		include: config.include,
@@ -309,4 +324,4 @@ function generatePrerenderManifest(result, baseUrl = "/") {
 	};
 }
 //#endregion
-export { collectPrerenderRoutes, extractDataPayload, extractLinks, extractPrerenderRoutesFromRules, generatePrerenderManifest, prerender, routeToDataFilePath, routeToFilePath, writePrerenderedFile };
+export { collectPrerenderRoutes, extractDataPayload, extractLinks, extractPrerenderRoutesFromRules, generatePrerenderManifest, prerender, resolvePrerenderStaticDir, routeToDataFilePath, routeToFilePath, writePrerenderedFile };

package/dist/production.d.ts

@@ -1,6 +1,20 @@
+import { r as VirtualModuleRegistry } from "./virtual-registry-CaU8k-YP.js";
 import { ResolvedConfig } from "@ubean/config";
-import { ScanResult } from "@ubean/scan";
 import { Preset } from "@ubean/preset";
+import { ScanResult } from "@ubean/scan";
+import { Plugin } from "vite";
+//#region src/vite/build-app.d.ts
+/**
+ * 一次 `createBuilder` 完成整套生产构建（`ubean build` 与 `vite build` 共用的唯一编排）。
+ *
+ * **驱动权声明**：本函数自己就是编排者，因此先在环境里声明「构建由调用方驱动」，让插件侧的
+ * `config` 钩子**不要**再注册它自己的 `builder.buildApp` —— 否则同一个 config 的 `builder` 字段
+ * 会被插件返回值合并掉，本函数的内联编排不再执行、`manifest` 保持 undefined，表现为**静默返回
+ * undefined**（RM-V36 把开关默认打开后由 `build-parity.test.ts` 实测撞到）。与 CLI 用的是同一个
+ * 环境变量，结束后还原，避免影响同进程内的其它调用。
+ */
+export declare function buildWithEnvironments(options: BuildOptions): Promise<BuildManifest>;
+//#endregion
 //#region src/production.d.ts
 export interface BuildOptions {
   cwd: string;
@@ -24,5 +38,47 @@ export interface BuildManifest {
   serverDir: string;
   preset: string;
 }
-export declare function buildProduction(options: BuildOptions): Promise<BuildManifest>;
+/**
+ * 把扫描到的页面序列化进服务端入口（`const _pages = [...]`）。
+ *
+ * **白名单必须覆盖语义字段**：此前只序列化了 `relativePath/name/route/layout/reuseTarget/isReuse/
+ * pageMeta`，于是 `matchers` / `slot` **在生产构建里丢失** ——
+ * dev 用扫描得到的活对象（`enhanceDevApp` / `buildDevSsrRoutes` 直接拿 `scanResult.pages`），所以本地
+ * 一切正常，只有构建产物坏掉：带着 `[id=numeric]` 的路由在 dev 返回 404、在生产返回 200（实测）。
+ * 这类「dev 正常、产物丢失元数据」的缺陷对用户最不友好，因此单独抽成函数并配单测
+ * （`packages/builder/test/page-metadata.test.ts`）。
+ *
+ * 不含 `fullPath`/`dirname`/`basename`（构建机上的文件系统细节，产物不需要）与 `frontmatter`
+ * （Markdown 页正文用，服务端路由不消费）。拦截路由的两个字段（`interceptFrom` /
+ * `interceptTarget`）曾在这份白名单里，随该约定一起移除（[docs/adr/0010] 刻意不做）。
+ */
+export declare function serializePagesForEntry(pages: ScanResult['pages']): string;
+export declare function generateVirtualModulesToDisk(cwd: string, config: ResolvedConfig, scanResult: ScanResult, virtualDir: string, preset: Preset, registry: VirtualModuleRegistry, contentSnapshot?: Record<string, unknown[]>): Promise<string>;
+export type PresetBuildConfig = ReturnType<typeof getPresetBuildConfig>;
+export declare function getPresetBuildConfig(preset: Preset): {
+  format: "esm";
+  target: string;
+  entryType: "node";
+  external: (string | RegExp)[];
+} | {
+  format: "esm";
+  target: string;
+  entryType: "worker";
+  external: (string | RegExp)[];
+} | {
+  format: "esm";
+  target: string;
+  entryType: "fetch";
+  external: (string | RegExp)[];
+};
+/**
+ * SSR 期的 islands 注册表空壳插件。
+ *
+ * 真正的注册表由 `ubeanIslandsPlugin` 在**客户端**构建期填充；SSR 期 islands 由服务端渲染
+ * （不水合），空壳即可 —— 但不能让它以裸 `virtual:ubean-islands-registry` 泄漏给 Node。
+ */
+export declare function createIslandsSsrStubPlugin(): Plugin;
+export declare function generateNodeServerEntry(): string;
+export declare function generateStandardHandlerEntry(): string;
+export declare function generateCloudflareWorkerEntry(): string;
 //#endregion