@ubean/client 0.3.1 → 0.3.2

package/dist/{app-B6vVB7hp.js → app-BU6ZpitN.js}

@@ -98,30 +98,43 @@ function createLayoutWrapper(resolveLayoutComponent, defaultLayout) {
 		layoutCache.set(name, raw);
 		return raw;
 	}
-	return defineComponent({
-		name: "UbeanLayoutView",
-		setup() {
-			const route = useRoute();
-			watchEffect(async () => {
-				const layoutField = route.meta.layout;
-				const names = normalizeLayoutNames(layoutField === void 0 ? defaultLayout ?? void 0 : layoutField, defaultLayout);
-				if (names.length === 0) {
-					layoutComps.value = [];
-					return;
-				}
-				const comps = await Promise.all(names.map((n) => loadLayout(n)));
-				layoutComps.value = comps;
-			});
-			return () => {
-				const comps = layoutComps.value;
-				if (comps.length === 0) return h(PageView);
-				return h(LayoutChainRenderer, {
-					components: comps,
-					depth: 0
-				});
-			};
+	/**
+	* Load the layout chain for a route into `layoutComps` (outer → inner).
+	* `route.meta.layout` is read synchronously, so calling this from a
+	* `watchEffect` still tracks the route dependency. The write happens after
+	* an `await`, so the first render only includes layouts when this was
+	* awaited beforehand (see `preloadLayouts` on the app instance).
+	*/
+	async function loadLayoutsForRoute(route) {
+		const layoutField = route.meta.layout;
+		const names = normalizeLayoutNames(layoutField === void 0 ? defaultLayout ?? void 0 : layoutField, defaultLayout);
+		if (names.length === 0) {
+			layoutComps.value = [];
+			return;
 		}
-	});
+		const comps = await Promise.all(names.map((n) => loadLayout(n)));
+		layoutComps.value = comps;
+	}
+	return {
+		LayoutView: defineComponent({
+			name: "UbeanLayoutView",
+			setup() {
+				const route = useRoute();
+				watchEffect(() => {
+					loadLayoutsForRoute(route);
+				});
+				return () => {
+					const comps = layoutComps.value;
+					if (comps.length === 0) return h(PageView);
+					return h(LayoutChainRenderer, {
+						components: comps,
+						depth: 0
+					});
+				};
+			}
+		}),
+		loadLayoutsForRoute
+	};
 }
 /**
 * Resolve a component from either a direct `Component` or a
@@ -170,9 +183,9 @@ function createUbeanClientApp(options) {
 		ssr: false,
 		setup: options.routerSetup
 	});
-	const LayoutWrapper = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
+	const { LayoutView: ClientLayoutWrapper, loadLayoutsForRoute: loadClientLayouts } = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
 	initCachedViewsFromRoutes(options.routes);
-	const RootComponent = createRootComponent(LayoutWrapper, page, transitionOpts, false, resolveComp(options.loadingComponent), resolveComp(options.errorComponent));
+	const RootComponent = createRootComponent(ClientLayoutWrapper, page, transitionOpts, false, resolveComp(options.loadingComponent), resolveComp(options.errorComponent));
 	const app = options.hydrate ? createSSRApp(RootComponent) : createApp(RootComponent);
 	const i18n = options.i18n ?? createUbeanI18n();
 	app.use(i18n);
@@ -193,7 +206,8 @@ function createUbeanClientApp(options) {
 		app,
 		router,
 		head,
-		page
+		page,
+		preloadLayouts: () => loadClientLayouts(router.currentRoute.value)
 	};
 }
 function createUbeanSSRApp(initialPage, options) {
@@ -207,9 +221,9 @@ function createUbeanSSRApp(initialPage, options) {
 		initialUrl: initialPage.url,
 		setup: options.routerSetup
 	});
-	const LayoutWrapper = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
+	const { LayoutView: SsrLayoutWrapper, loadLayoutsForRoute: loadSsrLayouts } = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
 	initCachedViewsFromRoutes(options.routes);
-	const RootComponent = createRootComponent(LayoutWrapper, page, { enabled: false }, true, resolveComp(options.loadingComponent), resolveComp(options.errorComponent));
+	const RootComponent = createRootComponent(SsrLayoutWrapper, page, { enabled: false }, true, resolveComp(options.loadingComponent), resolveComp(options.errorComponent));
 	const app = createSSRApp(RootComponent);
 	const i18n = options.i18n ?? createUbeanI18n();
 	app.use(i18n);
@@ -229,7 +243,8 @@ function createUbeanSSRApp(initialPage, options) {
 	return {
 		app,
 		router,
-		head
+		head,
+		preloadLayouts: () => loadSsrLayouts(router.currentRoute.value)
 	};
 }
 const Head$1 = Head;

package/dist/{app-BP3eySMH.d.ts → app-CsoTBXV5.d.ts}

@@ -95,12 +95,20 @@ interface UbeanAppInstance {
   router: ReturnType<typeof createUbeanRouter>;
   head: VueHeadClient;
   page: PageObject;
+  /**
+   * 解析当前路由的布局链并写入 `UbeanLayoutView`。布局组件是异步加载的,
+   * 而 `renderToString` / 水合首帧不会等待组件内部的异步加载 —— 在首次渲染前
+   * await 该函数(SSR: `router.isReady()` 后;客户端水合: mount 前),
+   * 布局才会出现在初始输出中。
+   */
+  preloadLayouts: () => Promise<void>;
 }
 declare function createUbeanClientApp(options: UbeanAppOptions): UbeanAppInstance;
 declare function createUbeanSSRApp(initialPage: PageObject, options: Omit<UbeanAppOptions, 'initialPage'>): {
   app: App<Element>;
   router: import("vue-router")._RouterClassic;
   head: VueHeadClient;
+  preloadLayouts: () => Promise<void>;
 };
 declare const Head: import("vue").DefineComponent;
 //#endregion

