@ubean/client 0.4.4 → 0.4.5

package/dist/{app-DiXW_14_.js → app-Bt-2meGm.js}

@@ -48,19 +48,24 @@ function createUbeanRouter(options) {
 	const router = createRouter({
 		history,
 		routes: options.routes,
-		scrollBehavior(_to, _from, savedPosition) {
-			if (savedPosition) return savedPosition;
-			if (_to.hash) return {
-				el: _to.hash,
-				behavior: "smooth"
-			};
-			return { top: 0 };
-		}
+		scrollBehavior: options.scrollBehavior ?? defaultScrollBehavior
 	});
 	if (options.setup) options.setup(router);
 	if (options.ssr && options.initialUrl) router.push(options.initialUrl);
 	return router;
 }
+/**
+* 默认滚动策略:返回顶部;带 hash 时仅在目标元素已存在时平滑滚动,
+* 否则返回 `false`(跳过滚动,避免 VUE_ROUTER_R0042 告警)。
+*/
+function defaultScrollBehavior(to, _from, savedPosition) {
+	if (savedPosition) return savedPosition;
+	if (to.hash) return typeof document !== "undefined" && document.querySelector(to.hash) ? {
+		el: to.hash,
+		behavior: "smooth"
+	} : false;
+	return { top: 0 };
+}
 //#endregion
 //#region src/page-macro.ts
 function definePage(_meta) {}
@@ -185,7 +190,8 @@ function createUbeanClientApp(options) {
 	const router = createUbeanRouter({
 		routes: options.routes,
 		ssr: false,
-		setup: options.routerSetup
+		setup: options.router?.setup,
+		scrollBehavior: options.router?.scrollBehavior
 	});
 	const { LayoutView: ClientLayoutWrapper, loadLayoutsForRoute: loadClientLayouts } = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
 	initCachedViewsFromRoutes(options.routes);
@@ -223,7 +229,8 @@ function createUbeanSSRApp(initialPage, options) {
 		routes: options.routes,
 		ssr: true,
 		initialUrl: initialPage.url,
-		setup: options.routerSetup
+		setup: options.router?.setup,
+		scrollBehavior: options.router?.scrollBehavior
 	});
 	const { LayoutView: SsrLayoutWrapper, loadLayoutsForRoute: loadSsrLayouts } = createLayoutWrapper(options.resolveLayoutComponent, options.defaultLayout || null);
 	initCachedViewsFromRoutes(options.routes);

package/dist/{app-BQgi-8Qp.d.ts → app-emLZM9XN.d.ts}

@@ -1,5 +1,6 @@
+import { i as RouterConfig } from "./define-app-RzHOZlYB.js";
 import { App, Component } from "vue";
-import { RouteRecordRaw, Router } from "vue-router";
+import { RouteRecordRaw, Router, RouterOptions } from "vue-router";
 import { ERROR_KEY as ERROR_KEY$1, LAYOUT_CHAIN_KEY, LOADING_KEY as LOADING_KEY$1, LOCALIZE_PATH_KEY as LOCALIZE_PATH_KEY$1, LayoutChainContext, LayoutChainRenderer as LayoutChainRenderer$1, Link, PAGE_KEY as PAGE_KEY$1, PageMeta, PageView, SSR_KEY as SSR_KEY$1, SlotView, TRANSITION_KEY as TRANSITION_KEY$1, UbeanVueOptions, ViewTransitionOptions, ubeanVue, useViewTransition } from "@ubean/vue";
 import { VueHeadClient, useHead as useUnheadHead, useSeoMeta } from "@unhead/vue";
 import { PageObject } from "@ubean/pages";
@@ -21,6 +22,15 @@ interface CreateUbeanRouterOptions {
    * 该回调在 Client 和 SSR 环境都会执行。
    */
   setup?: (router: Router) => void;
+  /**
+   * vue-router `scrollBehavior`,覆盖默认滚动策略。
+   *
+   * 默认行为:返回顶部;带 hash 时仅当目标元素已存在才平滑滚动。
+   * 客户端延迟生成的锚点(如 SSR 后由客户端渲染的标题 id)在首次导航时
+   * 可能尚不存在,直接返回 `{ el }` 会触发 VUE_ROUTER_R0042,因此默认
+   * 先探测元素存在性。
+   */
+  scrollBehavior?: RouterOptions['scrollBehavior'];
 }
 declare function createUbeanRouter(options: CreateUbeanRouterOptions): Router;
 //#endregion
