@ubean/cli 0.3.6 → 0.4.0

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { A as summarizeBundle, D as compareBundleBaseline, E as createFsOps, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as writeBundleBaseline, k as readViteManifest, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-sFQRjxXM.js";
+import { A as summarizeBundle, D as compareBundleBaseline, E as createFsOps, O as findClientManifest, S as renderTemplate, a as scaffold, c as scaffoldStarterTemplate, i as recoverScaffold, j as writeBundleBaseline, k as readViteManifest, l as scaffoldUnifyTemplate, n as listScaffoldableFiles, o as scaffoldBlogTemplate, r as pageCommand, s as scaffoldMinimalTemplate, t as deleteScaffold } from "./page-pkDKNCLT.js";
 import { existsSync, mkdirSync, readFileSync, watch } from "node:fs";
 import { basename, join, relative, resolve } from "pathe";
 import { extname, normalize, sep } from "node:path";
@@ -379,10 +379,8 @@ const buildCommand = {
 				srcDir: config.srcDir,
 				buildDir: ".ubean",
 				dirs: config.dir,
-				imports: config.imports,
-				components: config.components,
-				composablesDirs: config.imports.dirs,
-				componentsDirs: config.components.dirs
+				autoImports: config.autoImports,
+				components: config.components
 			});
 			const resolvedPreset = preset;
 			if (resolvedPreset.hooks?.["build:before"]) await resolvedPreset.hooks["build:before"]({
@@ -677,6 +675,7 @@ async function createViteDevServer(options) {
 		},
 		optimizeDeps: { exclude: [
 			"ubean",
+			"vue-router",
 			"virtual:ubean-pages",
 			"virtual:ubean-app",
 			"virtual:ubean-server",
@@ -1198,10 +1197,8 @@ async function buildApp(cwd, config) {
 		srcDir: config.srcDir,
 		buildDir: ".ubean",
 		dirs: config.dir,
-		imports: config.imports,
-		components: config.components,
-		composablesDirs: config.imports.dirs,
-		componentsDirs: config.components.dirs
+		autoImports: config.autoImports,
+		components: config.components
 	});
 	const app = createUbeanApp({
 		rootDir: cwd,
@@ -1931,10 +1928,8 @@ const prepareCommand = {
 			srcDir: config.srcDir,
 			buildDir: typesDir,
 			dirs: config.dir,
-			imports: config.imports,
-			components: config.components,
-			composablesDirs: config.imports.dirs,
-			componentsDirs: config.components.dirs
+			autoImports: config.autoImports,
+			components: config.components
 		});
 		for (const file of codegenResult.generated) logger$2.info(`Generated ${file.replace(`${cwd}/`, "")}`);
 		logger$2.info("Prepare complete!");

package/dist/index.d.ts

@@ -116,10 +116,10 @@ declare function toKebabCase(str: string): string;
 declare function toPascalCase(str: string): string;
 declare function toCamelCase(str: string): string;
 declare const PAGE_TEMPLATE = "<script setup lang=\"ts\">\ndefinePage({\n  meta: {\n    title: '{{name}}'\n  }\n});\n</script>\n\n<template>\n  <div class=\"{{kebabName}}-page\">\n    <div>{{name}}</div>\n  </div>\n</template>\n\n";
-declare const API_TEMPLATE = "import { defineHandler } from 'ubean';\n\nexport default defineHandler(async c => {\n  return c.json({ message: '{{name}} endpoint' });\n});\n";
-declare const MIDDLEWARE_TEMPLATE = "import { defineMiddleware } from 'ubean';\n\nexport default defineMiddleware(async (c, next) => {\n  console.log('{{name}} middleware');\n  await next();\n});\n";
+declare const API_TEMPLATE = "import { defineHandler } from 'ubean/server';\n\nexport default defineHandler(async c => {\n  return c.json({ message: '{{name}} endpoint' });\n});\n";
+declare const MIDDLEWARE_TEMPLATE = "import { defineMiddleware } from 'ubean/server';\n\nexport default defineMiddleware(async (c, next) => {\n  console.log('{{name}} middleware');\n  await next();\n});\n";
 declare const LAYOUT_TEMPLATE = "<script setup lang=\"ts\">\ndefinePage({\n  meta: {\n    title: '{{name}}'\n  }\n});\n</script>\n\n<template>\n  <div class=\"{{kebabName}}\">\n    <slot />\n  </div>\n</template>\n";
-declare const CRON_TEMPLATE = "import { defineScheduled } from 'ubean';\n\nexport default defineScheduled({\n  name: '{{name}}',\n  schedule: '{{schedule}}'\n}, async () => {\n  console.log('Running {{name}} cron task');\n});\n";
+declare const CRON_TEMPLATE = "import { defineScheduled } from 'ubean/server';\n\nexport default defineScheduled({\n  name: '{{name}}',\n  schedule: '{{schedule}}'\n}, async () => {\n  console.log('Running {{name}} cron task');\n});\n";
 declare const PLUGIN_TEMPLATE = "import { definePlugin } from 'ubean';\n\nexport default definePlugin({\n  name: '{{kebabName}}',\n  setup() {\n    console.log('{{name}} plugin setup');\n  }\n});\n";
 declare function renderPageTemplate(data: PageTemplateData): string;
 declare function renderApiTemplate(data: ApiTemplateData): string;

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 summarizeBundle, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, 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 writeBundleBaseline, k as readViteManifest, 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-sFQRjxXM.js";
+import { A as summarizeBundle, C as toCamelCase, D as compareBundleBaseline, E as createFsOps, 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 writeBundleBaseline, k as readViteManifest, 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-pkDKNCLT.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-sFQRjxXM.js → page-pkDKNCLT.js}

@@ -229,13 +229,13 @@ definePage({
 </template>
 
 `;
-const API_TEMPLATE = `import { defineHandler } from 'ubean';
+const API_TEMPLATE = `import { defineHandler } from 'ubean/server';
 
 export default defineHandler(async c => {
   return c.json({ message: '{{name}} endpoint' });
 });
 `;
-const MIDDLEWARE_TEMPLATE = `import { defineMiddleware } from 'ubean';
+const MIDDLEWARE_TEMPLATE = `import { defineMiddleware } from 'ubean/server';
 
 export default defineMiddleware(async (c, next) => {
   console.log('{{name}} middleware');
@@ -256,7 +256,7 @@ definePage({
   </div>
 </template>
 `;
-const CRON_TEMPLATE = `import { defineScheduled } from 'ubean';
+const CRON_TEMPLATE = `import { defineScheduled } from 'ubean/server';
 
 export default defineScheduled({
   name: '{{name}}',
@@ -523,7 +523,7 @@ A full-stack project powered by ubean.
 \`\`\`
 `;
 const APP_TS = [
-	"import { defineApp, hydrateIslands } from 'ubean/runtime/vue';",
+	"import { defineApp, hydrateIslands } from 'ubean/client';",
 	"import IslandClock from './components/IslandClock.vue';",
 	"import IslandCounter from './components/IslandCounter.vue';",
 	"import IslandMedia from './components/IslandMedia.vue';",
@@ -574,7 +574,7 @@ const APP_TS = [
 	""
 ].join("\n");
 const SERVER_TS = [
-	"import { defineServer } from 'ubean/runtime/app';",
+	"import { defineServer } from 'ubean/server';",
 	"",
 	"export default defineServer({",
 	"  // 运行时钩子(dev 下请求日志已由 CLI 输出,如需自定义可在此添加)",
@@ -632,7 +632,7 @@ definePage({
 </template>
 `;
 const GLOBAL_MIDDLEWARE = [
-	"import { defineMiddleware } from 'ubean';",
+	"import { defineMiddleware } from 'ubean/server';",
 	"",
 	"export default defineMiddleware(async (c, next) => {",
 	"  const start = Date.now();",
@@ -644,7 +644,7 @@ const GLOBAL_MIDDLEWARE = [
 	""
 ].join("\n");
 const HELLO_API = `import { pipe, description, object, string, number } from 'valibot';
-import { defineHandler, describeRoute, resolver } from 'ubean';
+import { defineHandler, describeRoute, resolver } from 'ubean/server';
 
 const helloWorldSchema = object({
   message: pipe(string(), description('The greeting message')),
@@ -685,7 +685,7 @@ export const flatApi = toFlatTypedClient<paths, '/api'>(request, '/api');
 `;
 const REQUEST_INTERNAL = `import { createRequest } from '@soybeanjs/fetch';
 import { createTypedClient } from '@soybeanjs/fetch/openapi';
-import { createInternalAdapter } from 'ubean';
+import { createInternalAdapter } from 'ubean/server';
 import type { paths } from '../../.ubean/openapi';
 
 export function createServerApi(context: Parameters<typeof createInternalAdapter>[0]) {
@@ -1073,7 +1073,7 @@ const FAVICON_SVG = `<svg width="100%" height="100%" version="1.1" viewBox="0 0
 </svg>
 `;
 /** 简化版 app.ts — 无 Islands / 无路由守卫 */
-const APP_TS_BASE = `import { defineApp } from 'ubean/runtime/vue';
+const APP_TS_BASE = `import { defineApp } from 'ubean/client';
 
 export default defineApp({
   head: {
@@ -1397,7 +1397,7 @@ definePage({
 			path: `/${path.replace(/\.vue$/, "").replace(/\/index$/, "")}`,
 			pascalName: toPascalCase(name)
 		});
-		case "middleware": return `import { defineMiddleware } from 'ubean';
+		case "middleware": return `import { defineMiddleware } from 'ubean/server';
 
 export default defineMiddleware(async (c, next) => {
   console.log('${name} middleware');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/cli",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "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,15 +24,15 @@
     }
   },
   "dependencies": {
-    "@ubean/app": "0.3.6",
-    "@ubean/build": "0.3.6",
-    "@ubean/client": "0.3.6",
-    "@ubean/config": "0.3.6",
-    "@ubean/i18n": "0.3.6",
-    "@ubean/islands": "0.3.6",
-    "@ubean/preset": "0.3.6",
-    "@ubean/scan": "0.3.6",
-    "@ubean/shared": "0.3.6",
+    "@ubean/app": "0.4.0",
+    "@ubean/build": "0.4.0",
+    "@ubean/client": "0.4.0",
+    "@ubean/config": "0.4.0",
+    "@ubean/i18n": "0.4.0",
+    "@ubean/islands": "0.4.0",
+    "@ubean/preset": "0.4.0",
+    "@ubean/scan": "0.4.0",
+    "@ubean/shared": "0.4.0",
     "citty": "^0.2.2",
     "kolorist": "^1.8.0",
     "pathe": "^2.0.3"
@@ -45,8 +45,8 @@
     "vite-plus": "0.3.0"
   },
   "peerDependencies": {
-    "@ubean/content": "0.3.6",
-    "@ubean/devtools": "0.3.6",
+    "@ubean/content": "0.4.0",
+    "@ubean/devtools": "0.4.0",
     "@vitejs/plugin-vue": "^6.0.8",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0"
   },