@ubean/cli 0.6.1 → 0.6.2

package/dist/cli.js

@@ -90,7 +90,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 +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");
 /**
@@ -527,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,
@@ -580,11 +595,6 @@ async function createDevViteServer(options) {
 		},
 		appType: "custom",
 		plugins,
-		devtools: {
-			enabled: devtoolsEnabled,
-			clientAuth: false,
-			builtinDevTools: false
-		},
 		optimizeDeps: { exclude: [
 			"ubean",
 			"vue-router",
@@ -631,6 +641,9 @@ async function createDevViteServer(options) {
 		async rescan() {
 			await rescanDev();
 		},
+		refreshDevtools() {
+			refreshDevtools?.();
+		},
 		async stop() {
 			const server = viteServer;
 			viteServer = null;
@@ -775,6 +788,7 @@ const devCommand = {
 				if (logging.lifecycle) logger$6.info(`File change detected: ${lastChangedFile}`);
 			}
 			currentScanResult = result;
+			devServer?.refreshDevtools();
 			try {
 				await generateTypes(result, {
 					cwd,
@@ -899,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:");
@@ -929,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`);
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.6.1",
+  "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,13 +24,13 @@
     }
   },
   "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.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"
@@ -43,8 +43,8 @@
     "vite-plus": "1.1.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.6.1",
-    "@ubean/devtools": "0.6.1",
+    "@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"
   },