@@ -65,12 +75,12 @@ interface UbeanAppOptions {
   viewTransitions?: boolean | ViewTransitionOptions;
   hydrate?: boolean;
   /**
-   * 在 router 实例创建后、`app.use(router)` 之前调用,
-   * 用于注册 vue-router 的导航守卫(`beforeEach` / `beforeResolve` / `afterEach`)。
-   *
-   * Client 和 SSR 都会执行。守卫注册必须同步完成(守卫本身可返回 Promise)。
+   * router 配置(setup 守卫 + scrollBehavior 等初始化选项)。
+   * Client 和 SSR 都会执行;setup 注册守卫必须同步完成。
+   * 来自 `defineApp({ router })`,由 `virtual:ubean-app` / `virtual:ubean-server`
+   * 在调用本工厂前通过 `resolveAppConfig()` 合并注入。
    */
-  routerSetup?: (router: ReturnType<typeof createUbeanRouter>) => void;
+  router?: RouterConfig;
   /**
    * 页面加载时的 fallback 组件,在 SPA 导航懒加载页面组件期间显示。
    * 来源:`pages/loading.vue` 自动检测 或 `defineApp({ loadingComponent })` 显式配置。

package/dist/app.d.ts

@@ -1,2 +1,2 @@
-import { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, S as useViewTransition, T as definePage, _ as createUbeanClientApp, a as LOCALIZE_PATH_KEY, b as useSeoMeta, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, k as createUbeanRouter, 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 createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead, y as ubeanVue } from "./app-BQgi-8Qp.js";
+import { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, S as useViewTransition, T as definePage, _ as createUbeanClientApp, a as LOCALIZE_PATH_KEY, b as useSeoMeta, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, k as createUbeanRouter, 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 createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead, y as ubeanVue } from "./app-emLZM9XN.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, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useSeoMeta, useViewTransition };

package/dist/app.js

@@ -1,2 +1,2 @@
-import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, a as LOCALIZE_PATH_KEY, b as defineMiddleware, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useSeoMeta, 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 useViewTransition, x as definePage, y as defineMeta } from "./app-DiXW_14_.js";
+import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, a as LOCALIZE_PATH_KEY, b as defineMiddleware, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useSeoMeta, 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 useViewTransition, x as definePage, y as defineMeta } from "./app-Bt-2meGm.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, useSeoMeta, useViewTransition };

package/dist/define-app-RzHOZlYB.d.ts

@@ -0,0 +1,179 @@
+import { App, Component, Plugin } from "vue";
+import { Router, RouterOptions } from "vue-router";
+import { ViewTransitionOptions } from "@ubean/vue";
+import { PageHead } from "@ubean/shared";
+//#region src/define-app.d.ts
+interface AppPluginConfig {
+  plugin: Plugin | [Plugin, ...any[]];
+  mode?: 'all' | 'client' | 'server';
+}
+/**
+ * Router 钩子配置 — 暴露 vue-router 的导航守卫注册入口 + 初始化选项。
+ *
+ * `setup(router)` 在 router 实例创建后、`app.use(router)` 之前调用,
+ * 因此守卫能拦截首次导航(包括 SSR 的初始 URL push)。
+ *
+ * Client 和 SSR 都会执行,适合做鉴权、埋点、进度条等逻辑。
+ *
+ * @example
+ * ```ts
+ * defineApp({
+ *   router: {
+ *     setup(router) {
+ *       router.beforeEach((to, from) => {
+ *         if (to.meta.requiresAuth && !isAuthenticated()) {
+ *           return '/login';
+ *         }
+ *       });
+ *       router.afterEach((to) => {
+ *         analytics.track('page_view', { path: to.fullPath });
+ *       });
+ *     },
+ *     scrollBehavior(to, from, savedPosition) {
+ *       // 覆盖默认滚动策略(默认已守卫 hash 目标元素不存在时的 R0042)
+ *       if (savedPosition) return savedPosition;
+ *       if (to.hash) return { el: to.hash, behavior: 'smooth' };
+ *       return { top: 0 };
+ *     }
+ *   }
+ * });
+ * ```
+ */
+interface RouterConfig {
+  /**
+   * 在 router 创建后、初始导航前调用。
+   * 用于注册 `beforeEach` / `beforeResolve` / `afterEach` 等守卫。
+   *
+   * 注意:setup 必须同步注册守卫(虽然守卫本身可以返回 Promise)。
+   * 不要在 setup 中执行异步操作(如请求 API),因为这会延迟首次导航。
+   */
+  setup?: (router: Router) => void;
+  /**
+   * vue-router `scrollBehavior`,覆盖 `createUbeanRouter` 的默认滚动策略。
+   * 未配置时使用框架默认:回到顶部;带 hash 且目标元素存在时平滑滚动。
+   */
+  scrollBehavior?: RouterOptions['scrollBehavior'];
+}
+interface DefineAppOptions {
+  plugins?: Array<Plugin | [Plugin, ...any[]] | AppPluginConfig>;
+  globalComponents?: Record<string, Component>;
+  provides?: Record<string | symbol, unknown>;
+  head?: PageHead;
+  rootId?: string;
+  rootAttrs?: Record<string, string>;
+  /**
+   * 应用根组件(包装组件,可选)—— 经典 Vue `App.vue` 的编程式等价物。
+   *
+   * 组件包裹在框架根组件(`UbeanAppRoot`)之上,框架出口(布局链 + 页面)
+   * 通过**默认 slot** 注入,组件内用 `<slot />` 声明渲染位置:
+   *
+   * ```vue
+   * <!-- src/app.ts 对应的 AppRoot.vue -->
+   * <template>
+   *   <SConfigProvider>
+   *     <AppHeader />
+   *     <slot /> <!-- 布局链 + 页面在这里渲染 -->
+   *   </SConfigProvider>
+   * </template>
+   * ```
+   *
+   * 适合放置"必须在布局之上"的全局内容:全局 ConfigProvider/主题上下文、
+   * 覆盖布局自身的错误边界、全局过渡/动效容器等。不要用它渲染
+   * `<PageView />` / `<RouterView />` —— 那会绕过布局链;出口是 `<slot />`。
+   *
+   * 自动检测:`src/app.vue`(小写,Nuxt 风格,优先)/ `src/App.vue`
+   * (大写,经典 Vue 约定)文件约定(与 loading/error 特殊页同模式),
+   * 两者都存在时取小写;无该文件时忽略。优先级:
+   * `defineApp({ appRoot })` > `src/app.vue` > `src/App.vue`。
+   */
+  appRoot?: Component;
+  /**
+   * 路由钩子配置,用于注册 vue-router 的导航守卫。
+   * 在 Client 和 SSR 都会执行。
+   */
+  router?: RouterConfig;
+  onAppCreated?: (app: App) => void | Promise<void>;
+  onClientReady?: (app: App) => void | Promise<void>;
+  errorComponent?: Component;
+  loadingComponent?: Component;
+  viewTransitions?: boolean | ViewTransitionOptions;
+  /**
+   * SSR 专用:在 `renderToString(app)` 完成后调用,从 app 实例提取需要
+   * 序列化到客户端的状态(如 Pinia 的 `pinia.state.value`)。
+   *
+   * 返回的对象会被 `safeJsonStringify` 序列化并注入到 HTML 的
+   * `__UBEAN_STATE__` script 标签中。
+   *
+   * 仅在 server mode 下生效;client mode 下被忽略。
+   *
+   * @example
+   * ```ts
+   * import { createPinia } from 'pinia';
+   * defineApp({
+   *   plugins: [createPinia()],
+   *   serializeState: (app) => ({
+   *     pinia: app.config.globalProperties.$pinia.state.value
+   *   })
+   * });
+   * ```
+   */
+  serializeState?: (app: App) => Record<string, unknown> | Promise<Record<string, unknown>>;
+  /**
+   * Client 专用:在 `applyAppConfig`(注册插件/provide)之后、`app.mount()` 之前调用,
+   * 用于从 `__UBEAN_STATE__` 反序列化的状态回填到 app(如 Pinia 的水合)。
+   *
+   * `state` 即 `serializeState` 在服务端返回的对象;若服务端未配置 `serializeState`
+   * 或返回空,`state` 为 `null`。
+   *
+   * 仅在 client mode 下生效;server mode 下被忽略。
+   *
+   * @example
+   * ```ts
+   * import { createPinia } from 'pinia';
+   * defineApp({
+   *   plugins: [createPinia()],
+   *   hydrateState: (app, state) => {
+   *     if (state?.pinia) {
+   *       app.config.globalProperties.$pinia.state.value = state.pinia;
+   *     }
+   *   }
+   * });
+   * ```
+   */
+  hydrateState?: (app: App, state: Record<string, unknown> | null) => void;
+}
+interface ResolvedAppConfig {
+  plugins: AppPluginConfig[];
+  globalComponents: Record<string, Component>;
+  provides: Record<string | symbol, unknown>;
+  head?: PageHead;
+  rootId: string;
+  rootAttrs: Record<string, string>;
+  /**
+   * 应用根组件(包装组件,可选)。语义见 `DefineAppOptions.appRoot`。
+   */
+  appRoot?: Component;
+  router?: RouterConfig;
+  onAppCreated?: (app: App) => void | Promise<void>;
+  onClientReady?: (app: App) => void | Promise<void>;
+  errorComponent?: Component;
+  loadingComponent?: Component;
+  viewTransitions?: boolean | ViewTransitionOptions;
+  serializeState?: (app: App) => Record<string, unknown> | Promise<Record<string, unknown>>;
+  hydrateState?: (app: App, state: Record<string, unknown> | null) => void;
+}
+declare function defineApp(options: DefineAppOptions): ResolvedAppConfig;
+declare function applyAppConfig(app: App, config: ResolvedAppConfig, mode: 'client' | 'server'): void;
+declare function createDefaultAppConfig(): ResolvedAppConfig;
+/**
+ * 从多个 `ResolvedAppConfig` 合并出一个最终配置(shared + client/server)。
+ *
+ * `serializeState` 与 `hydrateState` 的合并语义:server 配置的 `serializeState` 优先,
+ * client 配置的 `hydrateState` 优先;shared 配置作为默认值。
+ *
+ * 这个函数在 `virtual:ubean-app` 虚拟模块中以 JS 字符串形式重新实现
+ * (`_mergeAppConfig`),保持两者语义一致。
+ */
+declare function mergeAppConfig(base: ResolvedAppConfig, ...configs: (ResolvedAppConfig | null | undefined)[]): ResolvedAppConfig;
+//#endregion
+export { applyAppConfig as a, mergeAppConfig as c, RouterConfig as i, DefineAppOptions as n, createDefaultAppConfig as o, ResolvedAppConfig as r, defineApp as s, AppPluginConfig as t };

package/dist/define-app.d.ts

@@ -1,168 +1,2 @@
-import { App, Component, Plugin } from "vue";
-import { Router } from "vue-router";
-import { ViewTransitionOptions } from "@ubean/vue";
-import { PageHead } from "@ubean/shared";
-//#region src/define-app.d.ts
-interface AppPluginConfig {
-  plugin: Plugin | [Plugin, ...any[]];
-  mode?: 'all' | 'client' | 'server';
-}
-/**
- * Router 钩子配置 — 暴露 vue-router 的导航守卫注册入口。
- *
- * `setup(router)` 在 router 实例创建后、`app.use(router)` 之前调用,
- * 因此守卫能拦截首次导航(包括 SSR 的初始 URL push)。
- *
- * Client 和 SSR 都会执行,适合做鉴权、埋点、进度条等逻辑。
- *
- * @example
- * ```ts
- * defineApp({
- *   router: {
- *     setup(router) {
- *       router.beforeEach((to, from) => {
- *         if (to.meta.requiresAuth && !isAuthenticated()) {
- *           return '/login';
- *         }
- *       });
- *       router.afterEach((to) => {
- *         analytics.track('page_view', { path: to.fullPath });
- *       });
- *     }
- *   }
- * });
- * ```
- */
-interface RouterConfig {
-  /**
-   * 在 router 创建后、初始导航前调用。
-   * 用于注册 `beforeEach` / `beforeResolve` / `afterEach` 等守卫。
-   *
-   * 注意:setup 必须同步注册守卫(虽然守卫本身可以返回 Promise)。
-   * 不要在 setup 中执行异步操作(如请求 API),因为这会延迟首次导航。
-   */
-  setup?: (router: Router) => void;
-}
-interface DefineAppOptions {
-  plugins?: Array<Plugin | [Plugin, ...any[]] | AppPluginConfig>;
-  globalComponents?: Record<string, Component>;
-  provides?: Record<string | symbol, unknown>;
-  head?: PageHead;
-  rootId?: string;
-  rootAttrs?: Record<string, string>;
-  /**
-   * 应用根组件(包装组件,可选)—— 经典 Vue `App.vue` 的编程式等价物。
-   *
-   * 组件包裹在框架根组件(`UbeanAppRoot`)之上,框架出口(布局链 + 页面)
-   * 通过**默认 slot** 注入,组件内用 `<slot />` 声明渲染位置:
-   *
-   * ```vue
-   * <!-- src/app.ts 对应的 AppRoot.vue -->
-   * <template>
-   *   <SConfigProvider>
-   *     <AppHeader />
-   *     <slot /> <!-- 布局链 + 页面在这里渲染 -->
-   *   </SConfigProvider>
-   * </template>
-   * ```
-   *
-   * 适合放置"必须在布局之上"的全局内容:全局 ConfigProvider/主题上下文、
-   * 覆盖布局自身的错误边界、全局过渡/动效容器等。不要用它渲染
-   * `<PageView />` / `<RouterView />` —— 那会绕过布局链;出口是 `<slot />`。
-   *
-   * 自动检测:`src/app.vue`(小写,Nuxt 风格,优先)/ `src/App.vue`
-   * (大写,经典 Vue 约定)文件约定(与 loading/error 特殊页同模式),
-   * 两者都存在时取小写;无该文件时忽略。优先级:
-   * `defineApp({ appRoot })` > `src/app.vue` > `src/App.vue`。
-   */
-  appRoot?: Component;
-  /**
-   * 路由钩子配置,用于注册 vue-router 的导航守卫。
-   * 在 Client 和 SSR 都会执行。
-   */
-  router?: RouterConfig;
-  onAppCreated?: (app: App) => void | Promise<void>;
-  onClientReady?: (app: App) => void | Promise<void>;
-  errorComponent?: Component;
-  loadingComponent?: Component;
-  viewTransitions?: boolean | ViewTransitionOptions;
-  /**
-   * SSR 专用:在 `renderToString(app)` 完成后调用,从 app 实例提取需要
-   * 序列化到客户端的状态(如 Pinia 的 `pinia.state.value`)。
-   *
-   * 返回的对象会被 `safeJsonStringify` 序列化并注入到 HTML 的
-   * `__UBEAN_STATE__` script 标签中。
-   *
-   * 仅在 server mode 下生效;client mode 下被忽略。
-   *
-   * @example
-   * ```ts
-   * import { createPinia } from 'pinia';
-   * defineApp({
-   *   plugins: [createPinia()],
-   *   serializeState: (app) => ({
-   *     pinia: app.config.globalProperties.$pinia.state.value
-   *   })
-   * });
-   * ```
-   */
-  serializeState?: (app: App) => Record<string, unknown> | Promise<Record<string, unknown>>;
-  /**
-   * Client 专用:在 `applyAppConfig`(注册插件/provide)之后、`app.mount()` 之前调用,
-   * 用于从 `__UBEAN_STATE__` 反序列化的状态回填到 app(如 Pinia 的水合)。
-   *
-   * `state` 即 `serializeState` 在服务端返回的对象;若服务端未配置 `serializeState`
-   * 或返回空,`state` 为 `null`。
-   *
-   * 仅在 client mode 下生效;server mode 下被忽略。
-   *
-   * @example
-   * ```ts
-   * import { createPinia } from 'pinia';
-   * defineApp({
-   *   plugins: [createPinia()],
-   *   hydrateState: (app, state) => {
-   *     if (state?.pinia) {
-   *       app.config.globalProperties.$pinia.state.value = state.pinia;
-   *     }
-   *   }
-   * });
-   * ```
-   */
-  hydrateState?: (app: App, state: Record<string, unknown> | null) => void;
-}
-interface ResolvedAppConfig {
-  plugins: AppPluginConfig[];
-  globalComponents: Record<string, Component>;
-  provides: Record<string | symbol, unknown>;
-  head?: PageHead;
-  rootId: string;
-  rootAttrs: Record<string, string>;
-  /**
-   * 应用根组件(包装组件,可选)。语义见 `DefineAppOptions.appRoot`。
-   */
-  appRoot?: Component;
-  router?: RouterConfig;
-  onAppCreated?: (app: App) => void | Promise<void>;
-  onClientReady?: (app: App) => void | Promise<void>;
-  errorComponent?: Component;
-  loadingComponent?: Component;
-  viewTransitions?: boolean | ViewTransitionOptions;
-  serializeState?: (app: App) => Record<string, unknown> | Promise<Record<string, unknown>>;
-  hydrateState?: (app: App, state: Record<string, unknown> | null) => void;
-}
-declare function defineApp(options: DefineAppOptions): ResolvedAppConfig;
-declare function applyAppConfig(app: App, config: ResolvedAppConfig, mode: 'client' | 'server'): void;
-declare function createDefaultAppConfig(): ResolvedAppConfig;
-/**
- * 从多个 `ResolvedAppConfig` 合并出一个最终配置(shared + client/server)。
- *
- * `serializeState` 与 `hydrateState` 的合并语义:server 配置的 `serializeState` 优先,
- * client 配置的 `hydrateState` 优先;shared 配置作为默认值。
- *
- * 这个函数在 `virtual:ubean-app` 虚拟模块中以 JS 字符串形式重新实现
- * (`_mergeAppConfig`),保持两者语义一致。
- */
-declare function mergeAppConfig(base: ResolvedAppConfig, ...configs: (ResolvedAppConfig | null | undefined)[]): ResolvedAppConfig;
-//#endregion
+import { a as applyAppConfig, c as mergeAppConfig, i as RouterConfig, n as DefineAppOptions, o as createDefaultAppConfig, r as ResolvedAppConfig, s as defineApp, t as AppPluginConfig } from "./define-app-RzHOZlYB.js";
 export { AppPluginConfig, DefineAppOptions, ResolvedAppConfig, RouterConfig, applyAppConfig, createDefaultAppConfig, defineApp, mergeAppConfig };

package/dist/define-app.js

@@ -84,13 +84,17 @@ function mergeAppConfig(base, ...configs) {
 		if (cfg.viewTransitions !== void 0) result.viewTransitions = cfg.viewTransitions;
 		if (cfg.serializeState) result.serializeState = cfg.serializeState;
 		if (cfg.hydrateState) result.hydrateState = cfg.hydrateState;
-		if (cfg.router?.setup) {
-			const prevSetup = result.router?.setup;
-			if (prevSetup) result.router = { setup: (router) => {
-				prevSetup(router);
+		if (cfg.router) {
+			const prev = result.router;
+			const setup = cfg.router.setup ? prev?.setup ? (router) => {
+				prev.setup(router);
 				cfg.router.setup(router);
-			} };
-			else result.router = { setup: cfg.router.setup };
+			} : cfg.router.setup : prev?.setup;
+			const scrollBehavior = cfg.router.scrollBehavior !== void 0 ? cfg.router.scrollBehavior : prev?.scrollBehavior;
+			result.router = {
+				setup,
+				...scrollBehavior !== void 0 ? { scrollBehavior } : {}
+			};
 		}
 	}
 	return result;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, T as definePage, _ as createUbeanClientApp, b as useSeoMeta, h as UbeanAppOptions, k as createUbeanRouter, m as UbeanAppInstance, n as Head, v as createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead } from "./app-BQgi-8Qp.js";
-import { AppPluginConfig, DefineAppOptions, ResolvedAppConfig, applyAppConfig, createDefaultAppConfig, defineApp, mergeAppConfig } from "./define-app.js";
+import { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, T as definePage, _ as createUbeanClientApp, b as useSeoMeta, h as UbeanAppOptions, k as createUbeanRouter, m as UbeanAppInstance, n as Head, v as createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead } from "./app-emLZM9XN.js";
+import { a as applyAppConfig, c as mergeAppConfig, n as DefineAppOptions, o as createDefaultAppConfig, r as ResolvedAppConfig, s as defineApp, t as AppPluginConfig } from "./define-app-RzHOZlYB.js";
 import { App, ComputedRef, Ref, ShallowRef } from "vue";
 import "vue-router";
 import { ERROR_KEY, ErrorBoundary, LAYOUT_CHAIN_KEY, LOADING_KEY, LOCALIZE_PATH_KEY, LayoutChainContext, LayoutChainRenderer, Link, PAGE_KEY, PageView, RouteLocation, RouteLocationRaw, SSR_KEY, SlotView, TRANSITION_KEY, TypedLinkProps, UbeanVueOptions, UbeanVuePageData, UseCacheViewsReturn, UsePageTransitionReturn, UseReloadSignalReturn, ViewTransitionOptions, clearPageTransition, disablePageCache, enablePageCache, excludePageCache, getCacheEnabled, getCachedViewNames, getExcludedViewNames, getNamedPageWrapper, getNavigationType, getPageTransitionName, getReloadCounter, includePageCache, initCachedViewsFromRoutes, invalidatePageCache, isActiveRoute, isCacheEnabled, isPageCached, isPageExcluded, isReloading, reloadPage, resetNamedPageWrappers, resetRouteCache, resolveRoute, setPageTransition, supportsViewTransitions, ubeanVue, useCacheViews, usePageTransition, useReloadSignal, useViewTransition, useViewTransitionState, withViewTransition } from "@ubean/vue";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, b as defineMiddleware, g as useSeoMeta, m as createUbeanSSRApp, n as Head, p as createUbeanClientApp, x as definePage, y as defineMeta } from "./app-DiXW_14_.js";
