cloudcommerce 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.2.0](https://github.com/ecomplus/cloud-commerce/compare/v2.1.0...v2.2.0) (2024-01-28)
+
+
+### Features
+
+* **cli:** New `ci/bunny-remove-ab.sh` script to clear A/B edge rules on experiment end ([d5c7fc9](https://github.com/ecomplus/cloud-commerce/commit/d5c7fc9d9b34a7e1dc4231c4eeb7b4d5e8adcb37))
+* **cli:** New `ci/bunny-setup.sh` script to setup bunny.net CDN for ISR with perma-cache ([c4bfc14](https://github.com/ecomplus/cloud-commerce/commit/c4bfc14ba9af404bb66e39e585426ea1c1b2542f))
+* **ssr:** Supporting ISR with bunny.net perma-cache ([0bfbf45](https://github.com/ecomplus/cloud-commerce/commit/0bfbf45e4f84ce23920910de02f99f22ce244cd1))
+* **storefront:** Integrating branch based A/B tests with GA4 ([69def97](https://github.com/ecomplus/cloud-commerce/commit/69def9782516afbe77d42131a3def54c6a875031))
+
+
+### Bug Fixes
+
+* **cli:** Normalizing ci scripts with first arg project ID and second domain ([3c65466](https://github.com/ecomplus/cloud-commerce/commit/3c6546633edfcaedb415dee8acd1cbc5decd603f))
+
 ## [2.1.0](https://github.com/ecomplus/cloud-commerce/compare/v2.0.9...v2.1.0) (2024-01-26)
 
 

package/README.md

@@ -1,12 +1,12 @@
-# E-Com Plus Open Cloud Commerce
+# e-com.plus Open Cloud Commerce
 
-Open fair-code eCommerce platform to use on top of headless commerce APIs, it includes:
+Open source eCommerce platform to use on top of headless commerce APIs, it includes:
 - High performant and fully customizable [Astro](https://astro.build/) + [Vue](https://vuejs.org/) storefront;
 - Storefront CMS and page builder;
 - Analytics and A/B testing;
 - Integrations for payments, shipping, ERPs, CRMs and others.
 
-Easy deployment on [Firebase](https://firebase.google.com/), plug & play with **[E-Com Plus APIs](https://developers.e-com.plus/)**.
+Easy deployment on [Firebase](https://firebase.google.com/), plug & play with **[e-com.plus APIs](https://developers.e-com.plus/)**.
 
 ## Concepts
 
@@ -19,7 +19,3 @@ Easy deployment on [Firebase](https://firebase.google.com/), plug & play with **
 7. Easy third-party integrations.
 
 > WIP 🚧
-
-## License
-
-[Fair-code](http://faircode.io) distributed under [**Apache 2.0 with Commons Clause**](https://github.com/ecomplus/cloud-commerce/blob/main/LICENSE.md) license.

package/action.yml

@@ -155,7 +155,7 @@ runs:
           ~/.npm-global/bin
         key: ${{ runner.os }}-npm-g-firebase-tools-13.0.3
 
-    - if: ${{ github.event_name == 'push' && steps.npm-g-cache.outputs.cache-hit != 'true' }}
+    - if: github.event_name == 'push' && steps.npm-g-cache.outputs.cache-hit != 'true'
       shell: bash
       run: npm i --location=global firebase-tools@13.0.3
 
@@ -335,22 +335,25 @@ runs:
           fi
         fi
     
-    - if: github.event_name == 'push' && contains(github.event.head_commit.message, '[config bunny]')
-      name: Set bunny.net CDN pull zone basic configs
+    - if: github.event_name == 'push' && contains(github.event.head_commit.message, '[run:')
+      name: Run script from `@cloudcommerce/cli/ci/`
       shell: bash
       env:
+        COMMIT_MSG: ${{ github.event.head_commit.message }}
         ECOM_STORE_ID: ${{ env.ecom_store_id }}
         GIT_BRANCH: ${{ env.git_branch }}
+        FIREBASE_SERVICE_ACCOUNT: ${{ inputs.firebase-service-account }}
         BUNNYNET_API_KEY: ${{ inputs.bunnynet-api-key }}
       run: |
-        if [ ! -z "$BUNNYNET_API_KEY" ]; then
+        if [ -n "$BUNNYNET_API_KEY" ]; then
+          script_name="${COMMIT_MSG#*\[run:}"
+          script_name="${script_name%%\]*}"
+          project_id=$(echo "$FIREBASE_SERVICE_ACCOUNT" | jq -r .project_id 2>/dev/null)
           domain=$(cat functions/ssr/content/settings.json | jq -r '.domain')
-          if [ ! -z "$domain" ]; then
-            bash $GITHUB_ACTION_PATH/packages/cli/ci/bunny-config-base.sh $domain
-          fi
+          bash $GITHUB_ACTION_PATH/packages/cli/ci/$script_name.sh $project_id $domain
         fi
 
-    - if: github.event_name == 'pull_request'
+    - if: github.event_name == 'pull_request' && github.event.action != 'closed'
       name: Build storefront static
       shell: bash
       env:
@@ -364,7 +367,9 @@ runs:
         fi
         npm --prefix "functions/ssr/" run build:static && npx cloudcommerce prepare
 
-    - if: github.event_name == 'pull_request'
+    - if: |
+        github.event_name == 'pull_request' && github.event.action != 'closed'
+        && env.git_branch != 'main'
       name: Deploy Firebase Hosting PR preview
       id: deploy-preview
       uses: FirebaseExtended/action-hosting-deploy@v0
@@ -374,7 +379,9 @@ runs:
         channelId: ${{ (startsWith(env.git_branch, 'main-') && env.git_branch) || null }}
         expires: ${{ (startsWith(env.git_branch, 'main-') && '30d') || null }}
 
-    - if: ${{ github.event_name == 'pull_request' && startsWith(env.git_branch, 'main-') }}
+    - if: |
+        github.event_name == 'pull_request' && github.event.action != 'closed'
+        && startsWith(env.git_branch, 'main-')
       name: Prepare bunny.net CDN for A/B testing
       shell: bash
       env:
@@ -383,9 +390,26 @@ runs:
         BUNNYNET_API_KEY: ${{ inputs.bunnynet-api-key }}
         CHANNEL_URL: ${{ steps.deploy-preview.outputs.details_url }}
       run: |
-        if [ ! -z "$BUNNYNET_API_KEY" ]; then
+        if [ -n "$BUNNYNET_API_KEY" ]; then
+          domain=$(cat functions/ssr/content/settings.json | jq -r '.domain')
+          if [ -n "$domain" ]; then
+            bash $GITHUB_ACTION_PATH/packages/cli/ci/bunny-prepare-ab.sh 1 $domain $CHANNEL_URL
+          fi
+        fi
+    
+    - if: |
+        github.event_name == 'pull_request' && github.event.action == 'closed'
+        && startsWith(env.git_branch, 'main-')
+      name: Clear A/B testing config on bunny.net CDN
+      shell: bash
+      env:
+        ECOM_STORE_ID: ${{ env.ecom_store_id }}
+        GIT_BRANCH: ${{ env.git_branch }}
+        BUNNYNET_API_KEY: ${{ inputs.bunnynet-api-key }}
+      run: |
+        if [ -n "$BUNNYNET_API_KEY" ]; then
           domain=$(cat functions/ssr/content/settings.json | jq -r '.domain')
-          if [ ! -z "$domain" ]; then
-            bash $GITHUB_ACTION_PATH/packages/cli/ci/bunny-prepare-ab.sh $domain $CHANNEL_URL
+          if [ -n "$domain" ]; then
+            bash $GITHUB_ACTION_PATH/packages/cli/ci/bunny-remove-ab.sh 1 $domain
           fi
         fi

package/ecomplus-stores/barra-doce/.github/workflows/build-and-deploy.yml

@@ -12,6 +12,7 @@ on:
       - '.github/build-and-deploy'
       - '.github/workflows/build-and-deploy.yml'
   pull_request:
+    types: [opened, synchronize, reopened, closed]
     paths:
       - 'functions/ssr/**'
       - '.firebaserc'
@@ -22,8 +23,8 @@ jobs:
     name: Cloud Commerce build and deploy
     runs-on: ubuntu-latest
     if: |
-      github.event.head_commit.message != 'Initial commit' &&
-      !contains(github.event.head_commit.message, '[skip ci]')
+      github.event.head_commit.message != 'Initial commit'
+      && !contains(github.event.head_commit.message, '[skip ci]')
     steps:
       - uses: actions/checkout@v4
         with:

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

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

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

@@ -18,15 +18,15 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^2.0.9",
-    "@cloudcommerce/firebase": "^2.0.9",
-    "@cloudcommerce/ssr": "^2.0.9",
+    "@cloudcommerce/api": "^2.1.0",
+    "@cloudcommerce/firebase": "^2.1.0",
+    "@cloudcommerce/ssr": "^2.1.0",
     "@headlessui/vue": "^1.7.17"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^2.0.9",
-    "@cloudcommerce/storefront": "^2.0.9",
-    "@cloudcommerce/types": "^2.0.9",
+    "@cloudcommerce/i18n": "^2.1.0",
+    "@cloudcommerce/storefront": "^2.1.0",
+    "@cloudcommerce/types": "^2.1.0",
     "@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.9",
-    "@cloudcommerce/firebase": "^2.0.9",
-    "@cloudcommerce/modules": "^2.0.9"
+    "@cloudcommerce/events": "^2.1.0",
+    "@cloudcommerce/firebase": "^2.1.0",
+    "@cloudcommerce/modules": "^2.1.0"
   }
 }

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

@@ -22,16 +22,14 @@
     "functions/!(ssr)/**/*.ts": "eslint --fix"
   },
   "main": "functions/index.js",
-  "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^2.0.9"
+    "@cloudcommerce/cli": "^2.1.0"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^2.0.9",
+    "@cloudcommerce/eslint": "^2.1.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0"
   }

package/ecomplus-stores/tia-sonia/.github/workflows/build-and-deploy.yml

@@ -12,6 +12,7 @@ on:
       - '.github/build-and-deploy'
       - '.github/workflows/build-and-deploy.yml'
   pull_request:
+    types: [opened, synchronize, reopened, closed]
     paths:
       - 'functions/ssr/**'
       - '.firebaserc'
@@ -22,8 +23,8 @@ jobs:
     name: Cloud Commerce build and deploy
     runs-on: ubuntu-latest
     if: |
-      github.event.head_commit.message != 'Initial commit' &&
-      !contains(github.event.head_commit.message, '[skip ci]')
+      github.event.head_commit.message != 'Initial commit'
+      && !contains(github.event.head_commit.message, '[skip ci]')
     steps:
       - uses: actions/checkout@v4
         with:
@@ -75,3 +76,4 @@ jobs:
           pagarmev5-public-key: ${{ secrets.PAGARMEV5_PUBLIC_KEY }}
           tiktok-pixel-id: ${{ secrets.TIKTOK_PIXEL_ID }}
           tiktok-access-token: ${{ secrets.TIKTOK_ACCESS_TOKEN }}
+          public-dotenv: ${{ secrets.PUBLIC_DOTENV }}

package/ecomplus-stores/tia-sonia/package.json

@@ -17,8 +17,6 @@
     "setup:quiet": "cloudcommerce setup --no-deploy --no-commit"
   },
   "main": "functions/index.js",
-  "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
-  "license": "Apache 2.0 with Commons Clause",
   "bugs": {
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "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>",
@@ -36,7 +36,7 @@
     "vite": "^5.0.11",
     "vitest": "^1.2.1",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "2.1.0"
+    "@cloudcommerce/eslint": "2.2.0"
   },
   "scripts": {
     "fix-install": "bash scripts/pre-install.sh && pnpm i",

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affiliate-program",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to handle simple loyalty points programs",
   "main": "lib/loyalty-points.js",
   "exports": {

package/packages/apps/mandae/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mandae",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Mandaê shipping intermediator",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/melhor-envio/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-melhor-envio",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Melhor Envio",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/mercadopago/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mercadopago",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Mercado Pago",
   "main": "lib/mercadopago.js",
   "exports": {

package/packages/apps/pagarme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me",
   "main": "lib/pagarme.js",
   "exports": {

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme-v5",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/paghiper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate PagHiper",
   "main": "lib/paghiper.js",
   "exports": {

package/packages/apps/pix/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pix API (Bacen)",
   "main": "lib/pix.js",
   "exports": {

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

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app for Tiny ERP",
   "main": "lib/tiny-erp.js",
   "repository": {

package/packages/apps/webhooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "E-Com Plus Cloud Commerce app for general order webhooks",
   "main": "lib/index.js",
   "repository": {