@ubean/build 0.3.0 → 0.3.2

package/dist/codegen/index.js

@@ -1,2 +1,2 @@
-import { _ as generateImportsTransform, a as generateOpenApiTypesFromServer, b as getUbeanComponentsConfig, c as generateI18nTypes, d as HONO_OPENAPI_PRESET, f as UBEAN_CLIENT_PRESET, g as generateAutoImports, h as VUE_PRESET, i as generateOpenApiTypes, l as messagesToTsType, m as VUE_MACROS_PRESET, n as CODEGEN_FILES, o as generatePageTypes, p as UBEAN_SERVER_PRESET, r as generateTypes, s as generateRouteTypes, t as CODEGEN_CONTRACT_VERSION, u as BUILTIN_PRESETS, v as getBuiltinComposables, y as getUbeanAutoImportConfig } from "../codegen-D6ewf11I.js";
+import { _ as generateImportsTransform, a as generateOpenApiTypesFromServer, b as getUbeanComponentsConfig, c as generateI18nTypes, d as HONO_OPENAPI_PRESET, f as UBEAN_CLIENT_PRESET, g as generateAutoImports, h as VUE_PRESET, i as generateOpenApiTypes, l as messagesToTsType, m as VUE_MACROS_PRESET, n as CODEGEN_FILES, o as generatePageTypes, p as UBEAN_SERVER_PRESET, r as generateTypes, s as generateRouteTypes, t as CODEGEN_CONTRACT_VERSION, u as BUILTIN_PRESETS, v as getBuiltinComposables, y as getUbeanAutoImportConfig } from "../codegen-CYk6X-Hn.js";
 export { BUILTIN_PRESETS, CODEGEN_CONTRACT_VERSION, CODEGEN_FILES, HONO_OPENAPI_PRESET, UBEAN_CLIENT_PRESET, UBEAN_SERVER_PRESET, VUE_MACROS_PRESET, VUE_PRESET, generateAutoImports, generateI18nTypes, generateImportsTransform, generateOpenApiTypes, generateOpenApiTypesFromServer, generatePageTypes, generateRouteTypes, generateTypes, getBuiltinComposables, getUbeanAutoImportConfig, getUbeanComponentsConfig, messagesToTsType };

package/dist/{codegen-D6ewf11I.js → codegen-CYk6X-Hn.js}

@@ -276,7 +276,7 @@ async function generateAutoImports(_scanResult, options) {
 			components.push(...scanned);
 		}
 	}
-	const componentsDts = generateComponentsDts(components);
+	const componentsDts = generateComponentsDts(components, componentsDtsPath);
 	await writeFile(componentsDtsPath, componentsDts, "utf-8");
 	return {
 		composablesImports,
@@ -285,34 +285,47 @@ async function generateAutoImports(_scanResult, options) {
 		componentsDtsPath
 	};
 }
