@ubean/cli 0.6.1-beta.3 → 0.6.2

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { A as readViteManifest, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as summarizeBundle, k as formatKilobytes, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-DsRdPxwe.js";
+import { A as readViteManifest, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as summarizeBundle, k as formatKilobytes, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-Fg1W_Mmr.js";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { basename, join, relative, resolve } from "pathe";
 import { getLogger, setDebugLogging, setMinLevel } from "@ubean/shared/logger";
@@ -17,13 +17,68 @@ import { ubeanIslandsPlugin } from "@ubean/islands/vite";
 import { findAvailablePort, findUserViteConfig, getLanAddresses, isLoopbackHost, isWildcardHost } from "@ubean/shared/node";
 import { execSync } from "node:child_process";
 import { createServer as createServer$1 } from "node:http";
+//#region src/shared/exit.ts
+/**
+* CLI 的退出入口。
+*
+* ## 为什么不能直接 `process.exit(code)`
+*
+* `process.exit()` 在 Windows 上会在事件循环仍有活跃异步句柄时立刻开始拆进程，这会踩到 Node 24 的
+* 一个竞态：ESM/TS loader 与未清理的 undici 连接在 close 阶段被并发释放，触发 libuv 断言，或者让
+* 进程停在那里既不退出也不崩溃。
+*
+* 本仓库 CI 的真实症状（run 37954075109，windows-latest / Node 24）：`ubean build` 已经
+* 打印了致命错误、随后**既不退出也不崩溃**，spawn 侧只能等满看门狗（120s）才失败。日志：
+*
+* ```text
+* Error: 构建未在 120000ms 内退出（挂住即为回归）
+* fixture: D:\a\ubean\ubean\packages\cli\test\fixtures\build-errors\config-not-constructible
+* 输出尾巴:
+*   Building ubean application...
+*   Class constructor Foo cannot be invoked without 'new'
+* ```
+*
+* 上游同类报告与各自的绕过方式：
+* - nodejs/node#56645 —— `Assertion failed: !(handle->flags & UV_HANDLE_CLOSING)`，仅在
+*   Windows + `process.exit()` 紧跟异步工作后出现。#61999 修的是断言面（已随 Node 24.20.0 进入
+*   LTS），并没有修「不退出」这一面。
+* - pnpm/pnpm#12121 —— 退出前先销毁自己的 undici dispatcher。
+* - silverwind/updates#137 —— **不再调用 `process.exit()`**，改用 `process.exitCode` 让事件循环
+*   自然排空（其作者在 Node 26 上发现 50ms 延时仍不彻底）。
+*
+* ## 采用的策略
+*
+* 先设 `process.exitCode`（立刻生效，即使调用方不 await，退出码也是对的），然后用一个**不保活**的
+* 定时器给出 `EXIT_GRACE_MS` 宽限期等进程自然退出；只有宽限期用尽、进程仍活着时才回退到
+* `process.exit()`：
+* - 间歇故障路径（Windows）：进程自然排空，绕开竞态；
+* - 真挂住（tinypool worker 池、prerender 动态导入的 SSR entry）：最多多等 `EXIT_GRACE_MS`，
+*   之后仍由强制退出兜底 —— 与旧实现行为一致，只是晚 1.5s。
+*
+* 定时器必须 `unref()`：否则宽限期本身会把进程钉活满 1.5s，成功路径白白变慢。
+*/
+/** 自然退出的宽限期（ms）。超时才回退到强制退出。 */
+const EXIT_GRACE_MS = 1500;
+/**
+* 退出 CLI。**不返回**：要么进程在宽限期内自然退出，要么宽限期后被强制退出。
+*
+* @param code 退出码
+*/
+async function exitCli(code) {
+	process.exitCode = code;
+	await new Promise((resolve) => {
+		setTimeout(resolve, EXIT_GRACE_MS).unref?.();
+	});
+	process.exit(code);
+}
+//#endregion
 //#region src/config.ts
 const logger$11 = getLogger("cli");
 const CONFIG_TEMPLATE = `import { defineConfig } from 'ubean';
 
 export default defineConfig({
   srcDir: 'src',
-  preset: '{{preset}}'
+  build: { preset: '{{preset}}' }
 });
 `;
 const CONFIG_EXAMPLE_FULL = `import { defineConfig } from 'ubean';
@@ -32,27 +87,20 @@ export default defineConfig({
   // Source directory
   srcDir: 'src',
 
-  // Preset: 'standard' | 'node' | 'cloudflare'
-  preset: 'standard',
+  // Build options (platform preset lives here — a top-level \`preset\` field
+  // is silently ignored, so always nest it under \`build\`).
+  build: {
+    preset: 'standard', // 'standard' | 'node' | 'cloudflare' | 'cloudflare-dev' | 'vercel' | 'vercel-edge' | 'netlify' | 'bun' | 'deno' | 'aws' | 'azure'
+    outputDir: 'dist'
+  },
 
   // Dev server options
   dev: {
     port: 9527,
-    host: 'localhost',
-    open: false
+    host: 'localhost'
   },
 
-  // Build options
-  build: {
-    outDir: 'dist'
-  },
-
-  // View transitions
-  viewTransitions: {
-    enabled: true
-  },
-
-  // DevTools
+  // DevTools (disabled by default)
   devtools: {
     enabled: true
   }
@@ -81,7 +129,7 @@ const configCommand = {
 			args: {
 				preset: {
 					type: "string",
-					description: "Preset to use (standard, node, cloudflare)",
+					description: "Preset to use (standard, node, cloudflare, vercel, netlify, bun, deno, aws, azure, ...)",
 					default: "standard"
 				},
 				force: {
@@ -152,10 +200,7 @@ const configCommand = {
 				const cwd = process.cwd();
 				const fs = createFsOps(cwd);
 				const configFile = await findConfigFile(fs);
-				if (!configFile) {
-					logger$11.error("No config file found");
-					process.exit(1);
-				}
+				if (!configFile) return exitCli(1);
 				logger$11.info(fs.resolve(configFile));
 			}
 		}
@@ -437,9 +482,9 @@ const buildCommand = {
 			logger$9.info(`  Client assets: ${manifest.assets.length} files`);
 		} catch (err) {
 			logger$9.error(err instanceof Error ? err.message : String(err));
-			process.exit(1);
+			await exitCli(1);
 		}
-		process.exit(0);
+		await exitCli(0);
 	}
 };
 //#endregion
@@ -454,9 +499,9 @@ const buildCommand = {
 * - CLI 只装配插件、起 Vite server、打印 banner，并订阅扫描做命令级事务（类型生成、
 *   DevTools 数据上报）。
 *
-* 保留两处 CLI 专有接线（无法下沉）：`@ubean/devtools` / `@vitejs/devtools` 的按需加载
-* （可选依赖 + `config.devtools.enabled` 闸门），以及 DevTools 的 scaffold CRUD
-* （页面增删改是 CLI 的能力）。
+* 保留一处 CLI 专有接线（无法下沉）：`@ubean/devtools` / `@devframes/vite` 的按需加载
+* （可选依赖 + `config.devtools.enabled` 闸门）。DevTools 的 scaffold CRUD 由注入的
+* `scaffoldOps` 提供。
 */
 const logger$8 = getLogger("dev-server");
 /**
@@ -482,42 +527,57 @@ async function createDevViteServer(options) {
 	const isBackendMode = config.mode === "backend";
 	let viteServer = null;
 	const rescanDev = () => peekDevScanCoordinator(viteServer)?.rescan();
-	const builtinPlugins = [...hasUserViteConfig ? [] : [ubeanDevRequestPlugin({
-		passThrough: devtoolsEnabled ? [...DEVTOOLS_PASS_THROUGH_PREFIXES] : [],
-		devtoolsRedirect: devtoolsEnabled
-	})], ...hasUserViteConfig ? [] : [
-		ubeanPlugin({
-			config,
-			registry: createVirtualRegistry()
-		}),
-		...isBackendMode ? [] : ubeanVite({
-			config,
-			registry: createVirtualRegistry()
-		}),
-		...isBackendMode ? [] : [ubeanIslandsPlugin()]
-	]];
-	if (devtoolsEnabled) {
-		process.env.VITE_DEVTOOLS_DISABLE_CLIENT_AUTH = "true";
-		try {
-			const { ubeanDevtoolsPlugin } = await import("@ubean/devtools");
-			builtinPlugins.push(ubeanDevtoolsPlugin({
-				getScanResult: options.devtools?.getScanResult,
-				getConfigMeta: options.devtools?.getConfigMeta,
-				getCustomTabs: options.devtools?.getCustomTabs,
-				getCwd: () => cwd,
-				scaffoldOps: {
-					createFsOps,
-					scaffold,
-					deleteScaffold,
-					recoverScaffold
-				},
-				getApp: () => getDevApp(viteServer) ?? void 0,
-				triggerRescan: async () => {
-					await rescanDev();
-				}
-			}));
-		} catch {}
-	}
+	let refreshDevtools;
+	const devtoolsPlugins = [];
+	if (devtoolsEnabled) try {
+		const [{ viteDevframeHub }, { createUbeanDevframe, UBEAN_ANCHOR_DOCK }] = await Promise.all([import("@devframes/vite/hub"), import("@ubean/devtools")]);
+		const devframe = createUbeanDevframe({
+			getScanResult: options.devtools?.getScanResult,
+			getConfigMeta: options.devtools?.getConfigMeta,
+			getCustomTabs: options.devtools?.getCustomTabs,
+			getCwd: () => cwd,
+			scaffoldOps: {
+				createFsOps,
+				scaffold,
+				deleteScaffold,
+				recoverScaffold
+			},
+			getApp: () => getDevApp(viteServer) ?? void 0,
+			triggerRescan: async () => {
+				await rescanDev();
+			},
+			basePath: `${config.devtools.route.replace(/\/$/, "")}/`,
+			registerRefresh: (fn) => {
+				refreshDevtools = fn;
+			}
+		});
+		devtoolsPlugins.push(viteDevframeHub({
+			devframes: [{
+				devframe,
+				dock: UBEAN_ANCHOR_DOCK
+			}],
+			quiet: true,
+			auth: false
+		}));
+	} catch {}
+	const builtinPlugins = [
+		...devtoolsPlugins,
+		...hasUserViteConfig ? [] : [ubeanDevRequestPlugin({
+			passThrough: devtoolsEnabled ? [...DEVTOOLS_PASS_THROUGH_PREFIXES] : [],
+			devtoolsRedirect: devtoolsEnabled
+		})],
+		...hasUserViteConfig ? [] : [
+			ubeanPlugin({
+				config,
+				registry: createVirtualRegistry()
+			}),
+			...isBackendMode ? [] : ubeanVite({
+				config,
+				registry: createVirtualRegistry()
+			}),
+			...isBackendMode ? [] : [ubeanIslandsPlugin()]
+		]
+	];
 	const { plugins } = await resolveModules({
 		cwd,
 		config,
@@ -535,11 +595,6 @@ async function createDevViteServer(options) {
 		},
 		appType: "custom",
 		plugins,
-		devtools: {
-			enabled: devtoolsEnabled,
-			clientAuth: false,
-			builtinDevTools: false
-		},
 		optimizeDeps: { exclude: [
 			"ubean",
 			"vue-router",
@@ -586,6 +641,9 @@ async function createDevViteServer(options) {
 		async rescan() {
 			await rescanDev();
 		},
+		refreshDevtools() {
+			refreshDevtools?.();
+		},
 		async stop() {
 			const server = viteServer;
 			viteServer = null;
@@ -730,6 +788,7 @@ const devCommand = {
 				if (logging.lifecycle) logger$6.info(`File change detected: ${lastChangedFile}`);
 			}
 			currentScanResult = result;
+			devServer?.refreshDevtools();
 			try {
 				await generateTypes(result, {
 					cwd,
@@ -790,12 +849,12 @@ const devCommand = {
 			});
 		} catch (err) {
 			logger$6.error(err?.stack || err?.message || String(err));
-			process.exit(1);
+			await exitCli(1);
 		}
 		const cleanup = async () => {
 			if (logging.lifecycle) logger$6.info("\nShutting down...");
 			await devServer?.stop();
-			process.exit(0);
+			await exitCli(0);
 		};
 		process.on("SIGINT", cleanup);
 		process.on("SIGTERM", cleanup);
@@ -854,11 +913,13 @@ const devtoolsCommand = {
 				logger$5.info("");
 				logger$5.info("  Access:");
 				logger$5.info("    - Start dev server: pnpm dev");
-				logger$5.info("    - Open DevTools: Press Shift+Alt+D in the browser, or visit /__ubean/devtools/");
+				logger$5.info("    - Open the DevTools URL printed in the dev server banner (default /_devtools)");
+				logger$5.info("      which redirects to the devframe hub shell.");
 				logger$5.info("");
 				logger$5.info("  Configuration (ubean.config.ts):");
 				logger$5.info("    devtools: {");
 				logger$5.info("      enabled: true,     // Enable/disable DevTools (dev only)");
+				logger$5.info("      route: '/_devtools'  // Panel path (optional)");
 				logger$5.info("    }");
 				logger$5.info("");
 				logger$5.info("  Features:");
@@ -884,7 +945,7 @@ const devtoolsCommand = {
 			} },
 			async run({ args }) {
 				const port = args.port;
-				logger$5.info(`http://localhost:${port}/__ubean/devtools/`);
+				logger$5.info(`http://localhost:${port}/_devtools`);
 			}
 		}
 	}
