@btst/stack 2.9.3 → 2.9.4

package/dist/packages/stack/src/plugins/comments/client/plugin.mjs

@@ -1,6 +1,8 @@
 import { lazy } from 'react';
-import { defineClientPlugin, isConnectionError } from '@btst/stack/plugins/client';
+import { defineClientPlugin, createApiClient, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
+import { createCommentsQueryKeys } from '../../../../../../plugins/comments/query-keys.mjs';
+import { createSanitizedSSRLoaderError } from '../../utils.mjs';
 
 const ModerationPageComponent = lazy(
   () => import('./components/pages/moderation-page.mjs').then((m) => ({
@@ -15,7 +17,7 @@ const UserCommentsPageComponent = lazy(
 function createModerationLoader(config) {
   return async () => {
     if (typeof window === "undefined") {
-      const { apiBasePath, apiBaseURL, headers, hooks } = config;
+      const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
       const context = {
         path: "/comments/moderation",
         isSSR: true,
@@ -23,15 +25,40 @@ function createModerationLoader(config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createCommentsQueryKeys(client, headers);
+      const listQuery = queries.comments.list({
+        status: "pending",
+        limit: 20,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadModeration) {
           await hooks.beforeLoadModeration(context);
         }
+        await queryClient.prefetchQuery(listQuery);
+        const queryState = queryClient.getQueryState(listQuery.queryKey);
+        if (queryState?.error && hooks?.onLoadError) {
+          const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
+          await hooks.onLoadError(error, context);
+        }
       } catch (error) {
         if (isConnectionError(error)) {
           console.warn(
             "[btst/comments] route.loader() failed \u2014 no server running at build time."
           );
+        } else {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: listQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -43,7 +70,7 @@ function createModerationLoader(config) {
 function createUserCommentsLoader(config) {
   return async () => {
     if (typeof window === "undefined") {
-      const { apiBasePath, apiBaseURL, headers, hooks } = config;
+      const { queryClient, apiBasePath, apiBaseURL, headers, hooks } = config;
       const context = {
         path: "/comments",
         isSSR: true,
@@ -51,15 +78,48 @@ function createUserCommentsLoader(config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createCommentsQueryKeys(client, headers);
+      const getUserListQuery = (currentUserId) => queries.comments.list({
+        authorId: currentUserId,
+        sort: "desc",
+        limit: 20,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadUserComments) {
           await hooks.beforeLoadUserComments(context);
         }
+        const currentUserId = typeof context.currentUserId === "string" ? context.currentUserId : void 0;
+        if (currentUserId) {
+          const listQuery = getUserListQuery(currentUserId);
+          await queryClient.prefetchQuery(listQuery);
+          const queryState = queryClient.getQueryState(listQuery.queryKey);
+          if (queryState?.error && hooks?.onLoadError) {
+            const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
+            await hooks.onLoadError(error, context);
+          }
+        }
       } catch (error) {
         if (isConnectionError(error)) {
           console.warn(
             "[btst/comments] route.loader() failed \u2014 no server running at build time."
           );
+        } else {
+          const currentUserId = typeof context.currentUserId === "string" ? context.currentUserId : void 0;
+          if (currentUserId) {
+            const errToStore = createSanitizedSSRLoaderError();
+            await queryClient.prefetchQuery({
+              queryKey: getUserListQuery(currentUserId).queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            });
+          }
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);

package/dist/packages/stack/src/plugins/comments/client/utils.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 const React = require('react');
+const errorUtils = require('../error-utils.cjs');
 
 function useResolvedCurrentUserId(raw) {
   const [resolved, setResolved] = React.useState(
@@ -20,17 +21,7 @@ function useResolvedCurrentUserId(raw) {
   }, [raw]);
   return resolved;
 }
-function toError(error) {
-  if (error instanceof Error) return error;
-  if (typeof error === "object" && error !== null) {
-    const obj = error;
-    const message = (typeof obj.message === "string" ? obj.message : null) || (typeof obj.error === "string" ? obj.error : null) || JSON.stringify(error);
-    const err = new Error(message);
-    Object.assign(err, error);
-    return err;
-  }
-  return new Error(String(error));
-}
+const toError = errorUtils.toError;
 function getInitials(name) {
   if (!name) return "?";
   return name.split(" ").filter(Boolean).slice(0, 2).map((n) => n[0]).join("").toUpperCase();

package/dist/packages/stack/src/plugins/comments/client/utils.mjs

@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { toError as toError$1 } from '../error-utils.mjs';
 
 function useResolvedCurrentUserId(raw) {
   const [resolved, setResolved] = useState(
@@ -18,17 +19,7 @@ function useResolvedCurrentUserId(raw) {
   }, [raw]);
   return resolved;
 }
-function toError(error) {
-  if (error instanceof Error) return error;
-  if (typeof error === "object" && error !== null) {
-    const obj = error;
-    const message = (typeof obj.message === "string" ? obj.message : null) || (typeof obj.error === "string" ? obj.error : null) || JSON.stringify(error);
-    const err = new Error(message);
-    Object.assign(err, error);
-    return err;
-  }
-  return new Error(String(error));
-}
+const toError = toError$1;
 function getInitials(name) {
   if (!name) return "?";
   return name.split(" ").filter(Boolean).slice(0, 2).map((n) => n[0]).join("").toUpperCase();

package/dist/packages/stack/src/plugins/comments/error-utils.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+function toError(error) {
+  if (error instanceof Error) return error;
+  if (typeof error === "object" && error !== null) {
+    const obj = error;
+    const message = (typeof obj.message === "string" ? obj.message : null) || (typeof obj.error === "string" ? obj.error : null) || JSON.stringify(error);
+    const err = new Error(message);
+    Object.assign(err, error);
+    return err;
+  }
+  return new Error(String(error));
+}
+
+exports.toError = toError;

package/dist/packages/stack/src/plugins/comments/error-utils.mjs

@@ -0,0 +1,13 @@
+function toError(error) {
+  if (error instanceof Error) return error;
+  if (typeof error === "object" && error !== null) {
+    const obj = error;
+    const message = (typeof obj.message === "string" ? obj.message : null) || (typeof obj.error === "string" ? obj.error : null) || JSON.stringify(error);
+    const err = new Error(message);
+    Object.assign(err, error);
+    return err;
+  }
+  return new Error(String(error));
+}
+
+export { toError };

package/dist/packages/stack/src/plugins/form-builder/client/plugin.cjs

@@ -4,6 +4,7 @@ const jsxRuntime = require('react/jsx-runtime');
 const React = require('react');
 const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
+const utils = require('../../utils.cjs');
 const plugins_formBuilder_queryKeys = require('../../../../../../plugins/form-builder/query-keys.cjs');
 
 const FormListPageComponent = React.lazy(
@@ -32,6 +33,13 @@ function createFormListLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
+      const limit = 20;
+      const listQuery = queries.forms.list({ limit, offset: 0 });
       try {
         if (hooks?.beforeLoadFormList) {
           await client.runClientHookWithShim(
@@ -39,13 +47,6 @@ function createFormListLoader(config) {
             "Load prevented by beforeLoadFormList hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
-        const limit = 20;
-        const listQuery = queries.forms.list({ limit, offset: 0 });
         await queryClient.prefetchInfiniteQuery({
           queryKey: listQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -74,6 +75,16 @@ function createFormListLoader(config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchInfiniteQuery({
+            queryKey: listQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            initialPageParam: 0,
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -94,6 +105,12 @@ function createFormBuilderLoader(id, config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
+      const formQuery = id ? queries.forms.byId(id) : void 0;
       try {
         if (hooks?.beforeLoadFormBuilder) {
           await client.runClientHookWithShim(
@@ -101,21 +118,14 @@ function createFormBuilderLoader(id, config) {
             "Load prevented by beforeLoadFormBuilder hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
         if (id) {
-          await queryClient.prefetchQuery(queries.forms.byId(id));
+          await queryClient.prefetchQuery(formQuery);
         }
         if (hooks?.afterLoadFormBuilder) {
           await hooks.afterLoadFormBuilder(id, context);
         }
         if (id) {
-          const queryState = queryClient.getQueryState(
-            queries.forms.byId(id).queryKey
-          );
+          const queryState = queryClient.getQueryState(formQuery.queryKey);
           if (queryState?.error && hooks?.onLoadError) {
             const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
             await hooks.onLoadError(error, context);
@@ -126,6 +136,15 @@ function createFormBuilderLoader(id, config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else if (formQuery) {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: formQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -146,6 +165,18 @@ function createSubmissionsLoader(formId, config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
+      const limit = 20;
+      const formQuery = queries.forms.byId(formId);
+      const submissionsQuery = queries.formSubmissions.list({
+        formId,
+        limit,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadSubmissions) {
           await client.runClientHookWithShim(
@@ -153,18 +184,7 @@ function createSubmissionsLoader(formId, config) {
             "Load prevented by beforeLoadSubmissions hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_formBuilder_queryKeys.createFormBuilderQueryKeys(client$1, headers);
-        const limit = 20;
-        await queryClient.prefetchQuery(queries.forms.byId(formId));
-        const submissionsQuery = queries.formSubmissions.list({
-          formId,
-          limit,
-          offset: 0
-        });
+        await queryClient.prefetchQuery(formQuery);
         await queryClient.prefetchInfiniteQuery({
           queryKey: submissionsQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -187,9 +207,7 @@ function createSubmissionsLoader(formId, config) {
         if (hooks?.afterLoadSubmissions) {
           await hooks.afterLoadSubmissions(formId, context);
         }
-        const formState = queryClient.getQueryState(
-          queries.forms.byId(formId).queryKey
-        );
+        const formState = queryClient.getQueryState(formQuery.queryKey);
         const submissionsState = queryClient.getQueryState(
           submissionsQuery.queryKey
         );
@@ -203,6 +221,16 @@ function createSubmissionsLoader(formId, config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchInfiniteQuery({
+            queryKey: submissionsQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            initialPageParam: 0,
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);

package/dist/packages/stack/src/plugins/form-builder/client/plugin.mjs

@@ -2,6 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { lazy } from 'react';
 import { defineClientPlugin, createApiClient, runClientHookWithShim, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
+import { createSanitizedSSRLoaderError } from '../../utils.mjs';
 import { createFormBuilderQueryKeys } from '../../../../../../plugins/form-builder/query-keys.mjs';
 
 const FormListPageComponent = lazy(
@@ -30,6 +31,13 @@ function createFormListLoader(config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createFormBuilderQueryKeys(client, headers);
+      const limit = 20;
+      const listQuery = queries.forms.list({ limit, offset: 0 });
       try {
         if (hooks?.beforeLoadFormList) {
           await runClientHookWithShim(
@@ -37,13 +45,6 @@ function createFormListLoader(config) {
             "Load prevented by beforeLoadFormList hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createFormBuilderQueryKeys(client, headers);
-        const limit = 20;
-        const listQuery = queries.forms.list({ limit, offset: 0 });
         await queryClient.prefetchInfiniteQuery({
           queryKey: listQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -72,6 +73,16 @@ function createFormListLoader(config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchInfiniteQuery({
+            queryKey: listQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            initialPageParam: 0,
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -92,6 +103,12 @@ function createFormBuilderLoader(id, config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createFormBuilderQueryKeys(client, headers);
+      const formQuery = id ? queries.forms.byId(id) : void 0;
       try {
         if (hooks?.beforeLoadFormBuilder) {
           await runClientHookWithShim(
@@ -99,21 +116,14 @@ function createFormBuilderLoader(id, config) {
             "Load prevented by beforeLoadFormBuilder hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createFormBuilderQueryKeys(client, headers);
         if (id) {
-          await queryClient.prefetchQuery(queries.forms.byId(id));
+          await queryClient.prefetchQuery(formQuery);
         }
         if (hooks?.afterLoadFormBuilder) {
           await hooks.afterLoadFormBuilder(id, context);
         }
         if (id) {
-          const queryState = queryClient.getQueryState(
-            queries.forms.byId(id).queryKey
-          );
+          const queryState = queryClient.getQueryState(formQuery.queryKey);
           if (queryState?.error && hooks?.onLoadError) {
             const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
             await hooks.onLoadError(error, context);
@@ -124,6 +134,15 @@ function createFormBuilderLoader(id, config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else if (formQuery) {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: formQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -144,6 +163,18 @@ function createSubmissionsLoader(formId, config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createFormBuilderQueryKeys(client, headers);
+      const limit = 20;
+      const formQuery = queries.forms.byId(formId);
+      const submissionsQuery = queries.formSubmissions.list({
+        formId,
+        limit,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadSubmissions) {
           await runClientHookWithShim(
@@ -151,18 +182,7 @@ function createSubmissionsLoader(formId, config) {
             "Load prevented by beforeLoadSubmissions hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createFormBuilderQueryKeys(client, headers);
-        const limit = 20;
-        await queryClient.prefetchQuery(queries.forms.byId(formId));
-        const submissionsQuery = queries.formSubmissions.list({
-          formId,
-          limit,
-          offset: 0
-        });
+        await queryClient.prefetchQuery(formQuery);
         await queryClient.prefetchInfiniteQuery({
           queryKey: submissionsQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -185,9 +205,7 @@ function createSubmissionsLoader(formId, config) {
         if (hooks?.afterLoadSubmissions) {
           await hooks.afterLoadSubmissions(formId, context);
         }
-        const formState = queryClient.getQueryState(
-          queries.forms.byId(formId).queryKey
-        );
+        const formState = queryClient.getQueryState(formQuery.queryKey);
         const submissionsState = queryClient.getQueryState(
           submissionsQuery.queryKey
         );
@@ -201,6 +219,16 @@ function createSubmissionsLoader(formId, config) {
           console.warn(
             "[btst/form-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.formBuilder.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchInfiniteQuery({
+            queryKey: submissionsQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            initialPageParam: 0,
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);

package/dist/packages/stack/src/plugins/ui-builder/client/plugin.cjs

@@ -5,6 +5,7 @@ const React = require('react');
 const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
 const plugins_cms_queryKeys = require('../../../../../../plugins/cms/query-keys.cjs');
+const utils = require('../../utils.cjs');
 const schemas = require('../schemas.cjs');
 
 const PageListPageComponent = React.lazy(
@@ -29,6 +30,18 @@ function createPageListLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const limit = 20;
+      const listQuery = queries.cmsContent.list({
+        typeSlug,
+        limit,
+        offset: 0
+      });
+      const uiBuilderListQueryKey = [...listQuery.queryKey, "ui-builder"];
       try {
         if (hooks?.beforeLoadPageList) {
           await client.runClientHookWithShim(
@@ -36,19 +49,8 @@ function createPageListLoader(config) {
             "Load prevented by beforeLoadPageList hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
-        const limit = 20;
-        const listQuery = queries.cmsContent.list({
-          typeSlug,
-          limit,
-          offset: 0
-        });
         await queryClient.prefetchInfiniteQuery({
-          queryKey: [...listQuery.queryKey, "ui-builder"],
+          queryKey: uiBuilderListQueryKey,
           queryFn: async ({ pageParam = 0 }) => {
             const response = await client$1("/content/:typeSlug", {
               method: "GET",
@@ -67,14 +69,28 @@ function createPageListLoader(config) {
           await hooks.afterLoadPageList(context);
         }
         const queryState = queryClient.getQueryState([
-          ...listQuery.queryKey,
-          "ui-builder"
+          ...uiBuilderListQueryKey
         ]);
         if (queryState?.error && hooks?.onLoadError) {
           const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
           await hooks.onLoadError(error, context);
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/ui-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.uiBuilder.prefetchForRoute() for SSG data prefetching."
+          );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchInfiniteQuery({
+            queryKey: uiBuilderListQueryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            initialPageParam: 0,
+            retry: false
+          });
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }
@@ -95,6 +111,12 @@ function createPageBuilderLoader(id, config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const pageQuery = id ? queries.cmsContent.detail(typeSlug, id) : void 0;
       try {
         if (hooks?.beforeLoadPageBuilder) {
           await client.runClientHookWithShim(
@@ -102,29 +124,34 @@ function createPageBuilderLoader(id, config) {
             "Load prevented by beforeLoadPageBuilder hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
         if (id) {
-          await queryClient.prefetchQuery(
-            queries.cmsContent.detail(typeSlug, id)
-          );
+          await queryClient.prefetchQuery(pageQuery);
         }
         if (hooks?.afterLoadPageBuilder) {
           await hooks.afterLoadPageBuilder(id, context);
         }
         if (id) {
-          const queryState = queryClient.getQueryState(
-            queries.cmsContent.detail(typeSlug, id).queryKey
-          );
+          const queryState = queryClient.getQueryState(pageQuery.queryKey);
           if (queryState?.error && hooks?.onLoadError) {
             const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
             await hooks.onLoadError(error, context);
           }
         }
       } catch (error) {
+        if (client.isConnectionError(error)) {
+          console.warn(
+            "[btst/ui-builder] route.loader() failed \u2014 no server running at build time. Use myStack.api.uiBuilder.prefetchForRoute() for SSG data prefetching."
+          );
+        } else if (pageQuery) {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: pageQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
+        }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
         }