@btst/stack 3.0.2 → 3.1.0

package/dist/shared/{stack.BggTHKlo.d.mts → stack.DhZtP2JZ.d.mts}

@@ -2,7 +2,7 @@ import * as _btst_stack_plugins_client from '@btst/stack/plugins/client';
 import { createApiClient } from '@btst/stack/plugins/client';
 import * as zod from 'zod';
 import { z } from 'zod';
-import { c as createPostSchema, u as updatePostSchema } from './stack.CKc_Bais.mjs';
+import { c as createPostSchema, u as updatePostSchema } from './stack.Csi-4Mgz.mjs';
 import { P as Post, T as Tag, S as SerializedPost, a as SerializedTag } from './stack.Dsatjh0B.mjs';
 import * as _btst_stack_plugins_api from '@btst/stack/plugins/api';
 import { DeepReadonly, OperationContext, OperationErrorContext } from '@btst/stack/plugins/api';
@@ -89,12 +89,6 @@ declare const NextPreviousPostsQuerySchema: z.ZodObject<{
     date: z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>;
 }, z.core.$strip>;
 declare const CreatePostOperationInputSchema: z.ZodObject<{
-    slug: z.ZodOptional<z.ZodString>;
-    title: z.ZodString;
-    content: z.ZodString;
-    excerpt: z.ZodString;
-    image: z.ZodOptional<z.ZodString>;
-    published: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     tags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         name: z.ZodString;
     }, z.core.$strip>, z.ZodObject<{
@@ -102,6 +96,12 @@ declare const CreatePostOperationInputSchema: z.ZodObject<{
         name: z.ZodString;
         slug: z.ZodString;
     }, z.core.$strip>]>>>>;
+    slug: z.ZodOptional<z.ZodString>;
+    title: z.ZodString;
+    content: z.ZodString;
+    excerpt: z.ZodString;
+    image: z.ZodOptional<z.ZodString>;
+    published: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     publishedAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
     createdAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
     updatedAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