@@ -1297,7 +1358,7 @@ const initCommand = {
 		},
 		preset: {
 			type: "string",
-			description: "Target preset (standard/node/cloudflare)"
+			description: "Target preset (any registered preset; the interactive menu offers standard/node/cloudflare)"
 		},
 		packageManager: {
 			type: "string",
@@ -1630,7 +1691,7 @@ const previewCommand = {
 		} catch (err) {
 			if (err?.code === "EADDRINUSE") logger$1.error(`Port ${requestedPort} is already in use${host ? ` on ${host}` : ""}. Try a different port or remove the --strictPort flag.`);
 			else logger$1.error(`Failed to resolve a port: ${err?.message || String(err)}`);
-			process.exit(1);
+			return exitCli(1);
 		}
 		if (actualPort !== requestedPort) logger$1.warn(`Port ${requestedPort} is in use, trying ${actualPort} instead.`);
 		const label = (text) => dim(text);
@@ -1645,13 +1706,13 @@ const previewCommand = {
 		if (!existsSync(requiredArtifact)) {
 			logger$1.error(`Build output not found: ${requiredArtifact}`);
 			logger$1.info("Run `ubean build` first to create a production build.");
-			process.exit(1);
+			return exitCli(1);
 		}
 		if (isCloudflare) {
 			const probe = await createCloudflarePreviewRunner({ workerPath: requiredArtifact });
 			if (!probe.ok) {
 				logger$1.error(probe.message);
-				process.exit(1);
+				return exitCli(1);
 			}
 			await probe.runner.dispose();
 		}
@@ -1676,7 +1737,7 @@ const previewCommand = {
 		} catch (err) {
 			if (!staticMode) {
 				logger$1.error(`Failed to start the preview server: ${err instanceof Error ? err.message : String(err)}`);
-				process.exit(1);
+				return exitCli(1);
 			}
 			logger$1.warn(`Vite preview unavailable (${err instanceof Error ? err.message : String(err)}); falling back to the built-in static server.`);
 			const fallback = startStaticServer({
@@ -1687,8 +1748,8 @@ const previewCommand = {
 			});
 			printBanner(actualPort, `static (${mode})`);
 			const cleanupFallback = () => {
-				fallback.close(() => process.exit(0));
-				setTimeout(() => process.exit(0), 1e3).unref();
+				fallback.close(() => void exitCli(0));
+				setTimeout(() => void exitCli(0), 1e3).unref();
 			};
 			process.on("SIGINT", cleanupFallback);
 			process.on("SIGTERM", cleanupFallback);
@@ -1696,8 +1757,8 @@ const previewCommand = {
 		}
 		printBanner(actualPort, staticMode ? `static (${mode})` : "production");
 		const cleanup = () => {
-			server?.close().catch(() => void 0).finally(() => process.exit(0));
-			setTimeout(() => process.exit(0), 1e3).unref();
+			server?.close().catch(() => void 0).finally(() => void exitCli(0));
+			setTimeout(() => void exitCli(0), 1e3).unref();
 		};
 		process.on("SIGINT", cleanup);
 		process.on("SIGTERM", cleanup);
@@ -1919,7 +1980,7 @@ const main = defineCommand({
 					description: "Print the scaffold JSON manifest (RM-S01)"
 				},
 				async run() {
-					const { getScaffoldManifest } = await import("./scaffold-manifest-TrH6OCX8.js").then((n) => n.r);
+					const { getScaffoldManifest } = await import("./scaffold-manifest-DzxRu2yz.js").then((n) => n.r);
 					process.stdout.write(`${JSON.stringify(getScaffoldManifest(), null, 2)}\n`);
 				}
 			} }

package/dist/index.js

@@ -1,3 +1,3 @@
-import { n as getScaffoldManifest, t as SCAFFOLD_CONTRACT_VERSION } from "./scaffold-manifest-TrH6OCX8.js";
-import { A as readViteManifest, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, T as toPascalCase, _ as renderCronTemplate, a as scaffold, b as renderPageTemplate, d as CRON_TEMPLATE, f as LAYOUT_TEMPLATE, g as renderApiTemplate, h as PLUGIN_TEMPLATE, i as recoverScaffold, j as summarizeBundle, m as PAGE_TEMPLATE, n as listScaffoldableFiles, p as MIDDLEWARE_TEMPLATE, t as deleteScaffold, u as API_TEMPLATE, v as renderLayoutTemplate, w as toKebabCase, x as renderPluginTemplate, y as renderMiddlewareTemplate } from "./page-DsRdPxwe.js";
+import { n as getScaffoldManifest, t as SCAFFOLD_CONTRACT_VERSION } from "./scaffold-manifest-DzxRu2yz.js";
+import { A as readViteManifest, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, M as writeBundleBaseline, O as findClientManifest, S as renderTemplate, T as toPascalCase, _ as renderCronTemplate, a as scaffold, b as renderPageTemplate, d as CRON_TEMPLATE, f as LAYOUT_TEMPLATE, g as renderApiTemplate, h as PLUGIN_TEMPLATE, i as recoverScaffold, j as summarizeBundle, m as PAGE_TEMPLATE, n as listScaffoldableFiles, p as MIDDLEWARE_TEMPLATE, t as deleteScaffold, u as API_TEMPLATE, v as renderLayoutTemplate, w as toKebabCase, x as renderPluginTemplate, y as renderMiddlewareTemplate } from "./page-Fg1W_Mmr.js";
 export { API_TEMPLATE, CRON_TEMPLATE, LAYOUT_TEMPLATE, MIDDLEWARE_TEMPLATE, PAGE_TEMPLATE, PLUGIN_TEMPLATE, SCAFFOLD_CONTRACT_VERSION, compareBundleBaseline, createFsOps, deleteScaffold, findClientManifest, getScaffoldManifest, listScaffoldableFiles, readViteManifest, recoverScaffold, renderApiTemplate, renderCronTemplate, renderLayoutTemplate, renderMiddlewareTemplate, renderPageTemplate, renderPluginTemplate, renderTemplate, scaffold, summarizeBundle, toCamelCase, toKebabCase, toPascalCase, writeBundleBaseline };

package/dist/{page-DsRdPxwe.js → page-Fg1W_Mmr.js}

@@ -464,7 +464,7 @@ const UBEAN_CONFIG = `import { defineConfig } from 'ubean';
 
 export default defineConfig({
   srcDir: 'src',
-  preset: '{{preset}}',
+  build: { preset: '{{preset}}' },
   i18n: {
     defaultLocale: 'zh',
     locales: ['en', 'zh'],
@@ -1159,7 +1159,7 @@ const UBEAN_CONFIG_BASE = `import { defineConfig } from 'ubean';
 
 export default defineConfig({
   srcDir: 'src',
-  preset: '{{preset}}'
+  build: { preset: '{{preset}}' }
 });
 `;
 /** 基础 README — minimal/starter/blog 共用 */
@@ -1391,7 +1391,7 @@ function getDirForType(cwd, type) {
 		case "api": return join(srcDir, "routes");
 		case "layout": return join(srcDir, "layouts");
 		case "middleware": return join(srcDir, "middleware");
-		case "cron": return join(srcDir, "server", "crons");
+		case "cron": return join(srcDir, "crons");
 		case "plugin": return join(srcDir, "plugins");
 		default: return srcDir;
 	}

package/dist/{scaffold-manifest-TrH6OCX8.js → scaffold-manifest-DzxRu2yz.js}

@@ -69,7 +69,7 @@ const TYPES = [
 	{
 		type: "cron",
 		cli: true,
-		baseDir: "server/crons",
+		baseDir: "crons",
 		extensions: [".ts"],
 		args: [{
 			name: "path",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.6.1-beta.3",
+  "version": "0.6.2",
   "description": "CLI for ubean (ubean-next binary: dev, build, prepare, init, preview, page, env, config, devtools, api/layout/middleware/cron/plugin scaffolds) plus the Vite dev server runner",
   "bin": {
     "ubean-next": "./bin/ubean-next.mjs"
@@ -24,27 +24,27 @@
     }
   },
   "dependencies": {
-    "@ubean/build": "0.6.1-beta.3",
-    "@ubean/config": "0.6.1-beta.3",
-    "@ubean/i18n": "0.6.1-beta.3",
-    "@ubean/islands": "0.6.1-beta.3",
-    "@ubean/preset": "0.6.1-beta.3",
-    "@ubean/scan": "0.6.1-beta.3",
-    "@ubean/shared": "0.6.1-beta.3",
+    "@ubean/build": "0.6.2",
+    "@ubean/config": "0.6.2",
+    "@ubean/i18n": "0.6.2",
+    "@ubean/islands": "0.6.2",
+    "@ubean/preset": "0.6.2",
+    "@ubean/scan": "0.6.2",
+    "@ubean/shared": "0.6.2",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@types/node": "^26.6.4",
+    "@types/node": "^26.6.5",
     "env-runner": "0.3.3",
     "typescript": "npm:typescript-native-bridge@latest",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
     "vite-plus": "1.1.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.6.1-beta.3",
-    "@ubean/devtools": "0.6.1-beta.3",
+    "@ubean/content": "0.6.2",
+    "@ubean/devtools": "0.6.2",
     "@vitejs/plugin-vue": "^6.0.8",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0"
   },