-function generateComponentsDts(components) {
+/**
+* Generate the `.ubean/components.d.ts` in a format compatible with
+* unplugin-vue-components (both writers own the same file).
+*
+* `ubean dev` runs codegen first, then unplugin-vue-components rewrites the
+* file in dev mode using its append merge: it keeps entries scraped from the
+* existing `GlobalComponents` interface but drops any surrounding
+* `import`/`const` declaration lines. Entries must therefore be
+* self-contained inline `typeof import('...')` declarations so they stay
+* valid after unplugin merges them.
+*/
+function generateComponentsDts(components, dtsPath) {
+	const dtsDir = fileDirname(toPosixPath(normalize(dtsPath)));
+	const entries = /* @__PURE__ */ new Map();
+	for (const name of [
+		"Link",
+		"Head",
+		"PageView"
+	]) entries.set(name, `typeof import('ubean/client')['${name}']`);
+	for (const comp of components) {
+		const importPath = `./${toPosixPath(relative(dtsDir, toPosixPath(normalize(comp.filePath))))}`;
+		entries.set(comp.pascalName, `typeof import('${importPath}')['default']`);
+	}
 	const lines = [
 		"// Auto-generated by ubean - do not edit manually",
 		"/* eslint-disable */",
 		"// @ts-nocheck",
+		"// biome-ignore lint: disable",
+		"// oxlint-disable",
 		"",
-		"declare module 'vue' {"
+		"export {}",
+		"",
+		"/* prettier-ignore */",
+		"declare module 'vue' {",
+		"  export interface GlobalComponents {"
 	];
-	const importLines = [];
-	const componentEntries = [];
-	for (const name of ["Link", "Head"]) {
-		importLines.push(`  const ${name}: typeof import('ubean/client')['${name}'];`);
-		componentEntries.push(`    ${name}: typeof ${name};`);
-	}
-	for (const comp of components) {
-		importLines.push(`  import ${comp.pascalName} from ${JSON.stringify(comp.importPath)};`);
-		componentEntries.push(`    ${comp.pascalName}: typeof ${comp.pascalName};`);
-	}
-	if (importLines.length > 0) {
-		lines.push(...importLines);
-		lines.push("");
-		lines.push("  export interface GlobalComponents {");
-		lines.push(...componentEntries);
-		lines.push("  }");
-	} else lines.push("  export interface GlobalComponents {}");
+	const sorted = [...entries.entries()].sort(([a], [b]) => a.localeCompare(b));
+	lines.push(...sorted.map(([name, declaration]) => `    ${name}: ${declaration}`));
+	lines.push("  }");
 	lines.push("}");
 	lines.push("");
-	lines.push("export {}");
 	return `${lines.join("\n")}\n`;
 }
 function getBuiltinComposables() {

package/dist/production.js

@@ -1,8 +1,8 @@
 import { a as useVirtualRegistry } from "./virtual-registry-BWkaQHXN.js";
 import { a as createRoutingVirtualModule, i as createPagesVirtualModule, n as createLocalesVirtualModule, r as createMetaVirtualModule, t as createAppVirtualModule } from "./virtual-modules-D5WBA3u7.js";
 import { a as ssrSingletonProdOptimizeExclude, o as ssrSingletonProdSsr } from "./ssr-singleton-CEQi_H6-.js";
-import { n as localeVueParamFromI18n, r as serializeI18nConfig, t as ubeanPlugin } from "./vite-D640Tpv8.js";
-import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-BJO18Lwe.js";
+import { n as localeVueParamFromI18n, r as serializeI18nConfig, t as ubeanPlugin } from "./vite-B3y8Qoan.js";
+import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-CL_djWZL.js";
 import { join, relative, resolve } from "pathe";
 import { resolveModules } from "@ubean/config";
 import { build } from "vite";

package/dist/{vite-D640Tpv8.js → vite-B3y8Qoan.js}

@@ -105,7 +105,7 @@ function ubeanPlugin(options) {
 				"locales"
 			];
 			const config = ubeanConfig;
-			const srcDir = join(config.rootDir, config.srcDir);
+			const srcDir = resolve(config.rootDir, config.srcDir);
 			for (const dir of watchDirs) server.watcher.add(join(srcDir, dir));
 			server.watcher.on("add", handleFileChange);
 			server.watcher.on("unlink", handleFileChange);

package/dist/vite.js

@@ -1,2 +1,2 @@
-import { t as ubeanPlugin } from "./vite-D640Tpv8.js";
+import { t as ubeanPlugin } from "./vite-B3y8Qoan.js";
 export { ubeanPlugin };

package/dist/{vue-BJO18Lwe.js → vue-CL_djWZL.js}

@@ -1,8 +1,8 @@
 import { a as useVirtualRegistry, n as defineVirtualModule } from "./virtual-registry-BWkaQHXN.js";
 import { c as getCssImports, i as ssrSingletonDevPolicy, s as getComponentResolvers } from "./ssr-singleton-CEQi_H6-.js";
-import { f as UBEAN_CLIENT_PRESET, p as UBEAN_SERVER_PRESET } from "./codegen-D6ewf11I.js";
+import { f as UBEAN_CLIENT_PRESET, p as UBEAN_SERVER_PRESET } from "./codegen-CYk6X-Hn.js";
 import { createRequire } from "node:module";
-import { join } from "pathe";
+import { join, resolve } from "pathe";
 import { scanProject } from "@ubean/scan";
 import { getVueLocaleParam } from "@ubean/i18n";
 import { transformWithOxc } from "vite";
@@ -275,7 +275,14 @@ export async function createApp() {
   // When hydrating SSR content, must wait for router to be ready before mounting,
   // otherwise RouterView has no matched route and causes hydration mismatch.
   if (initialPage) {
-    instance.router.isReady().then(mountApp);
+    instance.router
+      .isReady()
+      .then(async function () {
+        // SSR HTML 已包含布局链;客户端水合首帧必须同样就绪(布局是异步
+        // 解析的),否则首帧渲染裸 PageView 导致 hydration mismatch。
+        await instance.preloadLayouts();
+      })
+      .then(mountApp);
   } else {
     mountApp();
   }
@@ -426,7 +433,7 @@ function localeVueParamFromConfig(config) {
 function ubeanVite(options) {
 	const { config: ubeanConfig } = options;
 	const virtualRegistry = useVirtualRegistry();
-	const srcDir = join(ubeanConfig.rootDir, ubeanConfig.srcDir);
+	const srcDir = resolve(ubeanConfig.rootDir, ubeanConfig.srcDir);
 	const dtsDir = join(ubeanConfig.rootDir, ".ubean");
 	const markdownEnabled = ubeanConfig.markdown?.enabled !== false;
 	const mdxEnabled = ubeanConfig.markdown?.mdx === true;
@@ -656,7 +663,7 @@ function ubeanVite(options) {
 */
 async function runPagefindIndexing(ubeanConfig, searchConfig) {
 	const { spawn } = await import("node:child_process");
-	const { resolve } = await import("node:path");
+	const { resolve: resolvePath } = await import("node:path");
 	const isObjectConfig = typeof searchConfig === "object";
 	if (!(isObjectConfig ? searchConfig.enabled !== false : true)) return;
 	const outDir = isObjectConfig && searchConfig.site ? searchConfig.site : "dist";
@@ -665,7 +672,7 @@ async function runPagefindIndexing(ubeanConfig, searchConfig) {
 	const args = [
 		"pagefind",
 		"--site",
-		resolve(ubeanConfig.rootDir, outDir),
+		resolvePath(ubeanConfig.rootDir, outDir),
 		"--output-subdir",
 		indexPath
 	];

package/dist/vue.js

@@ -1,2 +1,2 @@
-import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-BJO18Lwe.js";
+import { a as createVueAppEntryVirtualModule, i as createServerEntryVirtualModule, n as ubeanVite, o as createVuePagesVirtualModule, r as createClientEntryVirtualModule, t as VUE_PLUGIN_INCLUDE } from "./vue-CL_djWZL.js";
 export { VUE_PLUGIN_INCLUDE, createClientEntryVirtualModule, createServerEntryVirtualModule, createVueAppEntryVirtualModule, createVuePagesVirtualModule, ubeanVite as default, ubeanVite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/build",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Vite plugins, production build, SSG prerender, type codegen, and Server Actions plugin for ubean",
   "files": [
     "dist"
@@ -41,37 +41,37 @@
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "11.2.5",
+    "@ubean/client": "0.3.2",
+    "@ubean/config": "0.3.2",
+    "@ubean/i18n": "0.3.2",
+    "@ubean/islands": "0.3.2",
+    "@ubean/markdown": "0.3.2",
+    "@ubean/pages": "0.3.2",
+    "@ubean/preset": "0.3.2",
+    "@ubean/routes": "0.3.2",
+    "@ubean/scan": "0.3.2",
+    "@ubean/shared": "0.3.2",
+    "@ubean/vue": "0.3.2",
     "@vitejs/plugin-vue": "^6.0.8",
     "openapi-typescript": "^7.13.0",
-    "oxc-transform": "^0.146.0",
+    "oxc-transform": "^0.147.0",
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.17",
     "unimport": "^6.4.0",
     "unplugin-auto-import": "21.1.0",
     "unplugin-vue-components": "^32.1.0",
-    "unplugin-vue-markdown": "^32.0.0",
-    "vue-i18n": "11.4.8",
-    "@ubean/config": "0.3.0",
-    "@ubean/client": "0.3.0",
-    "@ubean/i18n": "0.3.0",
-    "@ubean/pages": "0.3.0",
-    "@ubean/islands": "0.3.0",
-    "@ubean/preset": "0.3.0",
-    "@ubean/scan": "0.3.0",
-    "@ubean/markdown": "0.3.0",
-    "@ubean/shared": "0.3.0",
-    "@ubean/routes": "0.3.0",
-    "@ubean/vue": "0.3.0"
+    "unplugin-vue-markdown": "^32.1.1",
+    "vue-i18n": "11.4.10"
   },
   "devDependencies": {
-    "@types/node": "^26.2.0",
-    "hono": "4.13.3",
+    "@types/node": "^26.4.0",
+    "hono": "4.13.5",
     "typescript": "7.0.2",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.9",
-    "vite-plus": "0.2.9"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0",
+    "vite-plus": "0.3.0"
   },
   "peerDependencies": {
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.2.9"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.3.0"
   },
   "peerDependenciesMeta": {
     "vite": {