+import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, b as defineMiddleware, g as useSeoMeta, m as createUbeanSSRApp, n as Head, p as createUbeanClientApp, x as definePage, y as defineMeta } from "./app-Bt-2meGm.js";
 import { a as getI18nRuntimeConfig, c as installUbeanI18n, d as switchLocalePath, f as useLocaleHead, h as useSwitchLocalePath, i as extractLocaleFromPath, l as localizePath, m as useLocaleRoute, n as configureI18nRuntime, o as getLocale, p as useLocalePath, r as createUbeanI18n, s as initClientI18n, u as setLocale } from "./i18n-CAeXKTpy.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 { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, S as useViewTransition, T as definePage, _ as createUbeanClientApp, a as LOCALIZE_PATH_KEY, b as useSeoMeta, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, k as createUbeanRouter, 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 createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead, y as ubeanVue } from "./app-BQgi-8Qp.js";
+import { C as defineMeta, D as usePage, E as UbeanVuePage, O as CreateUbeanRouterOptions, S as useViewTransition, T as definePage, _ as createUbeanClientApp, a as LOCALIZE_PATH_KEY, b as useSeoMeta, c as Link, d as SSR_KEY, f as SlotView, g as UbeanVueOptions, h as UbeanAppOptions, i as LOADING_KEY, k as createUbeanRouter, 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 createUbeanSSRApp, w as defineMiddleware, x as useUnheadHead, y as ubeanVue } from "./app-emLZM9XN.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, createServerHead, createUbeanClientApp, createUbeanRouter, createUbeanSSRApp, defineMeta, defineMiddleware, definePage, ubeanVue, useUnheadHead as useHead, usePage, useSeoMeta, useViewTransition };

