cloudcommerce 0.32.0 → 0.33.1

package/packages/apps/mercadopago/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mercadopago",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Mercado Pago",
   "main": "lib/mercadopago.js",
   "exports": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0"
   },

package/packages/apps/pagarme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me",
   "main": "lib/pagarme.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0",
     "pagarme": "^4.33.1",

package/packages/apps/pagarme-v5/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme-v5",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {
@@ -27,9 +27,9 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
-    "axios": "^1.5.1",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
-    "firebase-functions": "^4.4.1"
+    "firebase-functions": "^4.5.0"
   },
   "devDependencies": {
     "@cloudcommerce/test-base": "workspace:*",

package/packages/apps/paghiper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app to integrate PagHiper",
   "main": "lib/paghiper.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0"
   },

package/packages/apps/pix/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Pix API (Bacen)",
   "main": "lib/pix.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0"
   },

package/packages/apps/tiny-erp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app for Tiny ERP",
   "main": "lib/tiny-erp.js",
   "repository": {
@@ -22,7 +22,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0",
     "form-data": "4.0.0"

package/packages/apps/webhooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app for general order webhooks",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0"
   },

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {

package/packages/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce email sender",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "ejs": "^3.1.9",
     "nodemailer": "^6.9.7"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",
-    "@types/ejs": "^3.1.4",
-    "@types/nodemailer": "^6.4.13"
+    "@types/ejs": "^3.1.5",
+    "@types/nodemailer": "^6.4.14"
   }
 }

