climaybe 2.2.3 → 2.2.5

package/README.md

@@ -209,7 +209,7 @@ Direct pushes to `staging-<store>` or `live-<store>` are automatically synced ba
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
-| `main-to-staging-stores.yml` (main-to-staging-&lt;store&gt;) | Push to `main` | Merges main into each `staging-<alias>`; root JSONs ignored. For hotfix-backport, skips the store that sent the hotfix; other stores get the merge. Skips only on pure store-sync. |
+| `main-to-staging-stores.yml` (main-to-staging-&lt;store&gt;) | Push to `main` | Merges main into each `staging-<alias>`; root JSONs ignored. For hotfix-backport: if source is `staging-<alias>`, that same staging branch is skipped; if source is `live-<alias>`, `staging-<alias>` is also synced. Skips only on pure store-sync. |
 | `stores-to-root.yml` | Push to `staging-*` | From main merge: stores→root. From elsewhere (e.g. Shopify): root→stores |
 | `pr-to-live.yml` | After stores-to-root | Opens PR from `staging-<alias>` to `live-<alias>` |
 | `root-to-stores.yml` | Push to `live-*` | From main merge: stores→root. From elsewhere: root→stores (same as stores-to-root on staging-*) |
@@ -268,7 +268,7 @@ You can install/update this later with:
 - **No tags yet?** The system uses `theme_version` from `config/settings_schema.json` (`theme_info`), creates that tag on main (e.g. `v1.0.0`), and continues from there.
 - **Staging → main**: On PR, a pre-release patch tag (e.g. v3.1.13) locks the current minor line; on merge, **minor** bump (e.g. v3.1.13 → v3.2.0).
 - **Non-staging to main** (hotfix backports, direct commits): **Patch** bump only, via **nightly workflow** at 02:00 US Eastern (not at commit time).
-- **Version bump runs only on main** (post-merge-tag and nightly-hotfix). Main-to-staging-stores merges main into each `staging-<alias>` on every push (version bumps and hotfixes). When the push is a hotfix from one store (e.g. live-norway), that store’s staging branch is skipped; other stores’ staging branches still get the merge.
+- **Version bump runs only on main** (post-merge-tag and nightly-hotfix). Main-to-staging-stores merges main into each `staging-<alias>` on every push (version bumps and hotfixes). For hotfix-backport, only a `staging-<alias> -> main` source skips syncing back to the same staging branch; a `live-<alias> -> main` source still syncs into `staging-<alias>`.
 - Version bumps update `config/settings_schema.json` and, when present, `package.json` `version`.
 - **Safety**: The version-bump workflow fails if the new tag would not be **strictly higher** than the latest merged release tag (semver), so the release line cannot step backward.
 

package/bin/cli.js

@@ -1,25 +1,22 @@
 #!/usr/bin/env node
 