package/dist/app.d.ts

@@ -1,2 +1,2 @@
-import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient, a as LOCALIZE_PATH_KEY, b as ubeanVue, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, j as createUbeanRouter, k as usePage, l as PAGE_KEY, m as UbeanAppInstance, n as Head, o as LayoutChainContext, p as TRANSITION_KEY, r as LAYOUT_CHAIN_KEY, s as LayoutChainRenderer, t as ERROR_KEY, u as PageView, v as createUbeanClientApp, w as useViewTransition, x as useRouter, y as createUbeanSSRApp } from "./app-BP3eySMH.js";
+import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient, a as LOCALIZE_PATH_KEY, b as ubeanVue, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, j as createUbeanRouter, k as usePage, l as PAGE_KEY, m as UbeanAppInstance, n as Head, o as LayoutChainContext, p as TRANSITION_KEY, r as LAYOUT_CHAIN_KEY, s as LayoutChainRenderer, t as ERROR_KEY, u as PageView, v as createUbeanClientApp, w as useViewTransition, x as useRouter, y as createUbeanSSRApp } from "./app-CsoTBXV5.js";
 export { type CreateUbeanRouterOptions, ERROR_KEY, Head, LAYOUT_CHAIN_KEY, LOADING_KEY, LOCALIZE_PATH_KEY, type LayoutChainContext, LayoutChainRenderer, Link, PAGE_KEY, PageView, SSR_KEY, SlotView, TRANSITION_KEY, UbeanAppInstance, UbeanAppOptions, type UbeanVueOptions, type UbeanVuePage, type VueHeadClient, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useRouter, useSeoMeta, useViewTransition };

package/dist/app.js

