@ubean/cli 0.6.1 → 0.6.3

package/dist/cli.js

@@ -3,7 +3,7 @@ import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { basename, join, relative, resolve } from "pathe";
 import { getLogger, setDebugLogging, setMinLevel } from "@ubean/shared/logger";
 import { defineCommand, runMain } from "citty";
-import { BUILTIN_MODULES, isBuiltinDisabled, loadUbeanConfig, resolveModules, resolvePrerenderConfig, resolveSsrConfig } from "@ubean/config";
+import { checkProjectDependencies, loadUbeanConfig, resolveModules, resolvePrerenderConfig, resolveSsrConfig } from "@ubean/config";
 import { readFile, rm } from "node:fs/promises";
 import { generateOpenApiTypesFromServer, generateTypes } from "@ubean/build/codegen";
 import { buildWithEnvironments } from "@ubean/build/production";
@@ -15,7 +15,6 @@ import { DEVTOOLS_PASS_THROUGH_PREFIXES, createCloudflarePreviewRunner, createVi
 import { ubeanVite } from "@ubean/build/vue";
 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
 /**
@@ -90,7 +89,7 @@ export default defineConfig({
   // 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' | 'vercel' | 'netlify' | 'bun' | 'deno' | 'aws' | 'azure'
+    preset: 'standard', // 'standard' | 'node' | 'cloudflare' | 'cloudflare-dev' | 'vercel' | 'vercel-edge' | 'netlify' | 'bun' | 'deno' | 'aws' | 'azure'
     outputDir: 'dist'
   },
 
@@ -499,9 +498,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");
 /**
@@ -527,42 +526,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,
@@ -580,11 +594,6 @@ async function createDevViteServer(options) {
 		},
 		appType: "custom",
 		plugins,
-		devtools: {
-			enabled: devtoolsEnabled,
-			clientAuth: false,
-			builtinDevTools: false
-		},
 		optimizeDeps: { exclude: [
 			"ubean",
 			"vue-router",
@@ -631,6 +640,9 @@ async function createDevViteServer(options) {
 		async rescan() {
 			await rescanDev();
 		},
+		refreshDevtools() {
+			refreshDevtools?.();
+		},
 		async stop() {
 			const server = viteServer;
 			viteServer = null;
@@ -775,6 +787,7 @@ const devCommand = {
 				if (logging.lifecycle) logger$6.info(`File change detected: ${lastChangedFile}`);
 			}
 			currentScanResult = result;
+			devServer?.refreshDevtools();
 			try {
 				await generateTypes(result, {
 					cwd,
@@ -899,11 +912,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:");
@@ -929,7 +944,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`);
 			}
 		}
 	}
@@ -1398,147 +1413,10 @@ async function ensureBuildDir(cwd, buildDir) {
 	const fullPath = join(cwd, buildDir);
 	if (!existsSync(fullPath)) mkdirSync(fullPath, { recursive: true });
 }
-/**
-* Detects the package manager used in the project by inspecting lockfiles.
-* Priority: pnpm > yarn > bun > npm (npm as default fallback).
-*
-* 导出供单测复用（OPT-04 4c）。
-*/
-function detectPackageManager(cwd) {
-	if (existsSync(join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-	if (existsSync(join(cwd, "yarn.lock"))) return "yarn";
-	if (existsSync(join(cwd, "bun.lockb")) || existsSync(join(cwd, "bun.lock"))) return "bun";
-	return "npm";
-}
-/**
-* Builds the install command args for a given package manager and package list.
-* Examples:
-*   pnpm → ['add', '@ubean/integrations@^0.1.3']
-*   npm  → ['install', '@ubean/integrations@^0.1.3']
-*
-* 导出供单测复用（OPT-04 4c）。
-*/
-function buildInstallCommand(pm, packages) {
-	switch (pm) {
-		case "pnpm": return {
-			cmd: "pnpm",
-			args: ["add", ...packages]
-		};
-		case "yarn": return {
-			cmd: "yarn",
-			args: ["add", ...packages]
-		};
-		case "bun": return {
-			cmd: "bun",
-			args: ["add", ...packages]
-		};
-		default: return {
-			cmd: "npm",
-			args: ["install", ...packages]
-		};
-	}
-}
-/**
-* Extracts the bare package name from a module path.
-*   '@ubean/integrations/pwa' → '@ubean/integrations'
-*   '@ubean/icon/vite'        → '@ubean/icon'
-*
-* 导出供单测复用（OPT-04 4c）。
-*/
-function extractPackageName(modulePath) {
-	if (modulePath.startsWith("@")) return modulePath.split("/").slice(0, 2).join("/");
-	return modulePath.split("/")[0];
-}
-/**
-* Reads the `ubean` package version from the project's package.json so we can
-* install matching versions of `@ubean/*` extension packages.
-* Returns `null` if ubean isn't declared or version can't be parsed.
-*
-* 导出供单测复用（OPT-04 4c）。
-*/
-function getUbeanVersion(cwd) {
-	try {
-		const pkgPath = join(cwd, "package.json");
-		if (!existsSync(pkgPath)) return null;
-		const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-		const spec = pkg.dependencies?.ubean || pkg.devDependencies?.ubean;
-		if (!spec) return null;
-		const match = spec.match(/\d+\.\d+\.\d+/);
-		return match ? match[0] : null;
-	} catch {
-		return null;
-	}
-}
-/**
-* Probes whether a module is importable (i.e., installed in node_modules).
-* Uses dynamic import — same mechanism as `loadBuiltinModule` so detection
-* behavior matches what the runtime will actually encounter.
-*/
-async function isModuleInstalled(modulePath) {
-	try {
-		await import(
-			/* @vite-ignore */
-			modulePath
-);
-		return true;
-	} catch {
-		return false;
-	}
-}
-/**
-* Detects built-in modules enabled in config but not installed, and
-* auto-installs them using the project's package manager.
-*
-* Behavior:
-* - When `autoInstall` is `false`, only prints warnings with install commands.
-* - When `autoInstall` is `true` and a package.json exists, runs the install.
-* - Version pinning: installs `@ubean/<pkg>@^<ubean-version>` to keep in sync.
-* - Failures fall back to warnings (non-fatal — prepare should still proceed).
-*/
-async function ensureBuiltinModules(cwd, config, autoInstall) {
-	const missing = [];
-	for (const builtin of BUILTIN_MODULES) {
-		const configValue = config[builtin.key];
-		if (isBuiltinDisabled(configValue)) continue;
-		const packageName = extractPackageName(builtin.modulePath);
-		if (!await isModuleInstalled(builtin.modulePath)) missing.push({
-			key: builtin.key,
-			packageName
-		});
-	}
-	if (missing.length === 0) return;
-	const pm = detectPackageManager(cwd);
-	const ubeanVersion = getUbeanVersion(cwd);
-	const packagesToInstall = missing.map((m) => ubeanVersion ? `${m.packageName}@^${ubeanVersion}` : m.packageName);
-	if (!autoInstall || !existsSync(join(cwd, "package.json"))) {
-		for (const m of missing) {
-			const versionSuffix = ubeanVersion ? `@^${ubeanVersion}` : "";
-			logger$2.warn(`Built-in module "${m.key}" is enabled but \`${m.packageName}\` is not installed. Run: ${pm} add ${m.packageName}${versionSuffix}`);
-		}
-		return;
-	}
-	logger$2.info(`Auto-installing missing built-in module packages: ${packagesToInstall.join(", ")}`);
-	logger$2.info(`Using package manager: ${pm}`);
-	const { cmd, args } = buildInstallCommand(pm, packagesToInstall);
-	try {
-		execSync([cmd, ...args].join(" "), {
-			cwd,
-			stdio: "inherit",
-			env: { ...process.env }
-		});
-		logger$2.info(`Installed: ${packagesToInstall.join(", ")}`);
-	} catch (err) {
-		logger$2.error(`Failed to auto-install packages: ${err instanceof Error ? err.message : String(err)}`);
-		for (const m of missing) {
-			const versionSuffix = ubeanVersion ? `@^${ubeanVersion}` : "";
-			logger$2.warn(`Please install manually: ${pm} add ${m.packageName}${versionSuffix}`);
-		}
-	}
-}
 const prepareCommand = {
 	meta: {
 		name: "prepare",
-		description: "Generate type definitions and prepare the project (runs automatically before dev/build)"
+		description: "Generate type definitions and check project dependencies"
 	},
 	args: {
 		cwd: {
@@ -1548,7 +1426,7 @@ const prepareCommand = {
 		},
 		install: {
 			type: "boolean",
-			description: "Auto-install missing built-in module packages (use --no-install to skip)",
+			description: "Prompt to install missing project dependencies (use --no-install to only warn)",
 			default: true
 		}
 	},
@@ -1556,7 +1434,16 @@ const prepareCommand = {
 		const cwd = resolve(args.cwd || process.cwd());
 		logger$2.info(`Preparing ubean project at ${cwd}...`);
 		const config = await loadUbeanConfig(cwd);
-		await ensureBuiltinModules(cwd, config, args.install !== false);
+		await checkProjectDependencies({
+			cwd,
+			config,
+			srcDir: config.srcDir,
+			mode: args.install !== false ? "prompt" : "warn",
+			logger: {
+				info: (message) => logger$2.info(message),
+				warn: (message) => logger$2.warn(message)
+			}
+		});
 		const typesDir = ".ubean";
 		await ensureBuildDir(cwd, typesDir);
 		logger$2.info("Scanning project files...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "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,29 +24,29 @@
     }
   },
   "dependencies": {
-    "@ubean/build": "0.6.1",
-    "@ubean/config": "0.6.1",
-    "@ubean/i18n": "0.6.1",
-    "@ubean/islands": "0.6.1",
-    "@ubean/preset": "0.6.1",
-    "@ubean/scan": "0.6.1",
-    "@ubean/shared": "0.6.1",
+    "@ubean/build": "0.6.3",
+    "@ubean/config": "0.6.3",
+    "@ubean/i18n": "0.6.3",
+    "@ubean/islands": "0.6.3",
+    "@ubean/preset": "0.6.3",
+    "@ubean/scan": "0.6.3",
+    "@ubean/shared": "0.6.3",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
     "@types/node": "^26.6.5",
-    "env-runner": "0.3.3",
+    "env-runner": "0.3.4",
     "typescript": "npm:typescript-native-bridge@latest",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
-    "vite-plus": "1.1.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
+    "vite-plus": "1.3.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.6.1",
-    "@ubean/devtools": "0.6.1",
+    "@ubean/content": "0.6.3",
+    "@ubean/devtools": "0.6.3",
     "@vitejs/plugin-vue": "^6.0.8",
-    "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0"
+    "vite": "npm:@voidzero-dev/vite-plus-core@1.3.0"
   },
   "peerDependenciesMeta": {
     "@ubean/content": {