-import { readFileSync, existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { run } from '../src/index.js';
+import { resolveCliVersion } from '../src/lib/cli-version.js';
 import { maybeOfferCliUpdate } from '../src/lib/update-notifier.js';
 
 const require = createRequire(import.meta.url);
 const binDir = dirname(fileURLToPath(import.meta.url));
 const packageDir = join(binDir, '..');
 
-// Prefer version baked at publish (bin/version.txt) so the running binary always reports its own version
-const versionFile = join(binDir, 'version.txt');
-let version;
-if (existsSync(versionFile)) {
-  version = readFileSync(versionFile, 'utf8').trim();
-} else {
-  version = require(join(packageDir, 'package.json')).version;
-}
-
-const packageName = require(join(packageDir, 'package.json')).name || 'climaybe';
+const pkg = require(join(packageDir, 'package.json'));
+const version = resolveCliVersion({
+  packageDir,
+  binDir,
+  packageVersion: pkg.version,
+});
+const packageName = pkg.name || 'climaybe';
 await maybeOfferCliUpdate({ packageName, currentVersion: version, packageDir });
 run(process.argv, version, packageDir);

package/bin/version.txt

@@ -1 +1 @@
-2.2.3
+2.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Shopify CLI — theme CI/CD (workflows, branches, stores) and app repo helpers; also: commitlint and Cursor rules/skills",
   "type": "module",
   "bin": {

package/src/lib/cli-version.js

@@ -0,0 +1,20 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+/**
+ * Resolve the version shown by the CLI.
+ * - In dev checkouts (e.g. npm link), prefer package.json.
+ * - In packaged installs, prefer bin/version.txt and fallback to package.json.
+ */
+export function resolveCliVersion({ packageDir, binDir, packageVersion }) {
+  const devCheckout = existsSync(join(packageDir, '.git'));
+  if (devCheckout) return packageVersion;
+
+  const versionFile = join(binDir, 'version.txt');
+  if (existsSync(versionFile)) {
+    const baked = readFileSync(versionFile, 'utf8').trim();
+    if (baked) return baked;
+  }
+
+  return packageVersion;
+}

package/src/workflows/build/build-scripts.js

@@ -3,12 +3,16 @@ const path = require('path');
 const ROOT_DIR = process.cwd();
 
 function extractImports(content) {
-  const importRegex = /^\s*import\s+(?:[^'"\n;]+?\s+from\s+)?['"]([^'"]+)['"]\s*;?\s*$/gm;
   const imports = [];
+  const fromImportRegex = /(^|\n)\s*import\s+[\s\S]*?\s+from\s+['"]([^'"]+)['"]\s*;?/g;
+  const sideEffectImportRegex = /(^|\n)\s*import\s+['"]([^'"]+)['"]\s*;?/g;
   let match;
 
-  while ((match = importRegex.exec(content)) !== null) {
-    imports.push(match[1]);
+  while ((match = fromImportRegex.exec(content)) !== null) {
+    imports.push(match[2]);
+  }
+  while ((match = sideEffectImportRegex.exec(content)) !== null) {
+    imports.push(match[2]);
   }
 
   return imports;
@@ -36,7 +40,12 @@ function processScriptFile(filePath, processedFiles = new Set()) {
     importedContent += processScriptFile(importPath, processedFiles);
   }
 
-  content = content.replace(/^\s*import\s+(?:[^'"\n;]+?\s+from\s+)?['"][^'"]+['"]\s*;?\s*$/gm, '');
+  // Remove import statements (including multiline "import { ... } from '...'" forms).
+  content = content.replace(/(^|\n)\s*import\s+[\s\S]*?\s+from\s+['"][^'"]+['"]\s*;?/g, '$1');
+  content = content.replace(/(^|\n)\s*import\s+['"][^'"]+['"]\s*;?/g, '$1');
+  content = content.replace(/^\s*export\s+default\s+/gm, '');
+  content = content.replace(/^\s*export\s+\{[^}]*\}\s*;?\s*$/gm, '');
+  content = content.replace(/^\s*export\s+(?=(const|let|var|function|class)\b)/gm, '');
 
   if (process.env.NODE_ENV === 'production') {
     content = content.replace(/\/\*\*[\s\S]*?\*\//g, '');

package/src/workflows/multi/main-to-staging-stores.yml

@@ -4,7 +4,9 @@
 # merge brings main in but we immediately restore root from stores/<alias>/ so store-specific data is kept.
 # Runs on every push to main except pure store-sync commits ([stores-to-root], [root-to-stores]), so that:
 # - Version-bump commits: staging-<alias> get the new version.
-# - Hotfix backports (live or staging-<alias> → main): other staging-<alias> get those changes; the store that sent the hotfix is skipped (no need to merge back to the same branch).
+# - Hotfix backports:
+#   - staging-<alias> → main: skip syncing back into the same staging-<alias> (already has the change).
+#   - live-<alias> → main: sync into staging-<alias> too (so staging gets the live hotfix).
 #
 # Also runs when Post-Merge Tag or Nightly Hotfix Tag complete: version-bump pushes with GITHUB_TOKEN,
 # which does not trigger push-based workflows, so we explicitly run sync after those workflows finish.
@@ -25,7 +27,7 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  # Gate: skip only pure store-sync commits. When hotfix-backport, extract source branch alias so we skip merging back into that same store.
+  # Gate: skip only pure store-sync commits. For hotfix-backport, skip syncing back only when source was staging-<alias>.
   # When triggered by workflow_run (version-bump finished), run sync if the workflow succeeded.
   gate:
     runs-on: ubuntu-latest
@@ -33,7 +35,7 @@ jobs:
     if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
     outputs:
       should_run: ${{ steps.check.outputs.should_run }}
-      hotfix_source_alias: ${{ steps.check.outputs.hotfix_source_alias }}
+      hotfix_skip_alias: ${{ steps.check.outputs.hotfix_skip_alias }}
     steps:
       - name: Check commit message and hotfix source
         id: check
@@ -41,7 +43,7 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_run" ]; then
             echo "Triggered by workflow_run (version-bump finished); syncing main to staging."
             echo "should_run=true" >> $GITHUB_OUTPUT
-            echo "hotfix_source_alias=" >> $GITHUB_OUTPUT
+            echo "hotfix_skip_alias=" >> $GITHUB_OUTPUT
             exit 0
           fi
 
@@ -50,22 +52,21 @@ jobs:
           if echo "$COMMIT_MSG" | grep -qE "\[skip-store-sync\]|\[stores-to-root\]|\[root-to-stores\]"; then
             echo "Skipping — store sync commit (avoid loop)"
             echo "should_run=false" >> $GITHUB_OUTPUT
-            echo "hotfix_source_alias=" >> $GITHUB_OUTPUT
+            echo "hotfix_skip_alias=" >> $GITHUB_OUTPUT
             exit 0
           fi
 
           echo "should_run=true" >> $GITHUB_OUTPUT
 
-          # If hotfix-backport, extract source branch alias (e.g. staging-norway or live-norway → norway) so we skip that store in sync
-          HOTFIX_SOURCE_ALIAS=""
+          # If hotfix-backport came from staging-<alias>, skip syncing back to that same staging branch.
+          HOTFIX_SKIP_ALIAS=""
           if echo "$COMMIT_MSG" | grep -q "\[hotfix-backport\]"; then
             SOURCE_BRANCH=$(echo "$COMMIT_MSG" | sed -n 's/.*Merge \([^ ]*\) into main.*/\1/p' | head -1)
-            if [ -n "$SOURCE_BRANCH" ]; then
-              HOTFIX_SOURCE_ALIAS="${SOURCE_BRANCH#staging-}"
-              HOTFIX_SOURCE_ALIAS="${HOTFIX_SOURCE_ALIAS#live-}"
+            if [[ -n "$SOURCE_BRANCH" && "$SOURCE_BRANCH" == staging-* ]]; then
+              HOTFIX_SKIP_ALIAS="${SOURCE_BRANCH#staging-}"
             fi
           fi
-          echo "hotfix_source_alias=$HOTFIX_SOURCE_ALIAS" >> $GITHUB_OUTPUT
+          echo "hotfix_skip_alias=$HOTFIX_SKIP_ALIAS" >> $GITHUB_OUTPUT
 
   # Read store list from package.json
   config:
@@ -88,7 +89,8 @@ jobs:
           echo "stores=$STORES" >> $GITHUB_OUTPUT
           echo "Store aliases: $STORES"
 
-  # Merge main into each staging-<alias>; root JSONs ignored (restored from stores/<alias>/). Skip the store that sent the hotfix (no need to merge back).
+  # Merge main into each staging-<alias>; root JSONs ignored (restored from stores/<alias>/).
+  # Skip only staging-origin hotfix source branch (no need to merge back to same staging branch).
   sync:
     needs: [gate, config]
     if: needs.gate.outputs.should_run == 'true'
@@ -103,7 +105,7 @@ jobs:
       actions: write
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      HOTFIX_SOURCE_ALIAS: ${{ needs.gate.outputs.hotfix_source_alias }}
+      HOTFIX_SKIP_ALIAS: ${{ needs.gate.outputs.hotfix_skip_alias }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -116,8 +118,8 @@ jobs:
           ALIAS="${{ matrix.store }}"
           STORE_DIR="stores/${ALIAS}"
 
-          if [ -n "$HOTFIX_SOURCE_ALIAS" ] && [ "$HOTFIX_SOURCE_ALIAS" = "$ALIAS" ]; then
-            echo "Hotfix came from staging-$ALIAS or live-$ALIAS, skipping (no need to merge back to same store)."
+          if [ -n "$HOTFIX_SKIP_ALIAS" ] && [ "$HOTFIX_SKIP_ALIAS" = "$ALIAS" ]; then
+            echo "Hotfix came from staging-$ALIAS, skipping (no need to merge back to same staging branch)."
             exit 0
           fi