cloudcommerce 0.23.2 → 0.24.0

package/packages/storefront/src/lib/components/globals/ALink.vue

@@ -2,12 +2,13 @@
 import { computed } from 'vue';
 
 export interface Props {
-  href: string;
+  href?: string | null;
   target?: string;
 }
 
 const props = defineProps<Props>();
 const linkTarget = computed(() => {
+  if (!props.href) return undefined;
   if (props.target) return props.target;
   if (props.href.startsWith('http')) {
     const domain = globalThis.$storefront.settings.domain || window.location.host;
@@ -18,9 +19,10 @@ const linkTarget = computed(() => {
 </script>
 
 <template>
-  <a
+  <component
+    :is="href ? 'a' : 'span'"
     :href="href"
     :target="linkTarget"
     :rel="linkTarget === '_blank' ? 'noopener' : undefined"
-  ><slot /></a>
+  ><slot /></component>
 </template>

package/packages/storefront/src/lib/composables/use-sticky-header.ts

@@ -46,7 +46,7 @@ const useStickyHeader = (props: Props) => {
     y.value = nextY;
   }, {
     debounce: isMobile ? 100 : 50,
-    maxWait: isMobile ? 300 : 150,
+    maxWait: isMobile ? 800 : 400,
   });
   const isSticky = computed(() => ready.value && y.value > staticY.value * 1.2);
   const transition = ref('none');

package/packages/storefront/src/lib/layouts/BaseHead.astro

@@ -63,7 +63,7 @@ if (apiContext.error) {
   inlineClientJS += `
 console.error(${JSON.stringify(message)});
 setTimeout(() => {
-  window.location.replace("/fallback?status=${statusCode}&url=${encodeURIComponent(url)}");
+  window.location.replace("/~fallback?status=${statusCode}&url=${encodeURIComponent(url)}");
 }, 1);`;
 }
 if (apiDoc) {

package/packages/storefront/src/lib/layouts/use-page-header.ts

@@ -1,12 +1,9 @@
 import type { RouteContext } from '@@sf/ssr-context';
-import type { LayoutContent } from '@@sf/content';
 import type { Props as UseShopHeaderProps } from '@@sf/composables/use-shop-header';
 import api from '@cloudcommerce/api';
 import { parseLayoutContent } from '@@sf/composables/use-pitch-bar';
 
-type ShopHeaderProps = Omit<UseShopHeaderProps, 'header'> & {
-  serviceLinks?: LayoutContent['service_links'],
-};
+type ShopHeaderProps = Omit<UseShopHeaderProps, 'header'>;
 
 export interface Props {
   routeContext: RouteContext;
@@ -16,10 +13,7 @@ export interface Props {
 const usePageHeader = async ({ routeContext, listedCategoryFields }: Props) => {
   const { apiState, getContent } = routeContext;
   const layoutContent = await getContent('layout');
-  const {
-    header: headerContent,
-    service_links: serviceLinks,
-  } = layoutContent;
+  const { header: headerContent } = layoutContent;
   const pitchBar = parseLayoutContent(layoutContent);
   let { categories } = apiState;
   if (!categories) {
@@ -45,7 +39,6 @@ const usePageHeader = async ({ routeContext, listedCategoryFields }: Props) => {
     menuCategorySlugs: headerContent.inline_menu_categories?.featured,
     menuRandomCategories: headerContent.inline_menu_categories?.random,
     isAlphabeticalSortSubmenu: headerContent.alphabetical_sort_submenu,
-    serviceLinks,
   };
   /*
   if (import.meta.env.DEV) {

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

@@ -75,13 +75,13 @@ const loadRouteContext = async (Astro: Readonly<AstroGlobal>, {
     brands?: BrandsList,
     [k: string]: Record<string, any> | undefined,
   } = {};
-  const apiPrefetchings = [
+  const apiPrefetchings: Array<ReturnType<typeof api.get> | Promise<null> | null> = [
     ...apiPrefetchEndpoints.map((endpoint) => {
       if (endpoint === ':slug') return null; // fetch by slug
       return api.get(endpoint);
     }),
   ];
-  let fetchingApiContext: ReturnType<typeof api.get> | null = null;
+  let fetchingApiContext: typeof apiPrefetchings[number] = null;
   const apiContext: {
     resource?: 'products' | 'categories' | 'brands' | 'collections',
     doc?: Record<string, any>,
@@ -89,20 +89,21 @@ const loadRouteContext = async (Astro: Readonly<AstroGlobal>, {
   } = {
     error: null,
   };
+  const { slug } = Astro.params;
   if (isHomepage) {
     cmsContent = await config.getContent('pages/home');
-  } else {
-    const { slug } = Astro.params;
-    if (slug) {
-      if (contentCollection) {
-        cmsContent = await config.getContent(`${contentCollection}/${slug}`);
-      } else if (slug.startsWith('api/')) {
-        const err: any = new Error('/api/* routes not implemented on SSR directly');
-        Astro.response.status = 501;
-        err.responseHTML = `<head></head><body>${err.message}</body>`;
-        throw err;
-      } else {
-        fetchingApiContext = api.get(`slugs/${slug}`)
+  } else if (slug) {
+    if (contentCollection) {
+      cmsContent = await config.getContent(`${contentCollection}/${slug}`);
+    } else if (slug.startsWith('api/')) {
+      const err: any = new Error('/api/* routes not implemented on SSR directly');
+      Astro.response.status = 501;
+      err.responseHTML = `<head></head><body>${err.message}</body>`;
+      throw err;
+    } else {
+      const prefetchingsIndex = apiPrefetchings.findIndex((pr) => pr === null);
+      fetchingApiContext = new Promise((resolve, reject) => {
+        api.get(`slugs/${slug}`)
           .then((response) => {
             Object.assign(apiContext, response.data);
             const apiResource = apiContext.resource as
@@ -114,16 +115,19 @@ const loadRouteContext = async (Astro: Readonly<AstroGlobal>, {
               doc: apiDoc as any,
               timestamp: Date.now(),
             };
-            return response;
+            resolve(null);
+          })
+          .catch((err: ApiError) => {
+            if (prefetchingsIndex > -1) {
+              reject(err);
+            } else {
+              apiContext.error = err;
+              resolve(null);
+            }
           });
-        const index = apiPrefetchings.findIndex((pr) => pr === null);
-        if (index > -1) {
-          apiPrefetchings[index] = fetchingApiContext;
-        } else {
-          fetchingApiContext.catch((err: ApiError) => {
-            apiContext.error = err;
-          });
-        }
+      }) as Promise<null>;
+      if (prefetchingsIndex > -1) {
+        apiPrefetchings[prefetchingsIndex] = fetchingApiContext;
       }
     }
   }
@@ -135,6 +139,8 @@ const loadRouteContext = async (Astro: Readonly<AstroGlobal>, {
         if (!apiState[apiStateKey]) {
           apiState[apiStateKey] = data.result || data;
         }
+      } else if (slug && apiContext.doc) {
+        apiState[`slugs/${slug}`] = apiContext;
       }
     });
   } catch (err: any) {
@@ -155,13 +161,13 @@ const loadRouteContext = async (Astro: Readonly<AstroGlobal>, {
     Astro.response.status = status;
     err.responseHTML = `<head>
       <meta http-equiv="refresh" content="0;
-        url=/fallback?status=${status}&url=${encodeURIComponent(urlPath)}"/>
+        url=/~fallback?status=${status}&url=${encodeURIComponent(urlPath)}"/>
       </head>
       <body></body>`;
     throw err;
   }
   Astro.response.headers.set('X-Load-Took', String(Date.now() - startedAt));
-  if (urlPath === '/fallback') {
+  if (urlPath === '/~fallback') {
     setResponseCache(Astro, 3600, 86400);
   } else if (isHomepage) {
     setResponseCache(Astro, 180, 300);

package/packages/storefront/src/vue-globals.d.ts

@@ -1,5 +1,4 @@
 // Read more: https://github.com/vuejs/core/pull/3399
-// eslint-disable-next-line import/no-extraneous-dependencies
 import '@vue/runtime-core';
 import type { FormatPercentage } from '@@sf/pages/_vue';
 import type { $Storefront } from '@@sf/$storefront';

package/packages/types/index.ts

@@ -81,6 +81,16 @@ type AppModuleBody = {
   application: Applications,
 };
 
+type PaymentMethodFlag = 'pix'
+  | 'visa'
+  | 'mastercard'
+  | 'elo'
+  | 'amex'
+  | 'hipercard'
+  | 'boleto'
+  | 'diners'
+  | 'discover';
+
 type SettingsContent = {
   domain: string,
   name: string,
@@ -106,6 +116,12 @@ type SettingsContent = {
   youtube?: string,
   tiktok?: string,
   pinterest?: string,
+  threads?: string,
+  service_links?: Array<{
+    title: string,
+    href: string,
+  }>,
+  payment_methods?: PaymentMethodFlag[],
   modules?: {
     list_payments?: {
       installments_option?: Partial<ListPaymentsResponse['installments_option']>,

package/packages/types/package.json

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

package/packages/storefront/dist/server/chunks/endpoint@_@js.b79eed3b.mjs

@@ -1,34 +0,0 @@
-export { renderers } from '../renderers.mjs';
-export { onRequest } from '../_empty-middleware.mjs';
-import './astro.6adaff02.mjs';
-import 'path-to-regexp';
-import 'cookie';
-import '@astrojs/internal-helpers/path';
-import 'kleur/colors';
-import 'node:fs';
-import 'node:http';
-import 'node:tls';
-import 'mime';
-import 'string-width';
-import 'html-escaper';
-import 'vue';
-import 'vue/server-renderer';
-import '@ecomplus/utils';
-import './pages/_...slug_.astro.501582b9.mjs';
-import 'node:fs/promises';
-import 'node:path';
-import 'node:url';
-import 'http-cache-semantics';
-import 'node:os';
-import 'image-size';
-import 'magic-string';
-import 'node:stream';
-import '@cloudcommerce/api';
-import 'node:events';
-import '@cloudcommerce/config';
-/* empty css                              */import '@vueuse/core';
-import '@headlessui/vue';
-
-const page = () => import('./pages/endpoint.js.4c130895.mjs').then(n => n.e);
-
-export { page };

package/packages/storefront/dist/server/chunks/pages/endpoint.js.4c130895.mjs

@@ -1,119 +0,0 @@
-import mime from 'mime';
-import sharp$1 from 'sharp';
-import { B as BaseSSRService, i as isOutputFormatSupportsAlpha } from './_...slug_.astro.501582b9.mjs';
-
-class SharpService extends BaseSSRService {
-  async transform(inputBuffer, transform) {
-    if (transform.format === "svg") {
-      return {
-        data: inputBuffer,
-        format: transform.format
-      };
-    }
-    const sharpImage = sharp$1(inputBuffer, { failOnError: false, pages: -1 });
-    sharpImage.rotate();
-    if (transform.width || transform.height) {
-      const width = transform.width && Math.round(transform.width);
-      const height = transform.height && Math.round(transform.height);
-      sharpImage.resize({
-        width,
-        height,
-        fit: transform.fit,
-        position: transform.position,
-        background: transform.background
-      });
-    }
-    if (transform.format) {
-      sharpImage.toFormat(transform.format, { quality: transform.quality });
-      if (transform.background && !isOutputFormatSupportsAlpha(transform.format)) {
-        sharpImage.flatten({ background: transform.background });
-      }
-    }
-    const { data, info } = await sharpImage.toBuffer({ resolveWithObject: true });
-    return {
-      data,
-      format: info.format
-    };
-  }
-}
-const service = new SharpService();
-var sharp_default = service;
-
-const sharp = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-  __proto__: null,
-  default: sharp_default
-}, Symbol.toStringTag, { value: 'Module' }));
-
-const fnv1a52 = (str) => {
-  const len = str.length;
-  let i = 0, t0 = 0, v0 = 8997, t1 = 0, v1 = 33826, t2 = 0, v2 = 40164, t3 = 0, v3 = 52210;
-  while (i < len) {
-    v0 ^= str.charCodeAt(i++);
-    t0 = v0 * 435;
-    t1 = v1 * 435;
-    t2 = v2 * 435;
-    t3 = v3 * 435;
-    t2 += v0 << 8;
-    t3 += v1 << 8;
-    t1 += t0 >>> 16;
-    v0 = t0 & 65535;
-    t2 += t1 >>> 16;
-    v1 = t1 & 65535;
-    v3 = t3 + (t2 >>> 16) & 65535;
-    v2 = t2 & 65535;
-  }
-  return (v3 & 15) * 281474976710656 + v2 * 4294967296 + v1 * 65536 + (v0 ^ v3 >> 4);
-};
-const etag = (payload, weak = false) => {
-  const prefix = weak ? 'W/"' : '"';
-  return prefix + fnv1a52(payload).toString(36) + payload.length.toString(36) + '"';
-};
-
-function isRemoteImage(src) {
-  return /^(https?:)?\/\//.test(src);
-}
-
-async function loadRemoteImage(src) {
-  try {
-    const res = await fetch(src);
-    if (!res.ok) {
-      return void 0;
-    }
-    return Buffer.from(await res.arrayBuffer());
-  } catch (err) {
-    console.error(err);
-    return void 0;
-  }
-}
-const get = async ({ request }) => {
-  try {
-    const url = new URL(request.url);
-    const transform = sharp_default.parseTransform(url.searchParams);
-    let inputBuffer = void 0;
-    const sourceUrl = isRemoteImage(transform.src) ? new URL(transform.src) : new URL(transform.src, url.origin);
-    inputBuffer = await loadRemoteImage(sourceUrl);
-    if (!inputBuffer) {
-      return new Response("Not Found", { status: 404 });
-    }
-    const { data, format } = await sharp_default.transform(inputBuffer, transform);
-    return new Response(data, {
-      status: 200,
-      headers: {
-        "Content-Type": mime.getType(format) || "",
-        "Cache-Control": "public, max-age=31536000",
-        ETag: etag(data.toString()),
-        Date: (/* @__PURE__ */ new Date()).toUTCString()
-      }
-    });
-  } catch (err) {
-    console.error(err);
-    return new Response(`Server Error: ${err}`, { status: 500 });
-  }
-};
-
-const endpoint = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-  __proto__: null,
-  get
-}, Symbol.toStringTag, { value: 'Module' }));
-
-export { endpoint as e, sharp as s };