@btst/stack 2.9.2 → 2.9.4

package/dist/packages/stack/src/plugins/blog/client/plugin.cjs

@@ -3,6 +3,7 @@
 const jsxRuntime = require('react/jsx-runtime');
 const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
+const utils = require('../../utils.cjs');
 const plugins_blog_queryKeys = require('../../../../../../plugins/blog/query-keys.cjs');
 const homePage = require('./components/pages/home-page.cjs');
 const newPostPage = require('./components/pages/new-post-page.cjs');
@@ -21,6 +22,17 @@ function createPostsLoader(published, config) {
         apiBasePath,
         headers
       };
+      const limit = 10;
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_blog_queryKeys.createBlogQueryKeys(client$1, headers);
+      const listQuery = queries.posts.list({
+        query: void 0,
+        limit,
+        published
+      });
       try {
         if (hooks?.beforeLoadPosts) {
           await client.runClientHookWithShim(
@@ -28,17 +40,6 @@ function createPostsLoader(published, config) {
             "Load prevented by beforeLoadPosts hook"
           );
         }
-        const limit = 10;
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_blog_queryKeys.createBlogQueryKeys(client$1, headers);
-        const listQuery = queries.posts.list({
-          query: void 0,
-          limit,
-          published
-        });
         await queryClient.prefetchInfiniteQuery({
           ...listQuery,
           initialPageParam: 0
@@ -64,6 +65,16 @@ function createPostsLoader(published, config) {
           console.warn(
             "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.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);

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

@@ -1,6 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { defineClientPlugin, createApiClient, runClientHookWithShim, isConnectionError } from '@btst/stack/plugins/client';
 import { createRoute } from '@btst/yar';
+import { createSanitizedSSRLoaderError } from '../../utils.mjs';
 import { createBlogQueryKeys } from '../../../../../../plugins/blog/query-keys.mjs';
 import { HomePageComponent } from './components/pages/home-page.mjs';
 import { NewPostPageComponent } from './components/pages/new-post-page.mjs';
@@ -19,6 +20,17 @@ function createPostsLoader(published, config) {
         apiBasePath,
         headers
       };
+      const limit = 10;
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createBlogQueryKeys(client, headers);
+      const listQuery = queries.posts.list({
+        query: void 0,
+        limit,
+        published
+      });
       try {
         if (hooks?.beforeLoadPosts) {
           await runClientHookWithShim(
@@ -26,17 +38,6 @@ function createPostsLoader(published, config) {
             "Load prevented by beforeLoadPosts hook"
           );
         }
-        const limit = 10;
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createBlogQueryKeys(client, headers);
-        const listQuery = queries.posts.list({
-          query: void 0,
-          limit,
-          published
-        });
         await queryClient.prefetchInfiniteQuery({
           ...listQuery,
           initialPageParam: 0
@@ -62,6 +63,16 @@ function createPostsLoader(published, config) {
           console.warn(
             "[btst/blog] route.loader() failed \u2014 no server running at build time. Use myStack.api.blog.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);

package/dist/packages/stack/src/plugins/cms/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_cms_queryKeys = require('../../../../../../plugins/cms/query-keys.cjs');
 
 const DashboardPageComponent = React.lazy(
@@ -32,6 +33,12 @@ function createDashboardLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const typesQuery = queries.cmsTypes.list();
       try {
         if (hooks?.beforeLoadDashboard) {
           await client.runClientHookWithShim(
@@ -39,18 +46,11 @@ function createDashboardLoader(config) {
             "Load prevented by beforeLoadDashboard hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
-        await queryClient.prefetchQuery(queries.cmsTypes.list());
+        await queryClient.prefetchQuery(typesQuery);
         if (hooks?.afterLoadDashboard) {
           await hooks.afterLoadDashboard(context);
         }
-        const queryState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
+        const queryState = queryClient.getQueryState(typesQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
           const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
           await hooks.onLoadError(error, context);
@@ -60,6 +60,15 @@ function createDashboardLoader(config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: typesQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -80,6 +89,18 @@ function createContentListLoader(typeSlug, 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 typesQuery = queries.cmsTypes.list();
+      const listQuery = queries.cmsContent.list({
+        typeSlug,
+        limit,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadContentList) {
           await client.runClientHookWithShim(
@@ -87,18 +108,7 @@ function createContentListLoader(typeSlug, config) {
             "Load prevented by beforeLoadContentList hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
-        const limit = 20;
-        await queryClient.prefetchQuery(queries.cmsTypes.list());
-        const listQuery = queries.cmsContent.list({
-          typeSlug,
-          limit,
-          offset: 0
-        });
+        await queryClient.prefetchQuery(typesQuery);
         await queryClient.prefetchInfiniteQuery({
           queryKey: listQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -118,9 +128,7 @@ function createContentListLoader(typeSlug, config) {
         if (hooks?.afterLoadContentList) {
           await hooks.afterLoadContentList(typeSlug, context);
         }
-        const typesState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
+        const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const listState = queryClient.getQueryState(listQuery.queryKey);
         const queryError = typesState?.error || listState?.error;
         if (queryError && hooks?.onLoadError) {
@@ -132,6 +140,16 @@ function createContentListLoader(typeSlug, config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.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);
@@ -152,6 +170,13 @@ function createContentEditorLoader(typeSlug, id, config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
+      const typesQuery = queries.cmsTypes.list();
+      const detailQuery = id ? queries.cmsContent.detail(typeSlug, id) : void 0;
       try {
         if (hooks?.beforeLoadContentEditor) {
           await client.runClientHookWithShim(
@@ -159,27 +184,16 @@ function createContentEditorLoader(typeSlug, id, config) {
             "Load prevented by beforeLoadContentEditor hook"
           );
         }
-        const client$1 = client.createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = plugins_cms_queryKeys.createCMSQueryKeys(client$1, headers);
-        const promises = [queryClient.prefetchQuery(queries.cmsTypes.list())];
+        const promises = [queryClient.prefetchQuery(typesQuery)];
         if (id) {
-          promises.push(
-            queryClient.prefetchQuery(queries.cmsContent.detail(typeSlug, id))
-          );
+          promises.push(queryClient.prefetchQuery(detailQuery));
         }
         await Promise.all(promises);
         if (hooks?.afterLoadContentEditor) {
           await hooks.afterLoadContentEditor(typeSlug, id, context);
         }
-        const typesState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
-        const itemState = id ? queryClient.getQueryState(
-          queries.cmsContent.detail(typeSlug, id).queryKey
-        ) : null;
+        const typesState = queryClient.getQueryState(typesQuery.queryKey);
+        const itemState = id ? queryClient.getQueryState(detailQuery.queryKey) : null;
         const queryError = typesState?.error || itemState?.error;
         if (queryError && hooks?.onLoadError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
@@ -190,6 +204,24 @@ function createContentEditorLoader(typeSlug, id, config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: typesQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
+          if (detailQuery) {
+            await queryClient.prefetchQuery({
+              queryKey: detailQuery.queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            });
+          }
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);

package/dist/packages/stack/src/plugins/cms/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 { createCMSQueryKeys } from '../../../../../../plugins/cms/query-keys.mjs';
 
 const DashboardPageComponent = lazy(
@@ -30,6 +31,12 @@ function createDashboardLoader(config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createCMSQueryKeys(client, headers);
+      const typesQuery = queries.cmsTypes.list();
       try {
         if (hooks?.beforeLoadDashboard) {
           await runClientHookWithShim(
@@ -37,18 +44,11 @@ function createDashboardLoader(config) {
             "Load prevented by beforeLoadDashboard hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createCMSQueryKeys(client, headers);
-        await queryClient.prefetchQuery(queries.cmsTypes.list());
+        await queryClient.prefetchQuery(typesQuery);
         if (hooks?.afterLoadDashboard) {
           await hooks.afterLoadDashboard(context);
         }
-        const queryState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
+        const queryState = queryClient.getQueryState(typesQuery.queryKey);
         if (queryState?.error && hooks?.onLoadError) {
           const error = queryState.error instanceof Error ? queryState.error : new Error(String(queryState.error));
           await hooks.onLoadError(error, context);
@@ -58,6 +58,15 @@ function createDashboardLoader(config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: typesQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -78,6 +87,18 @@ function createContentListLoader(typeSlug, config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createCMSQueryKeys(client, headers);
+      const limit = 20;
+      const typesQuery = queries.cmsTypes.list();
+      const listQuery = queries.cmsContent.list({
+        typeSlug,
+        limit,
+        offset: 0
+      });
       try {
         if (hooks?.beforeLoadContentList) {
           await runClientHookWithShim(
@@ -85,18 +106,7 @@ function createContentListLoader(typeSlug, config) {
             "Load prevented by beforeLoadContentList hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createCMSQueryKeys(client, headers);
-        const limit = 20;
-        await queryClient.prefetchQuery(queries.cmsTypes.list());
-        const listQuery = queries.cmsContent.list({
-          typeSlug,
-          limit,
-          offset: 0
-        });
+        await queryClient.prefetchQuery(typesQuery);
         await queryClient.prefetchInfiniteQuery({
           queryKey: listQuery.queryKey,
           queryFn: async ({ pageParam = 0 }) => {
@@ -116,9 +126,7 @@ function createContentListLoader(typeSlug, config) {
         if (hooks?.afterLoadContentList) {
           await hooks.afterLoadContentList(typeSlug, context);
         }
-        const typesState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
+        const typesState = queryClient.getQueryState(typesQuery.queryKey);
         const listState = queryClient.getQueryState(listQuery.queryKey);
         const queryError = typesState?.error || listState?.error;
         if (queryError && hooks?.onLoadError) {
@@ -130,6 +138,16 @@ function createContentListLoader(typeSlug, config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.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);
@@ -150,6 +168,13 @@ function createContentEditorLoader(typeSlug, id, config) {
         apiBasePath,
         headers
       };
+      const client = createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = createCMSQueryKeys(client, headers);
+      const typesQuery = queries.cmsTypes.list();
+      const detailQuery = id ? queries.cmsContent.detail(typeSlug, id) : void 0;
       try {
         if (hooks?.beforeLoadContentEditor) {
           await runClientHookWithShim(
@@ -157,27 +182,16 @@ function createContentEditorLoader(typeSlug, id, config) {
             "Load prevented by beforeLoadContentEditor hook"
           );
         }
-        const client = createApiClient({
-          baseURL: apiBaseURL,
-          basePath: apiBasePath
-        });
-        const queries = createCMSQueryKeys(client, headers);
-        const promises = [queryClient.prefetchQuery(queries.cmsTypes.list())];
+        const promises = [queryClient.prefetchQuery(typesQuery)];
         if (id) {
-          promises.push(
-            queryClient.prefetchQuery(queries.cmsContent.detail(typeSlug, id))
-          );
+          promises.push(queryClient.prefetchQuery(detailQuery));
         }
         await Promise.all(promises);
         if (hooks?.afterLoadContentEditor) {
           await hooks.afterLoadContentEditor(typeSlug, id, context);
         }
-        const typesState = queryClient.getQueryState(
-          queries.cmsTypes.list().queryKey
-        );
-        const itemState = id ? queryClient.getQueryState(
-          queries.cmsContent.detail(typeSlug, id).queryKey
-        ) : null;
+        const typesState = queryClient.getQueryState(typesQuery.queryKey);
+        const itemState = id ? queryClient.getQueryState(detailQuery.queryKey) : null;
         const queryError = typesState?.error || itemState?.error;
         if (queryError && hooks?.onLoadError) {
           const error = queryError instanceof Error ? queryError : new Error(String(queryError));
@@ -188,6 +202,24 @@ function createContentEditorLoader(typeSlug, id, config) {
           console.warn(
             "[btst/cms] route.loader() failed \u2014 no server running at build time. Use myStack.api.cms.prefetchForRoute() for SSG data prefetching."
           );
+        } else {
+          const errToStore = createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: typesQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
+          if (detailQuery) {
+            await queryClient.prefetchQuery({
+              queryKey: detailQuery.queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            });
+          }
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);

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

@@ -3,6 +3,8 @@
 const React = require('react');
 const client = require('@btst/stack/plugins/client');
 const yar = require('@btst/yar');
+const plugins_comments_queryKeys = require('../../../../../../plugins/comments/query-keys.cjs');
+const utils = require('../../utils.cjs');
 
 const ModerationPageComponent = React.lazy(
   () => import('./components/pages/moderation-page.cjs').then((m) => ({
@@ -17,7 +19,7 @@ const UserCommentsPageComponent = React.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,
@@ -25,15 +27,40 @@ function createModerationLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_comments_queryKeys.createCommentsQueryKeys(client$1, 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 (client.isConnectionError(error)) {
           console.warn(
             "[btst/comments] route.loader() failed \u2014 no server running at build time."
           );
+        } else {
+          const errToStore = utils.createSanitizedSSRLoaderError();
+          await queryClient.prefetchQuery({
+            queryKey: listQuery.queryKey,
+            queryFn: () => {
+              throw errToStore;
+            },
+            retry: false
+          });
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);
@@ -45,7 +72,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,
@@ -53,15 +80,48 @@ function createUserCommentsLoader(config) {
         apiBasePath,
         headers
       };
+      const client$1 = client.createApiClient({
+        baseURL: apiBaseURL,
+        basePath: apiBasePath
+      });
+      const queries = plugins_comments_queryKeys.createCommentsQueryKeys(client$1, 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 (client.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 = utils.createSanitizedSSRLoaderError();
+            await queryClient.prefetchQuery({
+              queryKey: getUserListQuery(currentUserId).queryKey,
+              queryFn: () => {
+                throw errToStore;
+              },
+              retry: false
+            });
+          }
         }
         if (hooks?.onLoadError) {
           await hooks.onLoadError(error, context);