@@ -1,2 +1,2 @@
-import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, a as LOCALIZE_PATH_KEY, b as defineMeta, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useRouter, h as ubeanVue, i as LOADING_KEY, l as PageView, m as createUbeanSSRApp, n as Head, o as LayoutChainRenderer, p as createUbeanClientApp, r as LAYOUT_CHAIN_KEY, s as Link, t as ERROR_KEY, u as SSR_KEY, v as useUnheadHead, w as usePage, x as defineMiddleware, y as useViewTransition } from "./app-B6vVB7hp.js";
+import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, a as LOCALIZE_PATH_KEY, b as defineMeta, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useRouter, h as ubeanVue, i as LOADING_KEY, l as PageView, m as createUbeanSSRApp, n as Head, o as LayoutChainRenderer, p as createUbeanClientApp, r as LAYOUT_CHAIN_KEY, s as Link, t as ERROR_KEY, u as SSR_KEY, v as useUnheadHead, w as usePage, x as defineMiddleware, y as useViewTransition } from "./app-BU6ZpitN.js";
 export { ERROR_KEY, Head, LAYOUT_CHAIN_KEY, LOADING_KEY, LOCALIZE_PATH_KEY, LayoutChainRenderer, Link, PAGE_KEY, PageView, SSR_KEY, SlotView, TRANSITION_KEY, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useRouter, useSeoMeta, useViewTransition };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient$1, h as UbeanAppOptions, j as createUbeanRouter, k as usePage, m as UbeanAppInstance, n as Head, v as createUbeanClientApp, y as createUbeanSSRApp } from "./app-BP3eySMH.js";
+import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient$1, h as UbeanAppOptions, j as createUbeanRouter, k as usePage, m as UbeanAppInstance, n as Head, v as createUbeanClientApp, y as createUbeanSSRApp } from "./app-CsoTBXV5.js";
 import { AppPluginConfig, DefineAppOptions, ResolvedAppConfig, applyAppConfig, createDefaultAppConfig, defineApp, mergeAppConfig } from "./define-app.js";
 import { App, ComputedRef, Ref, ShallowRef } from "vue";
 import { useRouter } from "vue-router";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, b as defineMeta, m as createUbeanSSRApp, n as Head, p as createUbeanClientApp, v as useUnheadHead, w as usePage, x as defineMiddleware } from "./app-B6vVB7hp.js";
+import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, b as defineMeta, m as createUbeanSSRApp, n as Head, p as createUbeanClientApp, v as useUnheadHead, w as usePage, x as defineMiddleware } from "./app-BU6ZpitN.js";
 import { _ as useSwitchLocalePath, a as getI18nRuntimeConfig, c as installUbeanI18n, d as switchLocalePath, f as t, g as useLocaleRoute, h as useLocalePath, i as extractLocaleFromPath, l as localizePath, m as useLocaleHead, n as configureI18nRuntime, o as getLocale, p as useI18n, r as createUbeanI18n, s as initClientI18n, u as setLocale } from "./i18n-t0G3VyBs.js";
 import { applyAppConfig, createDefaultAppConfig, defineApp, mergeAppConfig } from "./define-app.js";
 import { computed, getCurrentInstance, markRaw, onMounted, onScopeDispose, onUnmounted, ref, shallowRef, watch } from "vue";

package/dist/server.d.ts

@@ -1,3 +1,3 @@
-import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient, a as LOCALIZE_PATH_KEY, b as ubeanVue, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, j as createUbeanRouter, k as usePage, l as PAGE_KEY, m as UbeanAppInstance, n as Head, o as LayoutChainContext, p as TRANSITION_KEY, r as LAYOUT_CHAIN_KEY, s as LayoutChainRenderer, t as ERROR_KEY, u as PageView, v as createUbeanClientApp, w as useViewTransition, x as useRouter, y as createUbeanSSRApp } from "./app-BP3eySMH.js";
+import { A as CreateUbeanRouterOptions, C as useUnheadHead, D as definePage, E as defineMiddleware, O as UbeanVuePage, S as useSeoMeta, T as defineMeta, _ as VueHeadClient, a as LOCALIZE_PATH_KEY, b as ubeanVue, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, j as createUbeanRouter, k as usePage, l as PAGE_KEY, m as UbeanAppInstance, n as Head, o as LayoutChainContext, p as TRANSITION_KEY, r as LAYOUT_CHAIN_KEY, s as LayoutChainRenderer, t as ERROR_KEY, u as PageView, v as createUbeanClientApp, w as useViewTransition, x as useRouter, y as createUbeanSSRApp } from "./app-CsoTBXV5.js";
 import { createHead as createServerHead } from "@unhead/vue/server";
 export { type CreateUbeanRouterOptions, ERROR_KEY, Head, LAYOUT_CHAIN_KEY, LOADING_KEY, LOCALIZE_PATH_KEY, type LayoutChainContext, LayoutChainRenderer, Link, PAGE_KEY, PageView, SSR_KEY, SlotView, TRANSITION_KEY, UbeanAppInstance, UbeanAppOptions, type UbeanVueOptions, type UbeanVuePage, type VueHeadClient, createServerHead, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useRouter, useSeoMeta, useViewTransition };

