climaybe 3.4.1 → 3.4.3

package/README.md

@@ -231,7 +231,7 @@ Enabled via `climaybe init` prompt (`Enable preview + cleanup workflows?`; defau
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
-| `pr-update.yml` | PR opened/synchronize/reopened (base: main, staging, develop, staging-*, live-*) | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs. **Multi-store + base not** `staging-<alias>` **or** `live-<alias>`**:** publishes to **every** configured store (matrix) and posts **all** links in one PR comment. For `staging-<alias>` / `live-<alias>` bases, only that store is used. **Path filter:** theme paths only (`assets/`, `blocks/`, `config/`, `layout/`, `locales/`, `sections/`, `snippets/`, `templates/`, `_scripts/`, `_styles/`, `shopify.theme.toml`, `stores/**`). |
+| `pr-update.yml` | PR opened/synchronize/reopened (base: main, staging, develop, staging-*, live-*) | Shares draft theme, renames with `-PR<number>`, comments preview + customize URLs. **Multi-store + source branch (`pull_request.head.ref`) not** `staging-<alias>` **or** `live-<alias>`**:** publishes to **every** configured store (matrix) and posts **all** links in one PR comment. For `staging-<alias>` / `live-<alias>` source branches, only that store is used. **Path filter:** theme paths only (`assets/`, `blocks/`, `config/`, `layout/`, `locales/`, `sections/`, `snippets/`, `templates/`, `_scripts/`, `_styles/`, `shopify.theme.toml`, `stores/**`). |
 | `pr-close.yml` | PR closed (same branch set) | Deletes this PR’s preview themes using the **same store matrix rule** as `pr-update`; PR comment shows **total** deleted count across stores. |
 | `cleanup-orphan-preview-themes.yml` | Weekly (Mon 06:00 UTC) + `workflow_dispatch` | Per store: deletes themes ending with `-PR<n>` when PR `#n` is **not** open (merged/closed without cleanup). Uses `gh pr list` (limit 1000 open PRs). |
 | `reusable-publish-pr-preview-store.yml` | workflow_call | Share + rename + upload comment fragment for **one** store (matrix leg in `pr-update`). |
@@ -382,7 +382,7 @@ Add the following secrets to your GitHub repository (or use **GitLab CI/CD varia
 
 **Store URL:** During `climaybe init` (or `add-store`), store URL secret(s) are set from your configured store domain(s); theme tokens are optional prompts.
 
-**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`). **Preview:** for PRs targeting **staging-&lt;alias&gt;** or **live-&lt;alias&gt;** only that store is used. For **main**, **staging**, **develop**, or other bases with **multiple** stores in `climaybe.config.json`, **pr-update** publishes the preview theme to **every** store (each must have secrets); **pr-close** cleans that PR’s preview themes on **all** stores. For a **single** store in config, behavior matches the default-store case. Optional **cleanup-orphan-preview-themes** (weekly + manual) removes stale `-PR<n>` themes when PR `n` is no longer open.
+**Multi-store:** Per-store secrets `SHOPIFY_STORE_URL_<ALIAS>` and `SHOPIFY_THEME_ACCESS_TOKEN_<ALIAS>` — the URL is set from config; you must provide the theme token per store. `<ALIAS>` is uppercase with hyphens as underscores (e.g. `voldt-norway` → `SHOPIFY_STORE_URL_VOLDT_NORWAY`). **Preview:** if the PR source branch is **`staging-<alias>`** or **`live-<alias>`**, only that store is used. Otherwise, with **multiple** stores in `climaybe.config.json`, **pr-update** publishes the preview theme to **every** store (each must have secrets) and **pr-close** cleans that PR’s preview themes on **all** stores. For a **single** store in config, behavior matches the default-store case. Optional **cleanup-orphan-preview-themes** (weekly + manual) removes stale `-PR<n>` themes when PR `n` is no longer open.
 
 ## Directory Structure (Multi-store)
 

package/bin/version.txt

@@ -1 +1 @@
-3.4.1
+3.4.3

package/package.json

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

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

@@ -26,10 +26,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve preview store targets from base branch
+      - name: Resolve preview store targets from source branch
         id: resolve
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
+          HEAD_REF: ${{ github.event.pull_request.head.ref }}
         run: |
           node <<'NODE' >>"$GITHUB_OUTPUT"
           const fs = require('fs');
@@ -37,9 +38,11 @@ jobs:
           const stores = cfg?.stores || {};
           const keys = Object.keys(stores);
           const baseRef = process.env.BASE_REF || '';
+          const headRef = process.env.HEAD_REF || '';
+          const branchRef = headRef || baseRef;
           const isMulti = keys.length > 1;
           const isStagingLive =
-            baseRef && (/^staging-/.test(baseRef) || /^live-/.test(baseRef));
+            branchRef && (/^staging-/.test(branchRef) || /^live-/.test(branchRef));
 
           const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
           const normalizeDomain = (v) =>
@@ -52,7 +55,7 @@ jobs:
           if (isMulti && !isStagingLive) {
             targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
           } else if (isStagingLive) {
-            let a = baseRef.replace(/^staging-/, '').replace(/^live-/, '');
+            let a = branchRef.replace(/^staging-/, '').replace(/^live-/, '');
             targets = [{ alias: a, alias_secret: aliasToSecret(a) }];
           } else {
             const defaultStoreNorm = normalizeDomain(cfg?.default_store);

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

@@ -51,10 +51,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Resolve preview store targets from base branch
+      - name: Resolve preview store targets from source branch
         id: resolve
         env:
           BASE_REF: ${{ github.event.pull_request.base.ref }}
+          HEAD_REF: ${{ github.event.pull_request.head.ref }}
         run: |
           node <<'NODE' >>"$GITHUB_OUTPUT"
           const fs = require('fs');
@@ -62,9 +63,11 @@ jobs:
           const stores = cfg?.stores || {};
           const keys = Object.keys(stores);
           const baseRef = process.env.BASE_REF || '';
+          const headRef = process.env.HEAD_REF || '';
+          const branchRef = headRef || baseRef;
           const isMulti = keys.length > 1;
           const isStagingLive =
-            baseRef && (/^staging-/.test(baseRef) || /^live-/.test(baseRef));
+            branchRef && (/^staging-/.test(branchRef) || /^live-/.test(branchRef));
 
           const aliasToSecret = (a) => String(a).toUpperCase().replace(/-/g, '_');
           const normalizeDomain = (v) =>
@@ -77,7 +80,7 @@ jobs:
           if (isMulti && !isStagingLive) {
             targets = keys.map((alias) => ({ alias, alias_secret: aliasToSecret(alias) }));
           } else if (isStagingLive) {
-            let a = baseRef.replace(/^staging-/, '').replace(/^live-/, '');
+            let a = branchRef.replace(/^staging-/, '').replace(/^live-/, '');
             targets = [{ alias: a, alias_secret: aliasToSecret(a) }];
           } else {
             const defaultStoreNorm = normalizeDomain(cfg?.default_store);
@@ -135,7 +138,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: