cloudcommerce 2.0.3 → 2.0.5

package/.github/workflows/test-apps.yml

@@ -104,11 +104,11 @@ jobs:
             ${{ steps.npm-paths.outputs.LIB_PATH }}
             ${{ steps.npm-paths.outputs.BIN_PATH }}
             ~/.npm-global/bin
-          key: ${{ runner.os }}-npm-globals-firebase-tools-13.0.2
+          key: ${{ runner.os }}-npm-globals-firebase-tools-13.0.3
 
       - if: steps.npm-g-cache.outputs.cache-hit != 'true'
         shell: bash
-        run: npm install -g firebase-tools@13.0.2
+        run: npm install -g firebase-tools@13.0.3
 
       - name: Initialize Firebase emulators
         shell: bash

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.0.5](https://github.com/ecomplus/cloud-commerce/compare/v2.0.4...v2.0.5) (2024-01-10)
+
+
+### Bug Fixes
+
+* **api:** Fixing types for PATCH request body (partial resource doc set) ([5fb5088](https://github.com/ecomplus/cloud-commerce/commit/5fb508860d3cd8c078e6ea5eb647412f6fccadb2))
+* **api:** Returning proper resource interface on doc find by field (e.g `products/sku:123`) ([f94021b](https://github.com/ecomplus/cloud-commerce/commit/f94021b0179b94b41a905cfa207762c4fc999276))
+* **ssr:** Purge bunny.net cache only for page view URLs of current store domain (from settings) ([6e7dd91](https://github.com/ecomplus/cloud-commerce/commit/6e7dd91a4864f60c9eb4446f2684387f2bf486fe))
+
+### [2.0.4](https://github.com/ecomplus/cloud-commerce/compare/v2.0.3...v2.0.4) (2024-01-09)
+
+
+### Bug Fixes
+
+* **api:** Do not get fetch response `.json()` on status 204 (No Content) ([6d9034f](https://github.com/ecomplus/cloud-commerce/commit/6d9034f03b07cabb9fd0c5ad122597e1f0c44c29))
+* **api:** Properly returning Response instance with additional `data` and `config` ([7a1f1b2](https://github.com/ecomplus/cloud-commerce/commit/7a1f1b2ced36acb3f3a351d9684f74c657dab17a))
+* **api:** Properly set HTTP verbs uppercased on fetch config ([4c49fa1](https://github.com/ecomplus/cloud-commerce/commit/4c49fa1d45c629c99a280f1c3fddaa38a515c634))
+
 ### [2.0.3](https://github.com/ecomplus/cloud-commerce/compare/v2.0.2...v2.0.3) (2024-01-09)
 
 

package/action.yml

@@ -151,11 +151,11 @@ runs:
           ${{ steps.npm-paths.outputs.LIB_PATH }}
           ${{ steps.npm-paths.outputs.BIN_PATH }}
           ~/.npm-global/bin
-        key: ${{ runner.os }}-npm-g-firebase-tools-13.0.2
+        key: ${{ runner.os }}-npm-g-firebase-tools-13.0.3
 
     - if: ${{ github.event_name == 'push' && steps.npm-g-cache.outputs.cache-hit != 'true' }}
       shell: bash
-      run: npm i --location=global firebase-tools@13.0.2
+      run: npm i --location=global firebase-tools@13.0.3
 
     - if: steps.npm-cache-many.outputs.cache-hit != 'true'
       name: Install codebase "many" dependencies
@@ -338,7 +338,7 @@ runs:
         if [ ! -f ".firebaserc" ]; then
           echo '{ "projects": { "default": "ecom2-demo" } }' > .firebaserc
         fi
-        npm --prefix "functions/ssr/" run build:static && npm run build -- --codebase ssr
+        npm --prefix "functions/ssr/" run build:static && npx cloudcommerce prepare
 
     - if: github.event_name == 'pull_request'
       name: Deploy Firebase Hosting PR preview

package/ecomplus-stores/barra-doce/functions/many/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/feeds": "^2.0.2",
-    "@cloudcommerce/firebase": "^2.0.2",
-    "@cloudcommerce/passport": "^2.0.2"
+    "@cloudcommerce/feeds": "^2.0.4",
+    "@cloudcommerce/firebase": "^2.0.4",
+    "@cloudcommerce/passport": "^2.0.4"
   }
 }

package/ecomplus-stores/barra-doce/functions/ssr/package.json

@@ -17,15 +17,15 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^2.0.2",
-    "@cloudcommerce/firebase": "^2.0.2",
-    "@cloudcommerce/ssr": "^2.0.2",
+    "@cloudcommerce/api": "^2.0.4",
+    "@cloudcommerce/firebase": "^2.0.4",
+    "@cloudcommerce/ssr": "^2.0.4",
     "@headlessui/vue": "^1.7.16"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^2.0.2",
-    "@cloudcommerce/storefront": "^2.0.2",
-    "@cloudcommerce/types": "^2.0.2",
+    "@cloudcommerce/i18n": "^2.0.4",
+    "@cloudcommerce/storefront": "^2.0.4",
+    "@cloudcommerce/types": "^2.0.4",
     "@iconify-json/mingcute": "^1.1.15",
     "photoswipe": "^5.4.3"
   }

package/ecomplus-stores/barra-doce/functions/with-apps/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/events": "^2.0.2",
-    "@cloudcommerce/firebase": "^2.0.2",
-    "@cloudcommerce/modules": "^2.0.2"
+    "@cloudcommerce/events": "^2.0.4",
+    "@cloudcommerce/firebase": "^2.0.4",
+    "@cloudcommerce/modules": "^2.0.4"
   }
 }

package/ecomplus-stores/barra-doce/package.json

@@ -23,9 +23,9 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^2.0.2"
+    "@cloudcommerce/cli": "^2.0.4"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^2.0.2"
+    "@cloudcommerce/eslint": "^2.0.4"
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "packages/api/lib/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
@@ -20,6 +20,7 @@
     "@commitlint/config-conventional": "^18.4.4",
     "@commitlint/rules": "^18.4.4",
     "@types/node": "^18.19.5",
+    "dotenv": "^16.3.1",
     "eslint": "^8.56.0",
     "husky": "^8.0.3",
     "standard-version": "^9.5.0",
@@ -30,7 +31,7 @@
     "vite": "^5.0.11",
     "vitest": "^1.1.3",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "2.0.3"
+    "@cloudcommerce/eslint": "2.0.5"
   },
   "scripts": {
     "fix-install": "bash scripts/pre-install.sh && pnpm i",

package/packages/api/lib/api.d.ts

@@ -66,7 +66,10 @@ declare const api: {
         config: Config;
         data: null;
     }>;
-    patch: (endpoint: Endpoint, body: any, config?: AbstractedConfig) => Promise<Response & {
+    patch: <E_2 extends Endpoint, C_2 extends AbstractedConfig>(endpoint: E_2, body: RequestBody<{
+        endpoint: E_2;
+        method: 'patch';
+    }>, config?: C_2 | undefined) => Promise<Response & {
         config: Config;
         data: null;
     }>;
@@ -110,7 +113,10 @@ declare const put: <E extends import("../types.d").ResourceAndFind | `products/$
     config: Config;
     data: null;
 }>;
-declare const patch: (endpoint: Endpoint, body: any, config?: AbstractedConfig) => Promise<Response & {
+declare const patch: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+    endpoint: E;
+    method: 'patch';
+}>, config?: C | undefined) => Promise<Response & {
     config: Config;
     data: null;
 }>;

package/packages/api/lib/api.js

@@ -98,10 +98,9 @@ const api = async (requestConfig, _retries = 0) => {
     ? { ...globalThis.$apiMergeConfig, ...requestConfig }
     : requestConfig;
   const { url, headers } = def.middleware(config);
-  const {
-    method = 'get', timeout = 20000, maxRetries = 3, cacheMaxAge = 600000, // 10 minutes
-  } = config;
-  const canCache = method === 'get' && config.canCache;
+  const method = config.method?.toUpperCase() || 'GET';
+  const { timeout = 20000, maxRetries = 3, cacheMaxAge = 600000 /* 10 minutes */ } = config;
+  const canCache = method === 'GET' && config.canCache;
   let cacheKey;
   if (canCache) {
     cacheKey = `${url}${JSON.stringify(headers)}`;
@@ -140,17 +139,16 @@ const api = async (requestConfig, _retries = 0) => {
   clearTimeout(timer);
   if (response) {
     if (response.ok) {
-      const res = {
-        ...response,
-        data: await response.json(),
-      };
+      const res = response;
+      res.data = response.status !== 204 ? await response.json() : null;
       if (canCache && cacheKey) {
         globalThis.__apiCache[cacheKey] = {
           timestamp: Date.now(),
           res,
         };
       }
-      return { ...res, config };
+      res.config = config;
+      return res;
     }
     const { status } = response;
     if (maxRetries < _retries && (status === 429 || status >= 500)) {
@@ -189,12 +187,14 @@ const put = (endpoint, body, config) => {
     body,
   });
 };
-const patch = (endpoint, body, config) => api({
-  ...config,
-  method: 'patch',
-  endpoint,
-  body,
-});
+const patch = (endpoint, body, config) => {
+  return api({
+    ...config,
+    method: 'patch',
+    endpoint,
+    body,
+  });
+};
 const del = (endpoint, config) => api({
   ...config,
   method: 'delete',

package/packages/api/lib/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",
@@ -22,6 +22,7 @@
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/api#readme",
   "scripts": {
     "build": "bash ../../scripts/build-lib.sh",
-    "test": "tsc -p ../../tsconfig.test.json && vitest run"
+    "test": "tsc -p ../../tsconfig.test.json && vitest run",
+    "test:echo": "tsc -p ../../tsconfig.test.json && vitest run --silent=false"
   }
 }

package/packages/api/src/api.ts

@@ -143,13 +143,13 @@ const api = async <T extends Config & { body?: any, data?: any }>(
     ? { ...globalThis.$apiMergeConfig, ...requestConfig }
     : requestConfig;
   const { url, headers } = def.middleware(config);
+  const method = config.method?.toUpperCase() || 'GET';
   const {
-    method = 'get',
     timeout = 20000,
     maxRetries = 3,
-    cacheMaxAge = 600000, // 10 minutes
+    cacheMaxAge = 600000, /* 10 minutes */
   } = config;
-  const canCache = method === 'get' && config.canCache;
+  const canCache = method === 'GET' && config.canCache;
   let cacheKey: string | undefined;
   if (canCache) {
     cacheKey = `${url}${JSON.stringify(headers)}`;
@@ -190,17 +190,16 @@ const api = async <T extends Config & { body?: any, data?: any }>(
 
   if (response) {
     if (response.ok) {
-      const res = {
-        ...response,
-        data: await response.json(),
-      };
+      const res = response as Response & { data: any, config: Config };
+      res.data = response.status !== 204 ? await response.json() : null;
       if (canCache && cacheKey) {
         globalThis.__apiCache[cacheKey] = {
           timestamp: Date.now(),
-          res,
+          res: res as Response & { data: any },
         };
       }
-      return { ...res, config };
+      res.config = config;
+      return res;
     }
     const { status } = response;
     if (maxRetries < _retries && (status === 429 || status >= 500)) {
@@ -259,12 +258,18 @@ const put = <E extends Exclude<Endpoint, ResourceOpQuery>, C extends AbstractedC
   });
 };
 
-const patch = (endpoint: Endpoint, body: any, config?: AbstractedConfig) => api({
-  ...config,
-  method: 'patch',
-  endpoint,
-  body,
-});
+const patch = <E extends Endpoint, C extends AbstractedConfig>(
+  endpoint: E,
+  body: RequestBody<{ endpoint: E, method: 'patch' }>,
+  config?: C,
+) => {
+  return api({
+    ...config,
+    method: 'patch',
+    endpoint,
+    body,
+  });
+};
 
 const del = (endpoint: Endpoint, config?: AbstractedConfig) => api({
   ...config,

package/packages/api/tests/index.test.ts

@@ -1,3 +1,4 @@
+import * as dotenv from 'dotenv';
 import { test, expect } from 'vitest';
 import api, { type ApiError } from '../src/api';
 
@@ -10,14 +11,24 @@ test('Read product and typecheck SKU', async () => {
   if (data.sku === '123') {
     console.log('\\o/');
   }
+  console.log(data.sku);
   expect(data.sku).toBeTypeOf('string');
   expect(data._id).toBe(productId);
 });
 
+test('Find and read product by SKU', async () => {
+  const { data } = await api({
+    storeId: 1056,
+    endpoint: 'products/sku:GFJ4714',
+  });
+  expect(data.sku).toBe('GFJ4714');
+});
+
 test('404 with different Store ID from env', async () => {
-  process.env.ECOM_STORE_ID = '1011';
   try {
-    const { data } = await api.get(`products/${productId}`);
+    const { data } = await api.get(`products/${productId}`, {
+      storeId: 1011,
+    });
     console.log(data);
     throw new Error('Should have thrown not found');
   } catch (err: any) {
@@ -28,6 +39,7 @@ test('404 with different Store ID from env', async () => {
 });
 
 test('List categories and typecheck result', async () => {
+  process.env.ECOM_STORE_ID = '1056';
   const { data } = await api.get('categories', {
     fields: ['name'] as const,
   });
@@ -80,3 +92,12 @@ test('401 to create category and body typecheck', async () => {
     expect(error.response?.status).toBe(401);
   }
 });
+
+test('204 to update products views', async () => {
+  dotenv.config();
+  const isAuthenticating = !!process.env.ECOM_API_KEY;
+  const { status } = await api.patch(`products/${productId}`, {
+    views: 100,
+  });
+  expect(status).toBe(isAuthenticating ? 204 : 401);
+});

package/packages/api/types.d.ts

@@ -394,19 +394,19 @@ type ResponseBody<
   TConfig['method'] extends 'put' | 'patch' | 'delete' ? null :
   // method?: 'get'
   TConfig['endpoint'] extends `${string}/${ResourceId}/${string}` ? any :
-  TConfig['endpoint'] extends `products/${ResourceId}` ? Products :
-  TConfig['endpoint'] extends `categories/${ResourceId}` ? Categories :
-  TConfig['endpoint'] extends `brands/${ResourceId}` ? Brands :
-  TConfig['endpoint'] extends `collections/${ResourceId}` ? Collections :
-  TConfig['endpoint'] extends `grids/${ResourceId}` ? Grids :
-  TConfig['endpoint'] extends `carts/${ResourceId}` ? Carts :
-  TConfig['endpoint'] extends `orders/${ResourceId}` ? Orders :
-  TConfig['endpoint'] extends `customers/${ResourceId}` ? Customers :
-  TConfig['endpoint'] extends `stores/${ResourceId}` ? Stores :
-  TConfig['endpoint'] extends 'stores/me' ? Stores :
-  TConfig['endpoint'] extends `applications/${ResourceId}` ? Applications :
-  TConfig['endpoint'] extends `authentications/${ResourceId}` ? Authentications :
-  TConfig['endpoint'] extends 'authentications/me' ? Authentications :
+  TConfig['endpoint'] extends ResourceAndFind ?
+    TConfig['endpoint'] extends `products/${string}` ? Products :
+    TConfig['endpoint'] extends `categories/${string}` ? Categories :
+    TConfig['endpoint'] extends `brands/${string}` ? Brands :
+    TConfig['endpoint'] extends `collections/${string}` ? Collections :
+    TConfig['endpoint'] extends `grids/${string}` ? Grids :
+    TConfig['endpoint'] extends `carts/${string}` ? Carts :
+    TConfig['endpoint'] extends `orders/${string}` ? Orders :
+    TConfig['endpoint'] extends `customers/${string}` ? Customers :
+    TConfig['endpoint'] extends `applications/${string}` ? Applications :
+    TConfig['endpoint'] extends `authentications/${string}` ? Authentications :
+    TConfig['endpoint'] extends `stores/${string}` ? Stores :
+    any :
   TConfig['endpoint'] extends ResourceOpQuery ? ResourceListResult<TConfig['endpoint'], ListFields> :
   TConfig['endpoint'] extends SearchOpQuery ? SearchResult<TConfig['endpoint'], ListFields> :
   TConfig['endpoint'] extends SearchHistoryOpQuery ? SearchHistoryResult :
@@ -431,19 +431,28 @@ type SetDocEndpoint<TResource extends Resource> = TResource | `${TResource}/${Re
 
 type RequestBody<TConfig extends Config> =
   TConfig['method'] extends undefined | 'get' | 'delete' ? undefined :
-  TConfig['method'] extends 'patch' ? any : // TODO: partial body
-  // method: 'post' | 'put'
-  TConfig['endpoint'] extends SetDocEndpoint<'products'> ? ProductSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'categories'> ? CategorySet :
-  TConfig['endpoint'] extends SetDocEndpoint<'brands'> ? BrandSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'collections'> ? CollectionSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'grids'> ? GridSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'carts'> ? CartSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'orders'> ? OrderSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'customers'> ? CustomerSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'stores'> ? StoreSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'applications'> ? ApplicationSet :
-  TConfig['endpoint'] extends SetDocEndpoint<'authentications'> ? AuthenticationSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'products'>
+    ? TConfig['method'] extends 'patch' ? Partial<ProductSet> : ProductSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'categories'>
+    ? TConfig['method'] extends 'patch' ? Partial<CategorySet> : CategorySet :
+  TConfig['endpoint'] extends SetDocEndpoint<'brands'>
+    ? TConfig['method'] extends 'patch' ? Partial<BrandSet> : BrandSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'collections'>
+    ? TConfig['method'] extends 'patch' ? Partial<CollectionSet> : CollectionSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'grids'>
+    ? TConfig['method'] extends 'patch' ? Partial<GridSet> : GridSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'carts'>
+    ? TConfig['method'] extends 'patch' ? Partial<CartSet> : CartSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'orders'>
+    ? TConfig['method'] extends 'patch' ? Partial<OrderSet> : OrderSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'customers'>
+    ? TConfig['method'] extends 'patch' ? Partial<CustomerSet> : CustomerSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'stores'>
+    ? TConfig['method'] extends 'patch' ? Partial<StoreSet> : StoreSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'applications'>
+    ? TConfig['method'] extends 'patch' ? Partial<ApplicationSet> : ApplicationSet :
+  TConfig['endpoint'] extends SetDocEndpoint<'authentications'>
+    ? TConfig['method'] extends 'patch' ? Partial<AuthenticationSet> : AuthenticationSet :
   any;
 
 type ErrorBody = {

package/packages/apps/affiliate-program/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affiliate-program",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for simple affiliate program",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/correios/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/custom-payment/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for simple custom payment methods",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/custom-shipping/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-shipping",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {

package/packages/apps/datafrete/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

package/packages/apps/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/fb-conversions/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/flash-courier/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-flash-courier",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {

package/packages/apps/galaxpay/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {

package/packages/apps/google-analytics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-google-analytics",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/jadlog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/loyalty-points/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-loyalty-points",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "E-Com Plus Cloud Commerce app to handle simple loyalty points programs",
   "main": "lib/loyalty-points.js",
   "exports": {