cloudcommerce 2.8.8 → 2.10.0

package/packages/storefront/package.json

@@ -1,12 +1,20 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "2.8.8",
+  "version": "2.10.0",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
   },
   "main": "src/index.js",
+  "files": [
+    "/lib",
+    "/types",
+    "/*.{js,mjs,ts}",
+    "/config/**/*.{json,js,mjs,cjs,ts}",
+    "/scripts/**/*.{sh,mjs}",
+    "/src"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",
@@ -30,8 +38,8 @@
     "lint:fix": "eslint -c ../eslint/storefront.staged.eslintrc.cjs src/lib/**/*.{ts,vue,astro} --fix"
   },
   "dependencies": {
-    "@astrojs/node": "8.2.3",
-    "@astrojs/vue": "4.0.8",
+    "@astrojs/node": "8.2.5",
+    "@astrojs/vue": "4.0.9",
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
@@ -41,24 +49,23 @@
     "@iconify-json/heroicons": "^1.1.20",
     "@iconify-json/logos": "^1.1.42",
     "@types/gtag.js": "^0.0.19",
-    "@vite-pwa/astro": "^0.3.0",
+    "@vite-pwa/astro": "^0.3.1",
     "@vueuse/core": "10.9.0",
-    "@webcontainer/api": "^1.1.9",
-    "astro": "4.5.0",
+    "astro": "4.5.12",
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.4.5",
-    "firebase": "^10.8.1",
+    "firebase": "^10.9.0",
     "image-size": "^1.1.1",
     "mime": "^3.0.0",
     "mitt": "^3.0.1",
     "semver": "^7.6.0",
     "sharp": "^0.32.6",
     "tailwindcss": "^3.4.1",
-    "unocss": "^0.58.5",
+    "unocss": "^0.58.6",
     "unplugin-auto-import": "^0.17.5",
-    "vite": "^5.1.5",
-    "vite-plugin-pwa": "^0.19.2",
+    "vite": "^5.2.6",
+    "vite-plugin-pwa": "^0.19.7",
     "vue": "^3.4.21",
     "wade": "0.3.3",
     "yaml": "^2.4.1"
@@ -66,6 +73,6 @@
   "devDependencies": {
     "@cloudcommerce/eslint": "workspace:*",
     "@cloudcommerce/types": "workspace:*",
-    "@types/react": "^18.2.64"
+    "@types/react": "^18.2.70"
   }
 }

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

@@ -18,14 +18,29 @@ const props = withDefaults(defineProps<Props>(), {
   prefetch: 'hover',
 });
 const link = ref<HTMLElement | null>(null);
-const linkTarget = computed(() => {
-  if (!props.href) return undefined;
-  if (props.target) return props.target;
-  if (props.href.startsWith('http')) {
+const isExternalLink = computed(() => {
+  if (props.href?.startsWith('https:')) {
     const domain = globalThis.$storefront.settings.domain || window.location.host;
-    if (props.href.startsWith(`https://${domain}`)) return undefined;
-    return '_blank';
+    if (props.href.startsWith(`https://${domain}`)) return false;
+    return true;
+  }
+  return false;
+});
+const trackedHref = computed(() => {
+  const { domain } = globalThis.$storefront.settings;
+  if (!isExternalLink.value || !domain || !props.href) {
+    return props.href;
+  }
+  let arg = '?';
+  if (props.href.includes('?')) {
+    if (/[?&]ref=/.test(props.href)) return props.href;
+    arg = '&';
   }
+  return `${props.href}${arg}ref=${domain}`;
+});
+const linkTarget = computed(() => {
+  if (props.target) return props.target;
+  if (isExternalLink.value) return '_blank';
   return undefined;
 });
 const prefetchHref = computed(() => {
@@ -37,6 +52,19 @@ const prefetchHref = computed(() => {
   return pathname;
 });
 if (prefetchHref.value) {
+  const prefetchOnNext = () => {
+    requestIdleCallback(() => {
+      const next = () => {
+        if (!prefetchHref.value) return;
+        window.$prefetch!(prefetchHref.value);
+      };
+      if (!window.$firstInteraction) {
+        window.addEventListener('firstInteraction', next, { once: true });
+      } else {
+        window.$firstInteraction.then(next);
+      }
+    });
+  };
   onMounted(() => {
     const { prefetch } = props;
     const isOnHover = prefetch === 'hover';
@@ -52,10 +80,7 @@ if (prefetchHref.value) {
       unwatch();
       setTimeout(() => {
         if (isOnVisible && !isActive.value) return;
-        requestIdleCallback(() => {
-          if (!prefetchHref.value) return;
-          window.$prefetch!(prefetchHref.value);
-        });
+        prefetchOnNext();
       }, isOnVisible ? 100 : 1);
     }, {
       immediate: true,
@@ -68,7 +93,7 @@ if (prefetchHref.value) {
   <component
     ref="link"
     :is="href ? 'a' : 'span'"
-    :href="href"
+    :href="trackedHref"
     :target="linkTarget"
     :rel="linkTarget === '_blank' ? 'noopener' : undefined"
   ><slot /></component>

package/packages/storefront/src/lib/scripts/vbeta-app.ts

@@ -179,12 +179,13 @@ const watchAppRoutes = () => {
 
 // https://github.com/ecomplus/storefront/tree/master/%40ecomplus/storefront-app compat
 if (!import.meta.env.SSR) {
+  const { location, ECOM_STORE_ID } = window;
   if (Object.keys(utm).length) {
     sessionStorage.setItem('ecomUtm', JSON.stringify(utm));
   }
-  let querystring = window.location.search;
-  if (!querystring && window.location.hash) {
-    querystring = '?' + window.location.hash.split('?')[1];
+  let querystring = location.search;
+  if (!querystring && location.hash) {
+    querystring = '?' + location.hash.split('?')[1];
   }
   const searchParams = new URLSearchParams(querystring);
   if (searchParams.get('product_id') && searchParams.get('quantity') === '1') {
@@ -197,16 +198,18 @@ if (!import.meta.env.SSR) {
     }));
     (window as any).ECOM_CART_STORAGE_KEY = 'ecomShoppingCart__tmp';
   }
-  const { hostname } = window.location;
   const { domain } = globalThis.$storefront.settings;
-  const apiBaseUri = `https://ecomplus.io/v2/:${window.ECOM_STORE_ID}/`;
+  const isLocalhost = ['localhost', '127.0.0.1'].includes(location.hostname);
+  const hostApiBaseUri = isLocalhost
+    && Number(location.port) !== 5000 // Hosting on Firebase Emulators
+    ? `https://${domain}/_api/` : '/_api/';
+  const apiBaseUri = 'https://ecomplus.io/v2/';
   (window as any).ECOMCLIENT_API_STORE = apiBaseUri;
-  (window as any).ECOMCLIENT_API_STORE_CACHE = apiBaseUri;
-  (window as any).ECOMCLIENT_API_PASSPORT = apiBaseUri;
-  (window as any).ECOMCLIENT_API_SEARCH = `${apiBaseUri}/search/_els/`;
-  (window as any).ECOMCLIENT_API_MODULES = ['localhost', '127.0.0.1'].includes(hostname)
-    ? `https://${domain}/_api/modules/`
-    : '/_api/modules/';
+  (window as any).ECOMCLIENT_API_STORE_CACHE = `${apiBaseUri}:${ECOM_STORE_ID}/`;
+  (window as any).ECOMCLIENT_API_PASSPORT = `${apiBaseUri}:`;
+  (window as any).ECOMCLIENT_API_PASSPORT_IDENTITY = `${hostApiBaseUri}passport/`;
+  (window as any).ECOMCLIENT_API_SEARCH = `${apiBaseUri}search/_els/`;
+  (window as any).ECOMCLIENT_API_MODULES = `${hostApiBaseUri}modules/`;
 
   const onLoad = () => {
     const { ecomPassport } = window as Record<string, any>;
@@ -237,7 +240,7 @@ if (!import.meta.env.SSR) {
   };
 
   const appScript = document.createElement('script');
-  appScript.src = 'https://cdn.jsdelivr.net/npm/@ecomplus/storefront-app@2.0.0-beta.190/dist/lib/js/app.js';
+  appScript.src = 'https://cdn.jsdelivr.net/npm/@ecomplus/storefront-app@2.0.0-beta.197/dist/lib/js/app.js';
   appScript.onload = onLoad;
   document.body.appendChild(appScript);
 }

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

@@ -1,3 +1,4 @@
+import type { AsyncLocalStorage } from 'node:async_hooks';
 import type { AstroGlobal } from 'astro';
 import type { BaseConfig } from '@cloudcommerce/config';
 import type { ApiError, ApiEndpoint } from '@cloudcommerce/api';
@@ -5,8 +6,8 @@ import type { ResourceId, CategoriesList, BrandsList } from '@cloudcommerce/api/
 import type { ContentGetter, SettingsContent, PageContent } from '@@sf/content';
 import type { StorefrontApiContext } from '@@sf/$storefront';
 import { EventEmitter } from 'node:events';
-import { inject, getCurrentInstance } from 'vue';
 import api from '@cloudcommerce/api';
+import { asyncLocalStorage as _als } from '../../config/astro/node-middleware.mjs';
 import _getConfig from '../../config/storefront.config.mjs';
 import { termify } from '../helpers/sf-utils';
 
@@ -23,6 +24,8 @@ export type StorefrontConfig = {
   getContent: ContentGetter,
 };
 
+export const asyncLocalStorage = _als as AsyncLocalStorage<{ sid: string }>;
+
 const emitter = new EventEmitter();
 const getConfig: () => StorefrontConfig = _getConfig;
 
@@ -54,8 +57,8 @@ if (!globalThis.$storefront) {
     // @ts-expect-error: URL is retrived from `target.getSession().url`
     url: undefined,
     getSession(sid?: string) {
-      if (!sid && !!getCurrentInstance()) {
-        sid = inject('sid');
+      if (!sid) {
+        sid = asyncLocalStorage.getStore()?.sid;
       }
       const {
         url,
@@ -112,7 +115,7 @@ const loadRouteContext = async (
     apiPrefetchEndpoints?: ApiPrefetchEndpoints;
   } = {},
 ) => {
-  const sid = `${Date.now() + Math.random()}`;
+  const sid = asyncLocalStorage.getStore()?.sid || `${Date.now()}`;
   sessions[sid] = { url: Astro.url };
   global.__sfSession = sessions[sid];
   const startedAt = Date.now();

package/packages/test-base/lib/endpoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../src/endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,EACJ,aAAa,EACb,mBAAmB,GACpB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,aAAa,IAAI,UAAU,CAAC;AAC3C,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAExD,IAAI,SAAS,GAAG,mBAAmB,CAAC;AACpC,IAAI,CAAC,SAAS,EAAE;IACd,IAAI;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAClC,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CACF,CAAC;QACF,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;KACzC;IAAC,OAAO,CAAC,EAAE;QACV,SAAS,GAAG,YAAY,CAAC;KAC1B;CACF;AAED,MAAM,OAAO,GAAG,yBAAyB,SAAS,IAAI,MAAM,EAAE,CAAC;AAC/D,MAAM,UAAU,GAAG,GAAG,OAAO,UAAU,CAAC;AACxC,MAAM,WAAW,GAAG,GAAG,OAAO,WAAW,CAAC;AAE1C,OAAO,EACL,OAAO,EACP,UAAU,EACV,WAAW,GACZ,CAAC"}
+{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../src/endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,EACJ,aAAa,EACb,mBAAmB,GACpB,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,MAAM,GAAG,aAAa,IAAI,UAAU,CAAC;AAC3C,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAExD,IAAI,SAAS,GAAG,mBAAmB,CAAC;AACpC,IAAI,CAAC,SAAS,EAAE,CAAC;IACf,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAClC,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CACF,CAAC;QACF,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC1C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,SAAS,GAAG,YAAY,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,MAAM,OAAO,GAAG,yBAAyB,SAAS,IAAI,MAAM,EAAE,CAAC;AAC/D,MAAM,UAAU,GAAG,GAAG,OAAO,UAAU,CAAC;AACxC,MAAM,WAAW,GAAG,GAAG,OAAO,WAAW,CAAC;AAE1C,OAAO,EACL,OAAO,EACP,UAAU,EACV,WAAW,GACZ,CAAC"}

package/packages/test-base/package.json

@@ -2,9 +2,15 @@
   "name": "@cloudcommerce/test-base",
   "private": true,
   "type": "module",
-  "version": "2.8.8",
+  "version": "2.10.0",
   "description": "E-Com Plus Cloud Commerce basic setup for testing",
   "main": "lib/index.js",
+  "files": [
+    "/lib",
+    "/types",
+    "/*.{js,mjs,ts}",
+    "/payloads/**/*.{json,js,mjs}"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",

package/packages/types/modules/list_payments:params.d.ts

@@ -212,10 +212,6 @@ export interface ListPaymentsParams {
      * @maxItems 40
      */
     addresses?: {
-      /**
-       * Unique ID (ObjectID)
-       */
-      _id: string;
       /**
        * ZIP (CEP, postal...) code
        */

package/packages/types/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "2.8.8",
+  "version": "2.10.0",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
+  "files": [
+    "/lib",
+    "/*.{js,mjs,ts}",
+    "/**/*.ts"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",

package/packages/modules/lib/firebase/functions-checkout/get-custumerId.js

@@ -1,39 +0,0 @@
-import ecomUtils from '@ecomplus/utils';
-import api from '@cloudcommerce/api';
-import logger from 'firebase-functions/logger';
-
-const findCustomerByEmail = async (email) => {
-  try {
-    const { data } = await api.get(`customers?main_email=${email}&fields=_id`);
-    if (data.result.length) {
-      return data.result[0]._id;
-    }
-    return null;
-  } catch (err) {
-    logger.error(err);
-    return null;
-  }
-};
-
-export default async (customer) => {
-  if (customer._id && customer._id.length === 24) {
-    return customer._id;
-  }
-  if (customer.main_email) {
-    const customerId = await findCustomerByEmail(customer.main_email);
-    if (customerId) {
-      return customerId;
-    }
-  }
-  try {
-    const { data: { _id: newCustomerId } } = await api.post('customers', {
-      display_name: customer.name.given_name || 'visitor',
-      ...customer,
-    });
-    return newCustomerId;
-  } catch (err) {
-    logger.error(err);
-    return ecomUtils.randomObjectId();
-  }
-};
-// # sourceMappingURL=get-custumerId.js.map

package/packages/modules/lib/firebase/functions-checkout/get-custumerId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-custumerId.js","sourceRoot":"","sources":["../../../src/firebase/functions-checkout/get-custumerId.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAE/C,MAAM,mBAAmB,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;IAClD,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,wBAAwB,KAAK,aAAa,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,QAA0B,EAAE,EAAE;IAClD,IAAI,QAAQ,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE;QAC9C,OAAO,QAAQ,CAAC,GAA+B,CAAC;KACjD;IACD,IAAI,QAAQ,CAAC,UAAU,EAAE;QACvB,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClE,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC;SACnB;KACF;IACD,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE;YACnE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,IAAI,SAAS;YACnD,GAAG,QAAQ;SACZ,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO,SAAS,CAAC,cAAc,EAA8B,CAAC;KAC/D;AACH,CAAC,CAAC"}

package/packages/modules/src/firebase/functions-checkout/get-custumerId.ts

@@ -1,39 +0,0 @@
-import type { CustomerCheckout } from '../../types/index';
-import ecomUtils from '@ecomplus/utils';
-import api from '@cloudcommerce/api';
-import logger from 'firebase-functions/logger';
-
-const findCustomerByEmail = async (email: string) => {
-  try {
-    const { data } = await api.get(`customers?main_email=${email}&fields=_id`);
-    if (data.result.length) {
-      return data.result[0]._id;
-    }
-    return null;
-  } catch (err) {
-    logger.error(err);
-    return null;
-  }
-};
-
-export default async (customer: CustomerCheckout) => {
-  if (customer._id && customer._id.length === 24) {
-    return customer._id as string & { length: 24; };
-  }
-  if (customer.main_email) {
-    const customerId = await findCustomerByEmail(customer.main_email);
-    if (customerId) {
-      return customerId;
-    }
-  }
-  try {
-    const { data: { _id: newCustomerId } } = await api.post('customers', {
-      display_name: customer.name.given_name || 'visitor',
-      ...customer,
-    });
-    return newCustomerId;
-  } catch (err) {
-    logger.error(err);
-    return ecomUtils.randomObjectId() as string & { length: 24; };
-  }
-};

package/packages/storefront/config/astro/vue-server.mjs

@@ -1,64 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-import { h, createSSRApp, defineComponent } from 'vue';
-import { renderToString } from 'vue/server-renderer';
-import { setup } from 'virtual:@astrojs/vue/app';
-
-/**
- * Astro passes `children` as a string of HTML, so we need
- * a wrapper `div` to render that content as VNodes.
- *
- * This is the Vue + JSX equivalent of using `<div v-html="value" />`
- */
-const StaticHtml = defineComponent({
-  props: {
-    value: String,
-    name: String,
-    hydrate: {
-      type: Boolean,
-      default: true,
-    },
-  },
-  setup({ name, value, hydrate }) {
-    if (!value) return () => null;
-    const tagName = hydrate ? 'astro-slot' : 'astro-static-slot';
-    return () => h(tagName, { name, innerHTML: value });
-  },
-});
-
-/**
- * Other frameworks have `shouldComponentUpdate` in order to signal
- * that this subtree is entirely static and will not be updated
- *
- * Fortunately, Vue is smart enough to figure that out without any
- * help from us, so this just works out of the box!
- */
-
-function check(Component) {
-  return !!Component.ssrRender || !!Component.__ssrInlineRender;
-}
-
-async function renderToStaticMarkup(Component, inputProps, slotted, metadata) {
-  const slots = {};
-  const props = { ...inputProps };
-  delete props.slot;
-  const sid = this.result?.cookies?.get('sid')?.value;
-  for (const [key, value] of Object.entries(slotted)) {
-    slots[key] = () => h(StaticHtml, {
-      value,
-      name: key === 'default' ? undefined : key,
-      // Adjust how this is hydrated only when the version of Astro supports `astroStaticSlot`
-      hydrate: metadata.astroStaticSlot ? !!metadata.hydrate : true,
-    });
-  }
-  const app = createSSRApp({ render: () => h(Component, props, slots) });
-  app.provide('sid', sid);
-  await setup(app);
-  const html = await renderToString(app);
-  return { html };
-}
-
-export default {
-  check,
-  renderToStaticMarkup,
-  supportsAstroStaticSlot: true,
-};