@@ -109,12 +109,6 @@ declare const CreatePostOperationInputSchema: z.ZodObject<{
 declare const UpdatePostOperationInputSchema: z.ZodObject<{
     id: z.ZodString;
     data: z.ZodObject<{
-        slug: z.ZodString;
-        title: z.ZodString;
-        content: z.ZodString;
-        excerpt: z.ZodString;
-        image: z.ZodOptional<z.ZodString>;
-        published: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         tags: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             name: z.ZodString;
         }, z.core.$strip>, z.ZodObject<{
@@ -122,6 +116,12 @@ declare const UpdatePostOperationInputSchema: z.ZodObject<{
             name: z.ZodString;
             slug: z.ZodString;
         }, z.core.$strip>]>>>>;
+        slug: z.ZodString;
+        title: z.ZodString;
+        content: z.ZodString;
+        excerpt: z.ZodString;
+        image: z.ZodOptional<z.ZodString>;
+        published: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         publishedAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
         createdAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
         updatedAt: z.ZodOptional<z.ZodPipe<z.ZodCoercedDate<unknown>, z.ZodTransform<string, Date>>>;
@@ -386,9 +386,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
             title: string;
             content: string;
             excerpt: string;
-            slug?: string | undefined;
-            image?: string | undefined;
-            published?: boolean | undefined;
             tags?: ({
                 name: string;
             } | {
@@ -396,6 +393,9 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
                 name: string;
                 slug: string;
             })[] | undefined;
+            slug?: string | undefined;
+            image?: string | undefined;
+            published?: boolean | undefined;
             publishedAt?: unknown;
             createdAt?: unknown;
             updatedAt?: unknown;
@@ -403,9 +403,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
             title: string;
             content: string;
             excerpt: string;
-            slug?: string | undefined;
-            image?: string | undefined;
-            published?: boolean | undefined;
             tags?: ({
                 name: string;
             } | {
@@ -413,6 +410,9 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
                 name: string;
                 slug: string;
             })[] | undefined;
+            slug?: string | undefined;
+            image?: string | undefined;
+            published?: boolean | undefined;
             publishedAt?: unknown;
             createdAt?: unknown;
             updatedAt?: unknown;
@@ -448,8 +448,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
             title: string;
             content: string;
             excerpt: string;
-            image?: string | undefined;
-            published?: boolean | undefined;
             tags?: ({
                 name: string;
             } | {
@@ -457,6 +455,8 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
                 name: string;
                 slug: string;
             })[] | undefined;
+            image?: string | undefined;
+            published?: boolean | undefined;
             publishedAt?: unknown;
             createdAt?: unknown;
             updatedAt?: unknown;
@@ -465,8 +465,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
             title: string;
             content: string;
             excerpt: string;
-            image?: string | undefined;
-            published?: boolean | undefined;
             tags?: ({
                 name: string;
             } | {
@@ -474,6 +472,8 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
                 name: string;
                 slug: string;
             })[] | undefined;
+            image?: string | undefined;
+            published?: boolean | undefined;
             publishedAt?: unknown;
             createdAt?: unknown;
             updatedAt?: unknown;
@@ -627,12 +627,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
         total: number;
     }, false>;
     readonly createPost: _btst_stack_plugins_api.Operation<zod.ZodObject<{
-        slug: zod.ZodOptional<zod.ZodString>;
-        title: zod.ZodString;
-        content: zod.ZodString;
-        excerpt: zod.ZodString;
-        image: zod.ZodOptional<zod.ZodString>;
-        published: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
         tags: zod.ZodDefault<zod.ZodOptional<zod.ZodArray<zod.ZodUnion<readonly [zod.ZodObject<{
             name: zod.ZodString;
         }, zod_v4_core.$strip>, zod.ZodObject<{
@@ -640,6 +634,12 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
             name: zod.ZodString;
             slug: zod.ZodString;
         }, zod_v4_core.$strip>]>>>>;
+        slug: zod.ZodOptional<zod.ZodString>;
+        title: zod.ZodString;
+        content: zod.ZodString;
+        excerpt: zod.ZodString;
+        image: zod.ZodOptional<zod.ZodString>;
+        published: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
         publishedAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
         createdAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
         updatedAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
@@ -673,12 +673,6 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
     readonly updatePost: _btst_stack_plugins_api.Operation<zod.ZodObject<{
         id: zod.ZodString;
         data: zod.ZodObject<{
-            slug: zod.ZodString;
-            title: zod.ZodString;
-            content: zod.ZodString;
-            excerpt: zod.ZodString;
-            image: zod.ZodOptional<zod.ZodString>;
-            published: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
             tags: zod.ZodDefault<zod.ZodOptional<zod.ZodArray<zod.ZodUnion<readonly [zod.ZodObject<{
                 name: zod.ZodString;
             }, zod_v4_core.$strip>, zod.ZodObject<{
@@ -686,6 +680,12 @@ declare const blogBackendPlugin: (options?: BlogBackendOptions) => _btst_stack_p
                 name: zod.ZodString;
                 slug: zod.ZodString;
             }, zod_v4_core.$strip>]>>>>;
+            slug: zod.ZodString;
+            title: zod.ZodString;
+            content: zod.ZodString;
+            excerpt: zod.ZodString;
+            image: zod.ZodOptional<zod.ZodString>;
+            published: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
             publishedAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
             createdAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
             updatedAt: zod.ZodOptional<zod.ZodPipe<zod.ZodCoercedDate<unknown>, zod.ZodTransform<string, Date>>>;
@@ -900,8 +900,8 @@ declare const blogResources: {
                 method: "POST";
                 input: (vars: PostCreateInput) => {
                     body: {
-                        published: boolean;
                         title: string;
+                        published: boolean;
                         content: string;
                         excerpt: string;
                         tags: ({
@@ -1072,8 +1072,8 @@ declare function createBlogQueryKeys(client: ReturnType<typeof createApiClient<B
                 method: "POST";
                 input: (vars: PostCreateInput) => {
                     body: {
-                        published: boolean;
                         title: string;
+                        published: boolean;
                         content: string;
                         excerpt: string;
                         tags: ({

package/dist/shared/{stack.DfrRYOIl.d.ts → stack.Dpg_JjIo.d.ts}

@@ -2,7 +2,7 @@ import * as _tanstack_react_query from '@tanstack/react-query';
 import { z } from 'zod';
 import { ResourceFormConfig, ResourceFormResult } from '@btst/stack/plugins/client/hooks';
 import { S as SerializedPost, a as SerializedTag } from './stack.Dsatjh0B.js';
-import { c as createPostSchema, u as updatePostSchema } from './stack.CKc_Bais.js';
+import { c as createPostSchema, u as updatePostSchema } from './stack.Csi-4Mgz.js';
 
 /**
  * Options for the usePosts hook
@@ -136,10 +136,6 @@ declare function useSuspenseTags(): {
 declare function usePostForm<TValues>(config: ResourceFormConfig<TValues, SerializedPost | null, SerializedPost | null>): ResourceFormResult<TValues, SerializedPost | null, SerializedPost | null>;
 /** Create a new post */
 declare function useCreatePost(): _tanstack_react_query.UseMutationResult<SerializedPost | null, Error, {
-    title: string;
-    content: string;
-    excerpt: string;
-    published: boolean;
     tags: ({
         name: string;
     } | {
@@ -147,6 +143,10 @@ declare function useCreatePost(): _tanstack_react_query.UseMutationResult<Serial
         name: string;
         slug: string;
     })[];
+    title: string;
+    content: string;
+    excerpt: string;
+    published: boolean;
     slug?: string | undefined;
     publishedAt?: Date | undefined;
     createdAt?: Date | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/stack",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "A composable, plugin-based library for building full-stack applications.",
   "repository": {
     "type": "git",
@@ -799,7 +799,37 @@
     },
     "./dist/*": "./dist/*",
     "./ui/css": "./dist/ui/components.css",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./plugins/blog/client/pages/posts": {
+      "import": {
+        "types": "./dist/plugins/blog/client/pages/posts.d.ts",
+        "default": "./dist/plugins/blog/client/pages/posts.mjs"
+      },
+      "require": {
+        "types": "./dist/plugins/blog/client/pages/posts.d.cts",
+        "default": "./dist/plugins/blog/client/pages/posts.cjs"
+      }
+    },
+    "./plugins/blog/client/pages/post": {
+      "import": {
+        "types": "./dist/plugins/blog/client/pages/post.d.ts",
+        "default": "./dist/plugins/blog/client/pages/post.mjs"
+      },
+      "require": {
+        "types": "./dist/plugins/blog/client/pages/post.d.cts",
+        "default": "./dist/plugins/blog/client/pages/post.cjs"
+      }
+    },
+    "./plugins/blog/client/pages/tag": {
+      "import": {
+        "types": "./dist/plugins/blog/client/pages/tag.d.ts",
+        "default": "./dist/plugins/blog/client/pages/tag.mjs"
+      },
+      "require": {
+        "types": "./dist/plugins/blog/client/pages/tag.d.cts",
+        "default": "./dist/plugins/blog/client/pages/tag.cjs"
+      }
+    }
   },
   "typesVersions": {
     "*": {
@@ -1024,6 +1054,15 @@
       ],
       "components/empty": [
         "./dist/components/empty/index.d.ts"
+      ],
+      "plugins/blog/client/pages/posts": [
+        "./dist/plugins/blog/client/pages/posts.d.ts"
+      ],
+      "plugins/blog/client/pages/post": [
+        "./dist/plugins/blog/client/pages/post.d.ts"
+      ],
+      "plugins/blog/client/pages/tag": [
+        "./dist/plugins/blog/client/pages/tag.d.ts"
       ]
     }
   },

package/src/__tests__/provider-hydration.test.tsx

@@ -0,0 +1,164 @@
+// @vitest-environment jsdom
+import {
+	act,
+	createContext,
+	lazy,
+	useContext,
+	useEffect,
+	useLayoutEffect,
+	useState,
+	type ReactNode,
+	type ComponentType,
+} from "react";
+import { createRoot, hydrateRoot } from "react-dom/client";
+import { renderToString } from "react-dom/server";
+import { QueryClient } from "@tanstack/react-query";
+import { expect, it, vi } from "vitest";
+import { z } from "zod";
+import {
+	defineAuthorization,
+	definePermissions,
+	permission,
+} from "../authorization";
+import { createClientAuth } from "../authorization/client";
+import { createClientStack } from "../client";
+import { ComposedRoute } from "../client/components/compose";
+import { StackProvider, useStack } from "../context";
+
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
+
+const permissions = definePermissions("records", {
+	read: permission(z.object({ id: z.string() })),
+});
+const authorization = defineAuthorization({
+	identity: z.object({ id: z.string() }),
+	permissions: [permissions],
+	rules: ({ records }) => [
+		records.read.when(({ identity }) => identity?.id === "owner"),
+	],
+});
+const auth = createClientAuth({ authorization, getIdentity: () => null });
+const owner = { id: "owner" };
+const access = permissions.read({ id: "one" });
+const navigate = () => {};
+const useRouter = () => undefinedRouter;
+const undefinedRouter = {};
+const onError = () => {};
+const Content = () => <div data-content>Prefetched content</div>;
+const Loading = () => <div data-loading>Loading</div>;
+const ErrorPage = () => <div data-denied>Denied</div>;
+
+function createStack() {
+	return createClientStack({
+		api: { baseURL: "http://test.local", basePath: "/api/data" },
+		site: { baseURL: "http://test.local", basePath: "/pages" },
+		queryClient: new QueryClient(),
+		plugins: {},
+	});
+}
+
+it.each([false, true])(
+	"keeps pending page hydration safe when a provider rerenders (revoke: %s)",
+	async (revoke) => {
+		const stack = createStack();
+		function Provider({ children }: { children: ReactNode }) {
+			const [updated, setUpdated] = useState(false);
+			useEffect(() => setUpdated(true), []);
+			return (
+				<StackProvider
+					stack={stack}
+					router={{ navigate, useRouter }}
+					auth={auth}
+					initialIdentity={updated && revoke ? null : owner}
+				>
+					<output>{updated ? "updated" : "initial"}</output>
+					{children}
+				</StackProvider>
+			);
+		}
+		const tree = (Page: ComponentType) => (
+			<Provider>
+				<ComposedRoute
+					path="/record/one"
+					permission={access}
+					PageComponent={Page}
+					LoadingComponent={Loading}
+					ErrorComponent={ErrorPage}
+					onError={onError}
+				/>
+			</Provider>
+		);
+		const container = document.createElement("div");
+		container.innerHTML = renderToString(tree(Content));
+		expect(container.querySelector("[data-content]")).not.toBeNull();
+		const Pending = lazy(
+			() => new Promise<{ default: typeof Content }>(() => {}),
+		);
+		const consoleError = vi
+			.spyOn(console, "error")
+			.mockImplementation(() => {});
+		const consoleWarn = vi.spyOn(console, "warn").mockImplementation(() => {});
+		const onRecoverableError = vi.fn();
+		let root: ReturnType<typeof hydrateRoot> | undefined;
+		try {
+			await act(async () => {
+				root = hydrateRoot(container, tree(Pending), { onRecoverableError });
+			});
+			expect(container.querySelector("output")?.textContent).toBe("updated");
+			expect(container.querySelector("[data-content]") !== null).toBe(!revoke);
+			expect(container.querySelector("[data-denied]") !== null).toBe(revoke);
+			expect(container.querySelector("[data-loading]")).toBeNull();
+			expect(onRecoverableError).not.toHaveBeenCalled();
+		} finally {
+			await act(async () => root?.unmount());
+			stack.provider.queryClient.clear();
+			consoleError.mockRestore();
+			consoleWarn.mockRestore();
+		}
+	},
+);
+
+it("applies new router callbacks with the current host context before page effects", async () => {
+	const Workspace = createContext("A");
+	const stack = createStack();
+	const observations: string[] = [];
+	function Page() {
+		const workspace = useContext(Workspace);
+		const { router } = useStack();
+		useLayoutEffect(() => {
+			void router?.navigate?.(workspace);
+		}, [workspace]);
+		return null;
+	}
+	function App() {
+		const [workspace, setWorkspace] = useState("A");
+		useEffect(() => setWorkspace("B"), []);
+		return (
+			<Workspace.Provider value={workspace}>
+				<StackProvider
+					stack={stack}
+					router={{
+						navigate: (current) => {
+							observations.push(`${current}:${workspace}`);
+						},
+					}}
+				>
+					<ComposedRoute
+						path="/record"
+						PageComponent={Page}
+						LoadingComponent={Loading}
+						onError={onError}
+					/>
+				</StackProvider>
+			</Workspace.Provider>
+		);
+	}
+	const root = createRoot(document.createElement("div"));
+	try {
+		await act(async () => root.render(<App />));
+		expect(observations).toEqual(["A:A", "B:B"]);
+	} finally {
+		await act(async () => root.unmount());
+		stack.provider.queryClient.clear();
+	}
+});

package/src/context/auth.tsx

@@ -193,21 +193,28 @@ export function StackAuthBoundary({
 		void resolveIdentity(false);
 	}, [initialIdentity, resolveIdentity]);
 
-	return (
-		<AuthContext.Provider
-			value={{
-				provider,
-				identity: currentState.identity,
-				isPending: currentState.isPending,
-				sourceGeneration: currentResolutionGeneration,
-				...(currentState.error ? { error: currentState.error } : {}),
-				refetch,
-				waitForResolution,
-			}}
-		>
-			{children}
-		</AuthContext.Provider>
+	const value = useMemo(
+		() => ({
+			provider,
+			identity: currentState.identity,
+			isPending: currentState.isPending,
+			sourceGeneration: currentResolutionGeneration,
+			...(currentState.error ? { error: currentState.error } : {}),
+			refetch,
+			waitForResolution,
+		}),
+		[
+			provider,
+			currentState.identity,
+			currentState.isPending,
+			currentResolutionGeneration,
+			currentState.error,
+			refetch,
+			waitForResolution,
+		],
 	);
+
+	return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
 }
 
 /** @internal Access the raw auth context (or `null` when no provider is set). */

package/src/context/provider.tsx

@@ -2,6 +2,7 @@
 import {
 	createContext,
 	useContext,
+	useMemo,
 	type ReactElement,
 	type ReactNode,
 } from "react";
@@ -79,6 +80,10 @@ type StackProviderServices = {
 	i18n?: StackI18nProvider;
 };
 
+/** Plugin override configuration inferred from a resolved client stack. */
+export type ClientStackOverrides<TStack extends ResolvedClientStack<any, any>> =
+	InferredPluginOverrides<RegisteredClientPlugins<TStack>>;
+
 type CanonicalStackProviderOverrideProps<
 	TStack extends ResolvedClientStack<any, any>,
 > = InferredPluginOverrides<
@@ -110,12 +115,24 @@ function stripUndefined<T extends Record<string, any>>(obj: T): Partial<T> {
 	return result as Partial<T>;
 }
 
-function resolveStaticRouter(
-	router: StackRouterConfig | undefined,
-): StackRouter | undefined {
-	if (!router) return undefined;
-	const { useRouter: _useRouter, ...staticFields } = router;
-	return stripUndefined(staticFields);
+function useStaticRouter(router: StackRouterConfig | undefined) {
+	const { Link, Image, navigate, refresh, getSearchParams, setSearchParams } =
+		router ?? {};
+	const present = router !== undefined;
+	return useMemo(
+		() =>
+			present
+				? stripUndefined({
+						Link,
+						Image,
+						navigate,
+						refresh,
+						getSearchParams,
+						setSearchParams,
+					})
+				: undefined,
+		[present, Link, Image, navigate, refresh, getSearchParams, setSearchParams],
+	);
 }
 
 /**
@@ -135,15 +152,16 @@ function RouterBridge({
 	children?: ReactNode;
 }) {
 	const hookRouter = useRouter();
-	const router: StackRouter = {
-		...staticRouter,
-		...stripUndefined(hookRouter),
-	};
+	const context = useMemo(
+		() => ({
+			...value,
+			router: { ...staticRouter, ...stripUndefined(hookRouter) },
+		}),
+		[value, staticRouter, hookRouter],
+	);
 
 	return (
-		<StackContext.Provider value={{ ...value, router }}>
-			{children}
-		</StackContext.Provider>
+		<StackContext.Provider value={context}>{children}</StackContext.Provider>
 	);
 }
 
@@ -205,18 +223,25 @@ export function StackProvider<
 	i18n,
 }: CanonicalStackProviderProps<TStack>): ReactElement {
 	const projection = stack.provider;
-	const staticRouter = resolveStaticRouter(router);
-	const value: Omit<StackContextValue<any>, "router"> = {
-		overrides: overrides ?? {},
-		basePath: projection.site.basePath,
-		api: projection.api,
-		site: projection.site,
-		plugins: projection.plugins,
-		queryClient: projection.queryClient,
-		clientStackContext: stack.context,
-		resolvedStack: stack,
-		auth,
-	};
+	const staticRouter = useStaticRouter(router);
+	const value = useMemo(
+		() => ({
+			overrides: overrides ?? {},
+			basePath: projection.site.basePath,
+			api: projection.api,
+			site: projection.site,
+			plugins: projection.plugins,
+			queryClient: projection.queryClient,
+			clientStackContext: stack.context,
+			resolvedStack: stack,
+			auth,
+		}),
+		[overrides, stack, auth],
+	);
+	const context = useMemo(
+		() => ({ ...value, router: staticRouter }),
+		[value, staticRouter],
+	);
 
 	const content = auth ? (
 		<StackAuthBoundary provider={auth} initialIdentity={initialIdentity}>
@@ -235,9 +260,7 @@ export function StackProvider<
 			{content}
 		</RouterBridge>
 	) : (
-		<StackContext.Provider value={{ ...value, router: staticRouter }}>
-			{content}
-		</StackContext.Provider>
+		<StackContext.Provider value={context}>{content}</StackContext.Provider>
 	);
 
 	return (

package/src/plugins/blog/__tests__/page-load-error.test.tsx

@@ -0,0 +1,53 @@
+// @vitest-environment jsdom
+import { act, lazy } from "react";
+import { createRoot } from "react-dom/client";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { expect, it, vi } from "vitest";
+import { createClientStack } from "@btst/stack/client";
+import { StackProvider } from "@btst/stack/context";
+import { blogClientPlugin } from "@btst/stack/plugins/blog/client";
+import { createHomePage } from "../client/components/pages/home-page";
+
+(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
+
+it("reports a failed page module through the existing blog error hook and UI", async () => {
+	const error = new Error("Page module unavailable");
+	const Page = createHomePage(lazy(() => Promise.reject(error)));
+	const onRouteError = vi.fn();
+	const queryClient = new QueryClient();
+	const stack = createClientStack({
+		api: { baseURL: "http://test.local", basePath: "/api/data" },
+		site: { baseURL: "http://test.local", basePath: "/pages" },
+		queryClient,
+		plugins: { blog: blogClientPlugin() },
+	});
+	const container = document.createElement("div");
+	const root = createRoot(container);
+	const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+	try {
+		await act(async () =>
+			root.render(
+				<QueryClientProvider client={queryClient}>
+					<StackProvider
+						stack={stack}
+						overrides={{ blog: { onRouteError, uploadImage: async () => "" } }}
+					>
+						<Page />
+					</StackProvider>
+				</QueryClientProvider>,
+			),
+		);
+		expect(
+			container.querySelector('[data-testid="error-placeholder"]'),
+		).not.toBeNull();
+		expect(onRouteError).toHaveBeenCalledExactlyOnceWith("posts", error, {
+			path: "/blog",
+			isSSR: false,
+			published: true,
+		});
+	} finally {
+		await act(async () => root.unmount());
+		queryClient.clear();
+		consoleError.mockRestore();
+	}
+});