package/dist/server.js

@@ -1,3 +1,3 @@
-import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, a as LOCALIZE_PATH_KEY, b as defineMiddleware, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useSeoMeta, 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 useViewTransition, x as definePage, y as defineMeta } from "./app-DiXW_14_.js";
+import { C as usePage, S as createUbeanRouter, _ as useUnheadHead, a as LOCALIZE_PATH_KEY, b as defineMiddleware, c as PAGE_KEY, d as SlotView, f as TRANSITION_KEY, g as useSeoMeta, 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 useViewTransition, x as definePage, y as defineMeta } from "./app-Bt-2meGm.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, useSeoMeta, useViewTransition };

package/dist/ssr.d.ts

@@ -1,4 +1,4 @@
-import { ResolvedAppConfig } from "./define-app.js";
+import { r as ResolvedAppConfig } from "./define-app-RzHOZlYB.js";
 import { Component } from "vue";
 import { RouteRecordRaw } from "vue-router";
 import { PageRenderer } from "@ubean/pages";

package/dist/ssr.js

@@ -124,6 +124,7 @@ async function prepareRender(options, pageObj, renderContext) {
 			defaultLayout: options.defaultLayout,
 			head,
 			i18n,
+			router: appConfig?.router,
 			appRoot: appConfig?.appRoot
 		});
 		if (appConfig) await applyServerAppConfig(createdApp, appConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubean/client",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "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.4.4",
-    "@ubean/islands": "0.4.4",
-    "@ubean/pages": "0.4.4",
-    "@ubean/shared": "0.4.4",
-    "@ubean/vue": "0.4.4",
+    "@ubean/i18n": "0.4.5",
+    "@ubean/islands": "0.4.5",
+    "@ubean/pages": "0.4.5",
+    "@ubean/shared": "0.4.5",
+    "@ubean/vue": "0.4.5",
     "@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.4.4"
+    "@ubean/seo": "0.4.5"
   },
   "peerDependenciesMeta": {
     "@ubean/seo": {