climaybe 3.4.0 → 3.4.2

package/bin/version.txt

@@ -1 +1 @@
-3.4.0
+3.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
   "type": "module",
   "bin": {

package/src/workflows/multi/multistore-hotfix-to-main.yml

@@ -94,16 +94,22 @@ jobs:
 
           # Default store: commits outside stores/ and assets/ trigger backport.
           # Live-branch minified assets should never backport into main.
-          # Non-default store: only commits under stores/<alias>/ trigger backport; root JSON must not overwrite main.
           if [ -n "$DEFAULT_ALIAS" ] && [ "$SOURCE_ALIAS" = "$DEFAULT_ALIAS" ]; then
             COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- . ':!stores/' ':!assets/' 2>/dev/null | \
               grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" | grep -v "chore(assets)" || true)
           else
-            COMMITS=$(git log --oneline ${MERGE_BASE}..origin/$SOURCE -- "stores/${SOURCE_ALIAS}/" 2>/dev/null | \
-              grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" || true)
+            COMMITS=""
           fi
 
-          if [ -n "$COMMITS" ]; then
+          # Store-specific changes (including root-to-stores sync commits) must
+          # backport immediately. Use tree-diff detection so commit-message
+          # filtering cannot hide valid changes.
+          STORE_CHANGED=""
+          if ! git diff --quiet "$MERGE_BASE" "origin/$SOURCE" -- "stores/${SOURCE_ALIAS}/"; then
+            STORE_CHANGED="yes"
+          fi
+
+          if [ -n "$COMMITS" ] || [ -n "$STORE_CHANGED" ]; then
             # Skip no-op history merges when source and main already have identical content.
             MAIN_TREE=$(git rev-parse origin/main^{tree} 2>/dev/null || echo "")
             SOURCE_TREE=$(git rev-parse origin/$SOURCE^{tree} 2>/dev/null || echo "")

package/src/workflows/preview/pr-update.yml

@@ -135,7 +135,7 @@ jobs:
           echo "Shopify credentials OK for ${{ matrix.alias }}"
 
   cleanup-themes:
-    needs: [extract-pr-number, validate-secrets-per-store]
+    needs: [validate-environment, extract-pr-number, validate-secrets-per-store]
     strategy:
       fail-fast: false
       matrix: