npm - cloudcommerce - Versions diffs - 0.0.72 → 0.0.73 - Mend

cloudcommerce 0.0.72 → 0.0.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/packages/storefront/src/lib/ssr-context.ts CHANGED Viewed

@@ -29,6 +29,15 @@ if (!globalThis.api_prefetch_endpoints) {
 type ApiPrefetchEndpoints = Array<ApiEndpoint>;
+const setResponseCache = (Astro: AstroGlobal, maxAge: number, sMaxAge?: number) => {
+  const headerName = import.meta.env.PROD ? 'Cache-Control' : 'X-Cache-Control';
+  let cacheControl = `public, max-age=${maxAge}`;
+  if (sMaxAge) {
+    cacheControl += `, s-maxage=${sMaxAge}, stale-while-revalidate=86400`;
+  }
+  Astro.response.headers.set(headerName, cacheControl);
+};
 const loadPageContext = async (Astro: AstroGlobal, {
   cmsCollection,
   apiPrefetchEndpoints = globalThis.api_prefetch_endpoints,
@@ -36,50 +45,65 @@ const loadPageContext = async (Astro: AstroGlobal, {
   cmsCollection?: string;
   apiPrefetchEndpoints?: ApiPrefetchEndpoints;
 } = {}) => {
+  const urlPath = Astro.url.pathname;
   const { slug } = Astro.params;
   const config = getConfig();
   let cmsContent: Record<string, any> | undefined;
   let apiResource: string | undefined;
   let apiDoc: Record<string, any> | undefined;
   const apiState: { [k: string]: Record<string, any> } = {};
+  const apiOptions = {
+    fetch,
+    isNoAuth: true,
+  };
+  const apiFetchings = [
+    null, // fetch by slug
+    ...apiPrefetchEndpoints.map((endpoint) => api.get(endpoint, apiOptions)),
+  ];
   if (slug) {
     if (cmsCollection) {
       cmsContent = config.cms(`${cmsCollection}/${slug}`);
     } else {
-      const apiOptions = {
-        fetch,
-        isNoAuth: true,
-      };
-      const apiFetchings = [
-        api.get(`slugs/${slug}`, apiOptions),
-        ...apiPrefetchEndpoints.map((endpoint) => api.get(endpoint, apiOptions)),
-      ];
-      try {
-        const [slugResponse, ...prefetchResponses] = await Promise.all(apiFetchings);
-        apiResource = slugResponse.data.resource;
-        apiDoc = slugResponse.data.doc;
-        apiState[`${apiResource}/${apiDoc._id}`] = apiDoc;
-        prefetchResponses.forEach(({ config: { endpoint }, data }) => {
-          apiState[endpoint] = data;
-        });
-      } catch (e: any) {
-        const error: ApiError = e;
-        let toUrl: string;
-        if (error.statusCode === 404) {
-          toUrl = '/404';
-          Astro.response.headers.set('Cache-Control', 'public, max-age=120');
-        } else {
-          console.error(error);
-          toUrl = '/500';
-          Astro.response.headers.set('X-SSR-Error', error.stack);
-        }
-        const err: any = new Error(`Load page context failed: ${error.message}`);
-        err.originalError = error;
-        err.redirectUrl = `${toUrl}?url=${encodeURIComponent(Astro.url.pathname)}`;
+      apiFetchings[0] = api.get(`slugs/${slug}`, apiOptions);
+    }
+  }
+  try {
+    const [slugResponse, ...prefetchResponses] = await Promise.all(apiFetchings);
+    if (slugResponse) {
+      apiResource = slugResponse.data.resource;
+      apiDoc = slugResponse.data.doc;
+      apiState[`${apiResource}/${apiDoc._id}`] = apiDoc;
+    }
+    prefetchResponses.forEach(({ config: { endpoint }, data }) => {
+      apiState[endpoint] = data;
+    });
+  } catch (err: any) {
+    const error: ApiError = err;
+    const status = error.statusCode || 500;
+    if (status === 404) {
+      if (urlPath.endsWith('/')) {
+        err.redirectUrl = urlPath.slice(0, -1);
         err.astroResponse = Astro.redirect(err.redirectUrl);
         throw err;
       }
+      setResponseCache(Astro, 120, 300);
+    } else {
+      console.error(error);
+      setResponseCache(Astro, 30);
+      Astro.response.headers.set('X-SSR-Error', error.message);
     }
+    Astro.response.status = status;
+    err.responseHTML = `<html><head>
+      <meta http-equiv="refresh" content="0;
+        url=/fallback?status=${status}&url=${encodeURIComponent(urlPath)}"/>
+      </head>
+      <body></body></html>`;
+    throw err;
+  }
+  if (urlPath === '/fallback') {
+    setResponseCache(Astro, 3600, 86400);
+  } else {
+    setResponseCache(Astro, 120, 600);
   }
   return {
     ...config,

package/packages/storefront/src/lib/views/{404.astro → fallback.astro} RENAMED Viewed

@@ -10,7 +10,7 @@ export interface Props {
 <Layout title="Welcome to Astro.">
   <main>
-    <h1>404</h1>
+    <h1>Error :/</h1>
     <p class="instructions">
       Check out the <code>src/pages</code> directory to get started.<br/>
       <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.

package/packages/storefront/src/pages/[...slug].astro CHANGED Viewed

@@ -3,11 +3,16 @@ import ViewWildcard from '../lib/views/[...slug].astro';
 import loadPageContext, { PageContext } from '../lib/ssr-context';
 let pageContext: PageContext;
+let loadError: any;
 try {
   pageContext = await loadPageContext(Astro);
 } catch (err) {
-  return err.astroResponse;
+  if (err.astroResponse) {
+    return err.astroResponse;
+  }
+  loadError = err;
 }
 ---
-<ViewWildcard pageContext={pageContext} />
+{pageContext && <ViewWildcard pageContext={pageContext} />}
+{loadError && <Fragment set:html={loadError.responseHTML} />}

package/packages/storefront/src/pages/{404.astro → fallback.astro} RENAMED Viewed

@@ -1,5 +1,5 @@
 ---
-import View404 from '../lib/views/404.astro';
+import ViewFallback from '../lib/views/fallback.astro';
 import loadPageContext, { PageContext } from '../lib/ssr-context';
 let pageContext: PageContext;
@@ -10,4 +10,4 @@ try {
 }
 ---
-<View404 pageContext={pageContext} />
+<ViewFallback pageContext={pageContext} />

package/packages/storefront/src/pages/index.astro CHANGED Viewed

@@ -3,11 +3,16 @@ import ViewHome from '../lib/views/index.astro';
 import loadPageContext, { PageContext } from '../lib/ssr-context';
 let pageContext: PageContext;
+let loadError: any;
 try {
   pageContext = await loadPageContext(Astro);
 } catch (err) {
-  return err.astroResponse;
+  if (err.astroResponse) {
+    return err.astroResponse;
+  }
+  loadError = err;
 }
 ---
-<ViewHome pageContext={pageContext} />
+{pageContext && <ViewHome pageContext={pageContext} />}
+{loadError && <Fragment set:html={loadError.responseHTML} />}

package/packages/types/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "repository": {

package/packages/storefront/dist/client/assets/500.d5d7700b.css DELETED Viewed

@@ -1 +0,0 @@

- :root{--astro-gradient: linear-gradient(0deg,#4F39FA, #DA62C4)}h1:where(.astro-NR6LLUHL){margin:2rem 0}main:where(.astro-NR6LLUHL){margin:auto;padding:1em;max-width:60ch}.text-gradient:where(.astro-NR6LLUHL){font-weight:900;background-image:var(--astro-gradient);-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-size:100% 200%;background-position-y:100%;border-radius:.4rem;animation:pulse 4s ease-in-out infinite}@keyframes pulse{0%,to{background-position-y:0%}50%{background-position-y:80%}}.instructions:where(.astro-NR6LLUHL){line-height:1.6;margin:1rem 0;background:#4F39FA;padding:1rem;border-radius:.4rem;color:var(--color-bg)}.instructions:where(.astro-NR6LLUHL) code:where(.astro-NR6LLUHL){font-size:.875em;border:.1em solid var(--color-border);border-radius:4px;padding:.15em .25em}.link-card-grid:where(.astro-NR6LLUHL){display:grid;grid-template-columns:repeat(auto-fit,minmax(24ch,1fr));gap:1rem;padding:0}

package/packages/storefront/src/lib/views/500.astro DELETED Viewed

@@ -1,79 +0,0 @@
----
-import type { PageContext } from '../ssr-context';
-import Layout from '../layouts/Layout.astro';
-import Card from '../components/Card.astro';
-export interface Props {
-  pageContext: PageContext;
-}
----
-<Layout title="Welcome to Astro.">
-  <main>
-    <h1>5xx</h1>
-    <p class="instructions">
-      Check out the <code>src/pages</code> directory to get started.<br/>
-      <strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
-    </p>
-    <ul role="list" class="link-card-grid">
-      <Card href="https://docs.astro.build/" title="Documentation" body="Learn how Astro works and explore the official API docs." />
-      <Card href="https://astro.build/integrations/" title="Integrations" body="Supercharge your project with new frameworks and libraries." />
-      <Card href="https://astro.build/themes/" title="Themes" body="Explore a galaxy of community-built starter themes." />
-      <Card href="https://astro.build/chat/" title="Chat" body="Come say hi to our amazing Discord community. ❤️" />
-    </ul>
-  </main>
-</Layout>
-<style>
-  :root {
-    --astro-gradient: linear-gradient(0deg,#4F39FA, #DA62C4);
-  }
-  h1 {
-    margin: 2rem 0;
-  }
-  main {
-    margin: auto;
-      padding: 1em;
-    max-width: 60ch;
-  }
-  .text-gradient {
-    font-weight: 900;
-    background-image: var(--astro-gradient);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-size: 100% 200%;
-    background-position-y: 100%;
-    border-radius: 0.4rem;
-    animation: pulse 4s ease-in-out infinite;
-  }
-  @keyframes pulse {
-    0%, 100% { background-position-y: 0%; }
-    50% { background-position-y: 80%; }
-  }
-  .instructions {
-    line-height: 1.6;
-    margin: 1rem 0;
-    background: #4F39FA;
-    padding: 1.0rem;
-    border-radius: 0.4rem;
-    color: var(--color-bg);
-  }
-  .instructions code {
-    font-size: 0.875em;
-    border: 0.1em solid var(--color-border);
-    border-radius: 4px;
-    padding: 0.15em 0.25em;
-  }
-  .link-card-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
-    gap: 1rem;
-    padding: 0;
-  }
-</style>

package/packages/storefront/src/pages/500.astro DELETED Viewed

@@ -1,13 +0,0 @@
----
-import View500 from '../lib/views/500.astro';
-import loadPageContext, { PageContext } from '../lib/ssr-context';
-let pageContext: PageContext;
-try {
-  pageContext = await loadPageContext(Astro);
-} catch (err) {
-  return err.astroResponse;
-}
----
-<View500 pageContext={pageContext} />