package/dist/server.js

@@ -1,3 +1,3 @@
-import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, a as LOCALIZE_PATH_KEY, b as defineMeta, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useRouter, h as ubeanVue, i as LOADING_KEY, l as PageView, m as createUbeanSSRApp, n as Head, o as LayoutChainRenderer, p as createUbeanClientApp, r as LAYOUT_CHAIN_KEY, s as Link, t as ERROR_KEY, u as SSR_KEY, v as useUnheadHead, w as usePage, x as defineMiddleware, y as useViewTransition } from "./app-B6vVB7hp.js";
+import { C as createUbeanRouter, S as definePage, _ as useSeoMeta, a as LOCALIZE_PATH_KEY, b as defineMeta, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useRouter, h as ubeanVue, i as LOADING_KEY, l as PageView, m as createUbeanSSRApp, n as Head, o as LayoutChainRenderer, p as createUbeanClientApp, r as LAYOUT_CHAIN_KEY, s as Link, t as ERROR_KEY, u as SSR_KEY, v as useUnheadHead, w as usePage, x as defineMiddleware, y as useViewTransition } from "./app-BU6ZpitN.js";
 import { createHead as createServerHead } from "@unhead/vue/server";
 export { ERROR_KEY, Head, LAYOUT_CHAIN_KEY, LOADING_KEY, LOCALIZE_PATH_KEY, LayoutChainRenderer, Link, PAGE_KEY, PageView, SSR_KEY, SlotView, TRANSITION_KEY, createServerHead, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useRouter, useSeoMeta, useViewTransition };

package/dist/ssr.js

@@ -109,7 +109,7 @@ async function prepareRender(options, pageObj, renderContext) {
 		renderApp = app;
 	} else {
 		const { createUbeanSSRApp } = await import("@ubean/client/app");
-		const { app: createdApp, router } = createUbeanSSRApp(pageObj, {
+		const { app: createdApp, router, preloadLayouts } = createUbeanSSRApp(pageObj, {
 			routes: options.routes,
 			resolveLayoutComponent: options.resolveLayoutComponent,
 			defaultLayout: options.defaultLayout,
@@ -118,6 +118,7 @@ async function prepareRender(options, pageObj, renderContext) {
 		});
 		if (appConfig) await applyServerAppConfig(createdApp, appConfig);
 		await router.isReady();
+		await preloadLayouts();
 		renderApp = createdApp;
 	}
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/client",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Framework client runtime for ubean — layered over the lean @ubean/vue kernel, adding app factories, unhead, i18n, data layer, islands hydration and SSR state helpers",
   "files": [
     "dist"
@@ -32,11 +32,11 @@
     }
   },
   "dependencies": {
-    "@ubean/i18n": "0.3.1",
-    "@ubean/islands": "0.3.1",
-    "@ubean/pages": "0.3.1",
-    "@ubean/shared": "0.3.1",
-    "@ubean/vue": "0.3.1",
+    "@ubean/i18n": "0.3.2",
+    "@ubean/islands": "0.3.2",
+    "@ubean/pages": "0.3.2",
+    "@ubean/shared": "0.3.2",
+    "@ubean/vue": "0.3.2",
     "@unhead/vue": "^3.4.0",
     "@vue/server-renderer": "^3.5.42",
     "vue": "^3.5.42",
@@ -49,7 +49,7 @@
     "vite-plus": "0.3.0"
   },
   "peerDependencies": {
-    "@ubean/seo": "0.3.1"
+    "@ubean/seo": "0.3.2"
   },
   "peerDependenciesMeta": {
     "@ubean/seo": {