package/packages/eslint/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/eslint",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce ESLint config",
   "main": "lib/index.js",
   "repository": {
@@ -19,8 +19,8 @@
     "build": "echo '@ecomplus/eslint'"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "eslint": "^8.53.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0",

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {

package/packages/feeds/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/feeds",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce catalog feeds",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
-    "@google-cloud/pubsub": "^4.0.6",
+    "@google-cloud/pubsub": "^4.0.7",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0",
     "source-map-support": "^0.5.21"

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/lib/firebase.js

@@ -3,12 +3,12 @@ import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 import serveModulesApi from './firebase/serve-modules-api.js';
 
-const { httpsFunctionOptions: { region }, modulesFunctionOptions: { memory } } = config.get();
+const { httpsFunctionOptions: { region }, modulesFunctionOptions } = config.get();
 
 export const modules = onRequest({
   concurrency: 24,
   region,
-  memory,
+  ...modulesFunctionOptions,
 }, (req, res) => {
   if (!process.env.MODULES_DISABLE_CORS) {
     res.setHeader('Access-Control-Allow-Origin', '*');

package/packages/modules/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,MAAM,EACJ,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAChC,sBAAsB,EAAE,EAAE,MAAM,EAAE,GACnC,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,EAAE;IACf,MAAM;IACN,MAAM;CACP,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAClD,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,gCAAgC,CAAC,CAAC;QAChF,GAAG,CAAC,SAAS,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC/C,GAAG,CAAC,SAAS,CACX,8BAA8B,EAC9B,kEAAkE,CACnE,CAAC;QACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YAC5B,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;SACR;KACF;IACD,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAE3D,MAAM,EACJ,oBAAoB,EAAE,EAAE,MAAM,EAAE,EAChC,sBAAsB,GACvB,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAEjB,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,EAAE;IACf,MAAM;IACN,GAAG,sBAAsB;CAC1B,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACd,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAClD,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,gCAAgC,CAAC,CAAC;QAChF,GAAG,CAAC,SAAS,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC/C,GAAG,CAAC,SAAS,CACX,8BAA8B,EAC9B,kEAAkE,CACnE,CAAC;QACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YAC5B,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;SACR;KACF;IACD,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -47,7 +47,7 @@
     "@ecomplus/utils": "1.5.0-rc.5",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "axios": "^1.6.0",
+    "axios": "^1.6.1",
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.5.0",
     "source-map-support": "^0.5.21"

package/packages/modules/src/firebase.ts

@@ -5,13 +5,13 @@ import serveModulesApi from './firebase/serve-modules-api';
 
 const {
   httpsFunctionOptions: { region },
-  modulesFunctionOptions: { memory },
+  modulesFunctionOptions,
 } = config.get();
 
 export const modules = onRequest({
   concurrency: 24,
   region,
-  memory,
+  ...modulesFunctionOptions,
 }, (req, res) => {
   if (!process.env.MODULES_DISABLE_CORS) {
     res.setHeader('Access-Control-Allow-Origin', '*');

package/packages/passport/lib/firebase.js

@@ -10,8 +10,19 @@ export const passport = functions
   .region(region)
   .runWith({
     ...httpsFunctionOptions,
-    memory: '256MB',
     timeoutSeconds: 30,
   })
-  .https.onRequest(servePassportApi);
+  .https.onRequest((req, res) => {
+    if (!process.env.PASSPORT_DISABLE_CORS) {
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, OPTIONS');
+      res.setHeader('Access-Control-Max-Age', '600');
+      res.setHeader('Access-Control-Allow-Headers', 'Authorization, Content-Type, X-Store-ID, X-My-ID, X-Access-Token');
+      if (req.method === 'OPTIONS') {
+        res.end();
+        return Promise.resolve();
+      }
+    }
+    return servePassportApi(req, res);
+  });
 // # sourceMappingURL=firebase.js.map

package/packages/passport/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;AAExC,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,GAAG,oBAAoB;IACvB,MAAM,EAAE,OAAO;IACf,cAAc,EAAE,EAAE;CACnB,CAAC;KACD,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;AAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;AAExC,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS;KAC9B,MAAM,CAAC,MAAM,CAAC;KACd,OAAO,CAAC;IACP,GAAG,oBAAoB;IACvB,cAAc,EAAE,EAAE;CACnB,CAAC;KACD,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;QACtC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAClD,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,gCAAgC,CAAC,CAAC;QAChF,GAAG,CAAC,SAAS,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC/C,GAAG,CAAC,SAAS,CACX,8BAA8B,EAC9B,kEAAkE,CACnE,CAAC;QACF,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YAC5B,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;KACF;IACD,OAAO,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC"}

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/passport/src/firebase.ts

@@ -10,7 +10,21 @@ export const passport = functions
   .region(region)
   .runWith({
     ...httpsFunctionOptions,
-    memory: '256MB',
     timeoutSeconds: 30,
   })
-  .https.onRequest(servePassportApi);
+  .https.onRequest((req, res) => {
+    if (!process.env.PASSPORT_DISABLE_CORS) {
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, OPTIONS');
+      res.setHeader('Access-Control-Max-Age', '600');
+      res.setHeader(
+        'Access-Control-Allow-Headers',
+        'Authorization, Content-Type, X-Store-ID, X-My-ID, X-Access-Token',
+      );
+      if (req.method === 'OPTIONS') {
+        res.end();
+        return Promise.resolve();
+      }
+    }
+    return servePassportApi(req, res);
+  });

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -30,8 +30,7 @@
     "@cloudcommerce/firebase": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
-    "@headlessui/vue": "^1.7.16",
-    "@vueuse/core": "10.5.0",
+    "@vueuse/core": "10.6.1",
     "astro": "2.10.15",
     "astro-capo": "^0.0.1",
     "firebase-admin": "^11.11.0",

package/packages/storefront/client.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="./src/vue-globals" />
 /// <reference types="./.auto-imports" />
+/// <reference types="gtag.js" />
 
 type DocCleanupFields = 'body_html'
   | 'body_text'
@@ -29,3 +30,5 @@ interface Window {
   };
   $isCmsPreview?: boolean;
 }
+
+declare module 'gtag.js';

package/packages/storefront/config/astro/context-directive.mjs

@@ -23,9 +23,9 @@ export default (load, opts) => {
   if (window._firstLoadContextId === id && window._emitedContextId === id) {
     console.log('[ctx] first load');
     next();
-    setTimeout(() => {
+    document.addEventListener('astro:beforeload', () => {
       delete window._firstLoadContextId;
-    }, 49);
+    }, { once: true });
     return;
   }
   window.addEventListener('storefront:apiContext', next, { once: true });

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
@@ -37,23 +37,23 @@
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.5",
     "@fastify/deepmerge": "^1.3.0",
-    "@headlessui/vue": "^1.7.16",
     "@iconify-json/fa6-brands": "^1.1.13",
     "@iconify-json/heroicons": "^1.1.13",
     "@iconify-json/logos": "^1.1.37",
+    "@types/gtag.js": "^0.0.18",
     "@vite-pwa/astro": "^0.1.4",
-    "@vueuse/core": "10.5.0",
+    "@vueuse/core": "10.6.1",
     "astro": "2.10.15",
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.3.1",
-    "firebase": "^10.5.2",
+    "firebase": "^10.6.0",
     "image-size": "^1.0.2",
     "mime": "^3.0.0",
     "semver": "^7.5.4",
     "sharp": "^0.32.6",
     "tailwindcss": "^3.3.5",
-    "unocss": "^0.57.2",
+    "unocss": "^0.57.3",
     "unplugin-auto-import": "^0.16.7",
     "vite": "^4.5.0",
     "vite-plugin-pwa": "^0.16.7",

package/packages/storefront/src/analytics/event-to-fbq.ts

@@ -0,0 +1,15 @@
+import type { GtagEventMessage } from '@@sf/state/use-analytics';
+
+export const parseGtagToFbq = (event: GtagEventMessage['event']) => {
+  let name = '';
+  const params: Record<string, any> = {};
+  switch (event.name) {
+    case 'page_view':
+      name = 'PageView';
+      break;
+    default:
+  }
+  return { name, params };
+};
+
+export default parseGtagToFbq;

package/packages/storefront/src/helpers/afetch.ts

@@ -1,6 +1,12 @@
 type FetchParams = Parameters<typeof fetch>;
+type RequestInit = Exclude<FetchParams[1], undefined>;
+type BodyInit = RequestInit['body'] | Record<string, any> | Array<any>;
 
-const afetch = (url: FetchParams[0], init?: FetchParams[1], timeout = 10000) => {
+const afetch = (
+  url: FetchParams[0],
+  init?: Omit<RequestInit, 'body'> & { body?: BodyInit },
+  timeout = 10000,
+) => {
   let abortController: AbortController | undefined;
   let timer: NodeJS.Timeout | undefined;
   if (timeout) {
@@ -9,16 +15,22 @@ const afetch = (url: FetchParams[0], init?: FetchParams[1], timeout = 10000) =>
       (abortController as AbortController).abort();
     }, timeout);
   }
-  if (init?.body && typeof init.body === 'object') {
-    init.body = JSON.stringify(init.body);
-    init.headers = {
-      ...init.headers,
-      'Content-Type': 'application/json',
-      'Content-Length': init.body.length.toString(),
-    };
+  let body: RequestInit['body'];
+  if (init?.body) {
+    if (typeof init.body === 'object') {
+      body = JSON.stringify(init.body);
+      init.headers = {
+        ...init.headers,
+        'Content-Type': 'application/json',
+        'Content-Length': body.length.toString(),
+      };
+    } else {
+      body = init.body;
+    }
   }
   const promise = fetch(url, {
     ...init,
+    body,
     signal: abortController?.signal,
   });
   promise.finally(() => {

package/packages/storefront/src/lib/assets/base.css

@@ -11,9 +11,9 @@
   --transition: .15s ease-in-out;
   --transition-slow: .25s ease-in-out;
   --transition-slower: .45s ease-in-out;
-  --rgb-on-dark: 255, 255, 255;
+  --rgb-on-dark: 255 255 255;
   --c-on-dark: rgb(var(--rgb-on-dark));
-  --rgb-on-light: 0, 0, 0;
+  --rgb-on-light: 0 0 0;
   --c-on-light: rgb(var(--rgb-on-light));
   --c-background: #fff;
   --c-on-background: theme('colors.base.800');
@@ -67,10 +67,11 @@ html {
 }
 
 :focus-visible {
-  outline-color: var(--c-outline, rgba(var(--rgb-secondary), .1));
+  outline-color: var(--c-outline, rgb(var(--rgb-secondary) / .1));
 }
 ::selection {
-  background-color: var(--c-selection-background, rgba(var(--rgb-secondary), .15));
+  background-color: var(--c-selection-background, rgb(var(--rgb-secondary-950) / .7));
+  color: var(--c-selection-foreground, #fff);
 }
 ::marker {
   color: var(--c-primary);

package/packages/storefront/src/lib/assets/tooltip.css

@@ -1,7 +1,7 @@
 [data-tooltip] {
   position: relative;
   cursor: help;
-  --background-color: var(--c-tooltip-background, rgba(44, 44, 44, 0.85));
+  --background-color: var(--c-tooltip-background, rgb(44 44 44 / 0.85));
   --color: var(--c-tooltip-foreground, var(--c-on-dark));
   --border-color: transparent transparent var(--background-color) transparent;
 }

package/packages/storefront/src/lib/components/Carousel.vue

@@ -127,24 +127,29 @@ const changeSlide = (step: number, isPageScroll: boolean = true) => {
   if (slideSizes.value.length < 2) {
     return;
   }
-  if (isPageScroll && (step === 1 || step === -1)) {
-    let pageStep = 0;
-    let pageStepSize = 0;
-    for (let i = activeIndex.value; i < slideSizes.value.length; i++) {
-      const { size } = slideSizes.value[i] || {};
-      if (size) {
-        pageStep += 1;
-        pageStepSize += size;
-        if (pageStepSize >= wrapperVisibleSize.value) {
-          break;
+  let nextOffset = -1;
+  if (currentPos.value + wrapperVisibleSize.value >= wrapperScrollSize.value) {
+    nextOffset = 0;
+  } else {
+    if (isPageScroll && (step === 1 || step === -1)) {
+      let pageStep = 0;
+      let pageStepSize = 0;
+      for (let i = activeIndex.value; i < slideSizes.value.length; i++) {
+        const { size } = slideSizes.value[i] || {};
+        if (size) {
+          pageStep += 1;
+          pageStepSize += size;
+          if (pageStepSize + size * 0.75 >= wrapperVisibleSize.value) {
+            break;
+          }
         }
       }
+      if (pageStep) {
+        step = step > 0 ? pageStep : -pageStep;
+      }
     }
-    if (pageStep) {
-      step = step > 0 ? pageStep : -pageStep;
-    }
+    nextOffset = calcNextOffset(step);
   }
-  const nextOffset = calcNextOffset(step);
   wrapper.value?.scrollTo({
     [isX ? 'left' : 'top']: nextOffset,
     behavior: 'smooth',

package/packages/storefront/src/lib/composables/use-product-card.ts

@@ -8,6 +8,7 @@ import {
   inStock as checkInStock,
   onPromotion as checkOnPromotion,
 } from '@ecomplus/utils';
+import { emitGtagEvent, getGtagItem } from '@@sf/state/use-analytics';
 
 type PictureSize = { url: string; alt?: string; size?: string };
 
@@ -16,6 +17,8 @@ export type ProductItem = Products | SearchItem;
 export type Props = {
   product?: ProductItem;
   productId?: Products['_id'];
+  listId?: string;
+  listName?: string;
 } & ({ product: ProductItem } | { productId: Products['_id'] });
 
 const useProductCard = <T extends ProductItem | undefined = undefined>(props: Props) => {
@@ -82,6 +85,14 @@ const useProductCard = <T extends ProductItem | undefined = undefined>(props: Pr
     if ((product as SearchItem).has_variations) return true;
     return Boolean(product.variations?.length);
   });
+  emitGtagEvent('view_item', {
+    value: isActive.value ? product.price : 0,
+    items: [{
+      ...getGtagItem(product),
+      item_list_id: props.listId,
+      item_list_name: props.listName,
+    }],
+  });
 
   return {
     isFetching,

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

@@ -20,6 +20,7 @@ const { customCode } = await getContent('layout');
   {customCode?.htmlBody && <Fragment set:html={customCode.htmlBody} />}
   <slot name="base-body-scripts">
     <script src="../scripts/session-utm"></script>
+    <script src="../scripts/push-analytics-events"></script>
   </slot>
   <slot name="before-body-end" />
 </BaseBody>