@ubean/cli 0.3.3 → 0.3.5

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-BRUWKaig.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-sFQRjxXM.js";
 import { existsSync, mkdirSync, readFileSync, watch } from "node:fs";
 import { basename, join, relative, resolve } from "pathe";
 import { extname, normalize } from "node:path";
@@ -20,6 +20,7 @@ import vue from "@vitejs/plugin-vue";
 import { ubeanPlugin } from "@ubean/build/vite";
 import { VUE_PLUGIN_INCLUDE, ubeanVite } from "@ubean/build/vue";
 import { createVueRenderer } from "@ubean/client/ssr";
+import { getVueLocaleParam, toVueRouterLocalePath } from "@ubean/i18n";
 import { ubeanIslandsPlugin } from "@ubean/islands/vite";
 import { findAvailablePort, findUserViteConfig, waitForPort } from "@ubean/shared/node";
 import { execSync, spawn } from "node:child_process";
@@ -446,6 +447,19 @@ const buildCommand = {
 //#endregion
 //#region src/dev-server/vite-server.ts
 const logger$8 = getLogger("dev-server");
+/**
+* Compute the vue-router locale param (e.g. `:locale(zh)?`) from the resolved
+* i18n routing config, mirroring `localeVueParamFromI18n` (`@ubean/build`).
+* Returns `''` when i18n is disabled or no prefix is needed.
+*/
+function resolveLocaleVueParam(config) {
+	if (!config?.enabled || !config.locales?.length) return "";
+	return getVueLocaleParam({
+		defaultLocale: config.defaultLocale,
+		locales: config.locales.map((l) => l.code),
+		strategy: config.strategy
+	});
+}
 async function toWebRequest(req, host, protocol) {
 	const url = `${protocol}://${req.headers.host || host}${req.url || "/"}`;
 	const headers = new Headers();
@@ -713,12 +727,14 @@ async function createViteDevServer(options) {
 			return;
 		}
 		const scannedPages = app.options.pages || [];
+		const ssrLocaleParam = resolveLocaleVueParam(config.i18n);
 		const scannedPageByName = /* @__PURE__ */ new Map();
 		for (const p of scannedPages) scannedPageByName.set(p.name, p);
 		const routes = scannedPages.map((p) => {
 			const componentFullPath = (p.isReuse && p.reuseTarget ? scannedPageByName.get(p.reuseTarget) : void 0)?.fullPath || p.fullPath;
+			const routePath = p.route.replace(/\*\*:(\w[\w-]*)/g, ":$1(.*)*");
 			return {
-				path: p.route.replace(/\*\*:(\w[\w-]*)/g, ":$1(.*)*"),
+				path: ssrLocaleParam ? toVueRouterLocalePath(routePath, ssrLocaleParam) : routePath,
 				name: p.name,
 				component: async () => {
 					const mod = await viteServer.ssrLoadModule(componentFullPath);
@@ -1215,7 +1231,7 @@ async function buildApp(cwd, config) {
 		seoConventions: { srcDir: resolve(cwd, config.srcDir) }
 	});
 	app.hooks.hook("request:start", (c) => {
-		logger$6.info(`${c.req.method} ${c.req.path}`);
+		logger$6.debug(`${c.req.method} ${c.req.path}`);
 	});
 	return {
 		app,

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-BRUWKaig.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";
 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-BRUWKaig.js → page-sFQRjxXM.js}

@@ -577,17 +577,11 @@ const SERVER_TS = [
 	"import { defineServer } from 'ubean/runtime/app';",
 	"",
 	"export default defineServer({",
-	"  // 运行时钩子",
-	"  hooks: {",
-	"    'request:start': c => {",
-	"      console.log(`[server] ${c.req.method} ${c.req.path}`);",
-	"    }",
-	"  },",
+	"  // 运行时钩子(dev 下请求日志已由 CLI 输出,如需自定义可在此添加)",
+	"  hooks: {},",
 	"",
 	"  // 在 app.init() 后调用",
-	"  onServerReady: async _app => {",
-	"    console.log('[server] Server is ready');",
-	"  }",
+	"  onServerReady: async _app => {}",
 	"});",
 	""
 ].join("\n");

package/package.json

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