@btst/stack 1.4.1 → 1.5.1

package/src/plugins/blog/client/components/pages/post-page.internal.tsx

@@ -17,19 +17,20 @@ import { BLOG_LOCALIZATION } from "../../localization";
 import { PostNavigation } from "../shared/post-navigation";
 import { RecentPostsCarousel } from "../shared/recent-posts-carousel";
 import { Badge } from "@workspace/ui/components/badge";
-import { useRouteLifecycle } from "../shared/use-route-lifecycle";
+import { useRouteLifecycle } from "@workspace/ui/hooks/use-route-lifecycle";
 import { OnThisPage, OnThisPageSelect } from "../shared/on-this-page";
 import type { SerializedPost } from "../../../types";
 
 // Internal component with actual page content
 export function PostPage({ slug }: { slug: string }) {
-	const { Image, localization } = usePluginOverrides<
+	const overrides = usePluginOverrides<
 		BlogPluginOverrides,
 		Partial<BlogPluginOverrides>
 	>("blog", {
 		Image: DefaultImage,
 		localization: BLOG_LOCALIZATION,
 	});
+	const { Image, localization } = overrides;
 
 	// Call lifecycle hooks
 	useRouteLifecycle({
@@ -39,6 +40,7 @@ export function PostPage({ slug }: { slug: string }) {
 			params: { slug },
 			isSSR: typeof window === "undefined",
 		},
+		overrides,
 		beforeRenderHook: (overrides, context) => {
 			if (overrides.onBeforePostPageRendered) {
 				return overrides.onBeforePostPageRendered(slug, context);

package/src/plugins/blog/client/components/pages/tag-page.internal.tsx

@@ -10,16 +10,17 @@ import { BLOG_LOCALIZATION } from "../../localization";
 import { usePluginOverrides } from "@btst/stack/context";
 import type { BlogPluginOverrides } from "../../overrides";
 import { useTags } from "../../hooks/blog-hooks";
-import { useRouteLifecycle } from "../shared/use-route-lifecycle";
+import { useRouteLifecycle } from "@workspace/ui/hooks/use-route-lifecycle";
 
 // Internal component with actual page content
 export function TagPage({ tagSlug }: { tagSlug: string }) {
-	const { localization } = usePluginOverrides<
+	const overrides = usePluginOverrides<
 		BlogPluginOverrides,
 		Partial<BlogPluginOverrides>
 	>("blog", {
 		localization: BLOG_LOCALIZATION,
 	});
+	const { localization } = overrides;
 
 	// Call lifecycle hooks
 	useRouteLifecycle({
@@ -29,6 +30,7 @@ export function TagPage({ tagSlug }: { tagSlug: string }) {
 			params: { tagSlug },
 			isSSR: typeof window === "undefined",
 		},
+		overrides,
 	});
 
 	const { tags } = useTags();

package/src/plugins/blog/client/components/shared/page-wrapper.tsx

@@ -1,8 +1,7 @@
 "use client";
 
 import { usePluginOverrides } from "@btst/stack/context";
-import { BetterStackAttribution } from "@workspace/ui/components/better-stack-attribution";
-import { PageLayout } from "./page-layout";
+import { PageWrapper as SharedPageWrapper } from "@workspace/ui/components/page-wrapper";
 import type { BlogPluginOverrides } from "../../overrides";
 
 export function PageWrapper({
@@ -20,13 +19,14 @@ export function PageWrapper({
 	>("blog", {
 		showAttribution: true,
 	});
-	return (
-		<>
-			<PageLayout className={className} data-testid={testId}>
-				{children}
-			</PageLayout>
 
-			{showAttribution && <BetterStackAttribution />}
-		</>
+	return (
+		<SharedPageWrapper
+			className={className}
+			testId={testId}
+			showAttribution={showAttribution}
+		>
+			{children}
+		</SharedPageWrapper>
 	);
 }

package/src/plugins/blog/client/plugin.tsx

@@ -386,15 +386,16 @@ function createTagLoader(tagSlug: string, config: BlogClientConfig) {
 				const tagsQuery = queries.tags.list();
 				await queryClient.prefetchQuery(tagsQuery);
 
-				if (hooks?.onLoadError) {
-					const queryState = queryClient.getQueryState(listQuery.queryKey);
-					if (queryState?.error) {
-						const error =
-							queryState.error instanceof Error
-								? queryState.error
-								: new Error(String(queryState.error));
-						await hooks.onLoadError(error, context);
-					}
+				// Check if there was an error in either query
+				const listState = queryClient.getQueryState(listQuery.queryKey);
+				const tagsState = queryClient.getQueryState(tagsQuery.queryKey);
+				const queryError = listState?.error || tagsState?.error;
+				if (queryError && hooks?.onLoadError) {
+					const error =
+						queryError instanceof Error
+							? queryError
+							: new Error(String(queryError));
+					await hooks.onLoadError(error, context);
 				}
 			} catch (error) {
 				if (hooks?.onLoadError) {