cloudcommerce 2.1.0 → 2.2.1

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "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.1",
   "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.1",
   "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.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-functions": "^4.6.0"
   },
   "devDependencies": {

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/galaxpay/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

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.1",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/jadlog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "axios": "^1.6.5"
+    "axios": "^1.6.7"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*"

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.1",
   "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.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Mandaê shipping intermediator",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-functions": "^4.6.0"
   },
   "devDependencies": {

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.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Melhor Envio",
   "main": "lib/index.js",
   "exports": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/mercadopago/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mercadopago",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.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.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/pagarme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.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.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0",
     "pagarme": "^4.33.1",

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.1",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {
@@ -27,7 +27,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.6",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/paghiper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.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.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/apps/pix/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.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.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

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.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.6",
-    "axios": "^1.6.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0",
     "form-data": "4.0.0"

package/packages/apps/webhooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.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.5",
+    "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
     "firebase-functions": "^4.6.0"
   },

package/packages/cli/ci/bunny-config-base.sh

@@ -5,11 +5,16 @@ if [ -z "$BUNNYNET_API_KEY" ]; then
   exit 1
 fi
 if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
   echo "Provide the domain as the first argument"
   exit 1
 fi
 
-domain=$1
+project_id=$1
+domain=$2
 
 response=$(curl --silent --request GET \
   --url https://api.bunny.net/pullzone \
@@ -51,9 +56,7 @@ curl --silent --request POST \
     "css"
   ],
   "EnableAccessControlOriginHeader": true,
-  "DisableCookies": false,
-  "EnableOriginShield": true,
-  "CacheControlMaxAgeOverride": -1,
+  "DisableCookies": true,
   "CacheControlPublicMaxAgeOverride": -1,
   "BurstSize": 0,
   "RequestLimit": 0,
@@ -70,11 +73,8 @@ curl --silent --request POST \
   "EnableAvifVary": false,
   "EnableCountryCodeVary": false,
   "EnableMobileVary": false,
-  "EnableCookieVary": true,
-  "CookieVaryParameters": [
-    "bid",
-    "branch"
-  ],
+  "EnableCookieVary": false,
+  "CookieVaryParameters": [],
   "EnableHostnameVary": false,
   "LoggingIPAnonymizationEnabled": true,
   "EnableTLS1": true,
@@ -87,7 +87,6 @@ curl --silent --request POST \
   "LogForwardingEnabled": false,
   "LoggingSaveToStorage": false,
   "FollowRedirects": false,
-  "PermaCacheStorageZoneId": 0,
   "OriginRetries": 0,
   "OriginConnectTimeout": 5,
   "OriginResponseTimeout": 15,
@@ -112,7 +111,7 @@ curl --silent --request POST \
   "LogForwardingFormat": 1,
   "ShieldDDosProtectionType": 1,
   "ShieldDDosProtectionEnabled": false,
-  "EnableRequestCoalescing": true,
+  "EnableRequestCoalescing": false,
   "RequestCoalescingTimeout": 30,
   "DisableLetsEncrypt": false,
   "EnableBunnyImageAi": false,
@@ -162,8 +161,65 @@ configure_edge_rule "APIs bypass CDN cache" '
       "Parameter1": ""
     }
   ],
-  "TriggerMatchingType": 0,
+  "TriggerMatchingType": 1,
   "Description": "APIs bypass CDN cache",
   "Enabled": true
 }
 '
+
+configure_edge_rule "APIs bypass perma-cache" '
+{
+  "ActionType": 15,
+  "ActionParameter1": null,
+  "ActionParameter2": null,
+  "Triggers": [
+    {
+      "Type": 0,
+      "PatternMatches": [
+        "*/_api/*",
+        "*/_feeds/*",
+        "*/.*/git/*",
+        "*/_analytics"
+      ],
+      "PatternMatchingType": 0,
+      "Parameter1": ""
+    }
+  ],
+  "TriggerMatchingType": 1,
+  "Description": "APIs bypass perma-cache",
+  "Enabled": true
+}
+'
+
+configure_edge_rule "SSR browser cache" '
+{
+  "ActionType": 16,
+  "ActionParameter1": "120",
+  "ActionParameter2": null,
+  "Triggers": [
+    {
+      "Type": 0,
+      "PatternMatches": [
+        "*/_astro/*"
+      ],
+      "PatternMatchingType": 2,
+      "Parameter1": ""
+    },
+    {
+      "Type": 3,
+      "PatternMatches": [
+        "webp",
+        "png",
+        "jpg",
+        "woff2",
+        "mp4"
+      ],
+      "PatternMatchingType": 2,
+      "Parameter1": ""
+    }
+  ],
+  "TriggerMatchingType": 1,
+  "Description": "SSR browser cache",
+  "Enabled": true
+}
+'

package/packages/cli/ci/bunny-prepare-ab.sh

@@ -5,17 +5,17 @@ if [ -z "$BUNNYNET_API_KEY" ]; then
   exit 1
 fi
 if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
   echo "Provide the domain as the first argument"
   exit 1
 fi
 
-domain=$1
-channel_url=$2
-
-curl --request POST \
-  --url "https://api.bunny.net/purge?url=https://$domain/&async=false" \
-  --header "AccessKey: $BUNNYNET_API_KEY"
-echo "> Purged https://$domain/ cache"
+project_id=$1
+domain=$2
+channel_url=$3
 
 base_uri=""
 additional_patterns=()
@@ -27,16 +27,12 @@ fetch_and_purge() {
 
   for slug in $slugs; do
     if [ -n "$slug" ]; then
-      curl --request POST \
-        --url "https://api.bunny.net/purge?url=https://$domain/$slug" \
-        --header "AccessKey: $BUNNYNET_API_KEY"
       additional_patterns+=("\"https://$domain/$slug\"")
-      echo "> Purged https://$domain/$slug cache"
     fi
   done
 }
 
-if [ ! -z "$ECOM_STORE_ID" ]; then
+if [ -n "$ECOM_STORE_ID" ]; then
   base_uri="https://ecomplus.io/v2/:$ECOM_STORE_ID/"
 
   fetch_and_purge 'products?fields=slug&sort=-sales&limit=2'
@@ -119,31 +115,31 @@ ab_testing_data="
   \"Enabled\": true
 }"
 
-ab_testing_cookie_data="
+ab_testing_bypass_data="
 {
-  \"ActionType\": 2,
-  \"ActionParameter1\": \"$channel_url\",
+  \"ActionType\": 3,
+  \"ActionParameter1\": \"0\",
   \"ActionParameter2\": \"\",
   \"Triggers\": [
     {
-      \"Type\": 10,
+      \"Type\": 0,
       \"PatternMatches\": [
-        \"$GIT_BRANCH\"
+        \"https://$domain/\"
       ],
       \"PatternMatchingType\": 0,
-      \"Parameter1\": \"branch\"
+      \"Parameter1\": \"\"
     }
   ],
   \"TriggerMatchingType\": 1,
-  \"Description\": \"A/B testing cookie [$GIT_BRANCH]\",
+  \"Description\": \"A/B CDN cache bypass [$GIT_BRANCH]\",
   \"Enabled\": true
 }"
 
-ab_testing_bypass_data="
+ab_testing_perma_bypass_data="
 {
-  \"ActionType\": 3,
-  \"ActionParameter1\": \"0\",
-  \"ActionParameter2\": \"\",
+  \"ActionType\": 15,
+  \"ActionParameter1\": null,
+  \"ActionParameter2\": null,
   \"Triggers\": [
     {
       \"Type\": 0,
@@ -155,10 +151,23 @@ ab_testing_bypass_data="
     }
   ],
   \"TriggerMatchingType\": 1,
-  \"Description\": \"A/B testing cache bypass\",
+  \"Description\": \"A/B perma-cache bypass [$GIT_BRANCH]\",
   \"Enabled\": true
 }"
 
 configure_edge_rule "A/B testing [$GIT_BRANCH]" "$ab_testing_data"
-configure_edge_rule "A/B testing cookie [$GIT_BRANCH]" "$ab_testing_cookie_data" false
-configure_edge_rule "A/B testing cache bypass" "$ab_testing_bypass_data"
+configure_edge_rule "A/B CDN cache bypass [$GIT_BRANCH]" "$ab_testing_bypass_data"
+configure_edge_rule "A/B perma-cache bypass [$GIT_BRANCH]" "$ab_testing_perma_bypass_data"
+
+curl --silent --request POST \
+  --url "https://api.bunny.net/purge?url=https://$domain/" \
+  --header "AccessKey: $BUNNYNET_API_KEY"
+printf "\n> Purged https://$domain/ cache"
+
+for slug_url in "${additional_patterns[@]}"; do
+  clean_url=${slug_url//\"/}
+  curl --silent --request POST \
+    --url "https://api.bunny.net/purge?url=$clean_url" \
+    --header "AccessKey: $BUNNYNET_API_KEY"
+  echo "> Purged $clean_url cache"
+done

package/packages/cli/ci/bunny-remove-ab.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+if [ -z "$BUNNYNET_API_KEY" ]; then
+  echo "BUNNYNET_API_KEY env var must be set"
+  exit 1
+fi
+if [ $# -eq 0 ]; then
+  echo "Provide the Firebase project ID as the first argument"
+  exit 1
+fi
+if [ $# -eq 1 ]; then
+  echo "Provide the domain as the first argument"
+  exit 1
+fi
+
+project_id=$1
+domain=$2
+
+if [ -z "$GIT_BRANCH" ]; then
+  echo "GIT_BRANCH env not set, skipping edge rules removal"
+  exit 0
+fi
+
+response=$(curl --silent --request GET \
+  --url https://api.bunny.net/pullzone \
+  --header "AccessKey: $BUNNYNET_API_KEY" \
+  --header 'accept: application/json')
+
+pull_zone_id=$(echo $response | jq --arg domain "$domain" '[.[] | select(.Hostnames[].Value | contains($domain)).Id][0]')
+if [ -z "$pull_zone_id" ]; then
+  echo "bunny.net pull zone not found for domain $domain"
+  exit 1
+fi
+
+edge_rules=$(echo $response | jq --arg id "$pull_zone_id" '.[] | select(.Id == ($id | tonumber)).EdgeRules')
+
+remove_edge_rule() {
+  local description=$1
+  local found_rule=$(echo $edge_rules | jq --arg description "$description" '.[] | select(.Description == $description)')
+  local guid=$(echo $found_rule | jq -r '.Guid // empty')
+
+  if [ -n "$guid" ]; then
+    curl --silent --request DELETE \
+      --url "https://api.bunny.net/pullzone/$pull_zone_id/edgerules/$guid" \
+      --header "AccessKey: $BUNNYNET_API_KEY"
+    echo "> Removed edge rule \"$description\""
+  else
+    echo "> Edge rule \"$description\" not found"
+  fi
+}
+
+remove_edge_rule "A/B testing [$GIT_BRANCH]"
+remove_edge_rule "A/B CDN cache bypass [$GIT_BRANCH]"
+remove_edge_rule "A/B perma-cache bypass [$GIT_BRANCH]"