climaybe 2.4.0 → 2.4.2

package/README.md

@@ -205,17 +205,17 @@ Direct pushes to `staging-<store>` or `live-<store>` are automatically synced ba
 |----------|---------|-------------|
 | `release-pr-check.yml` | PR from `staging` to `main` | Finds latest tag on main, AI changelog to PR head, creates pre-release patch tag (e.g. v3.1.13) to lock state; posts changelog comment |
 | `post-merge-tag.yml` | Push to `main` (merged PR) | Staging→main only: minor bump from latest tag (e.g. v3.1.13 → v3.2.0). No version in PR title |
-| `nightly-hotfix.yml` | Cron 02:00 US Eastern | Collects commits since latest tag (incl. hotfix backports), AI changelog, patch bump and tag |
+| `nightly-hotfix.yml` | Cron 02:00 US Eastern | Collects commits since latest tag (incl. hotfix backports), ignores no-op/empty-tree commits, generates AI changelog, patch bump and tag |
 
 ### Multi-store (additional)
 
 | 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: 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. |
+| `main-to-staging-stores.yml` (main-to-staging-&lt;store&gt;) | Push to `main` | Merges main into each `staging-<alias>`; root JSONs ignored. Skips no-op sync when branch tree already matches main. 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-*) |
-| `multistore-hotfix-to-main.yml` | Push to `staging-*` or `live-*` (and after root-to-stores) | Merges store branch into main (no PR). Skips when push is a merge from main (avoids loop) |
+| `multistore-hotfix-to-main.yml` | Push to `staging-*` or `live-*` (and after root-to-stores) | Merges store branch into main (no PR). Skips when push is a merge from main (avoids loop) and skips no-op backports when source and main trees are identical |
 
 ### Optional preview + cleanup package
 
@@ -268,7 +268,7 @@ You can install/update this later with:
 - **Version format**: Always three-part (e.g. `v3.2.0`). No version in code or PR title; the system infers from tags.
 - **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).
+- **Non-staging to main** (hotfix backports, direct commits): **Patch** bump only, via **nightly workflow** at 02:00 US Eastern (not at commit time). No-op/empty-tree commits are ignored.
 - **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/version.txt

@@ -1 +1 @@
-2.4.0
+2.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "2.4.0",
+  "version": "2.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/build/build-scripts.js

@@ -1,11 +1,15 @@
 const fs = require('fs');
 const path = require('path');
-const ROOT_DIR = process.cwd();
+const CLIMAYBE_DIR = process.cwd();
+const SCRIPTS_DIR = path.join(CLIMAYBE_DIR, '_scripts');
 
 function extractImports(content) {
   const imports = [];
-  const fromImportRegex = /(^|\n)\s*import\s+[\s\S]*?\s+from\s+['"]([^'"]+)['"]\s*;?/g;
-  const sideEffectImportRegex = /(^|\n)\s*import\s+['"]([^'"]+)['"]\s*;?/g;
+  // Supports compact imports (import{a}from"./x"), multiline forms,
+  // and import attributes (with { type: "json" }).
+  const fromImportRegex =
+    /(^|\n)\s*import(?:\s+type)?\s*[\s\S]*?\s*\bfrom\b\s*['"]([^'"]+)['"](?:\s+with\s*\{[\s\S]*?\})?\s*;?/g;
+  const sideEffectImportRegex = /(^|\n)\s*import\s*['"]([^'"]+)['"](?:\s+with\s*\{[\s\S]*?\})?\s*;?/g;
   let match;
 
   while ((match = fromImportRegex.exec(content)) !== null) {
@@ -18,6 +22,27 @@ function extractImports(content) {
   return imports;
 }
 
+function stripModuleSyntax(content) {
+  // Remove import statements (including multiline/compact forms and import attributes).
+  let cleaned = content.replace(
+    /(^|\n)\s*import(?:\s+type)?\s*[\s\S]*?\s*\bfrom\b\s*['"][^'"]+['"](?:\s+with\s*\{[\s\S]*?\})?\s*;?/g,
+    '$1'
+  );
+  cleaned = cleaned.replace(/(^|\n)\s*import\s*['"][^'"]+['"](?:\s+with\s*\{[\s\S]*?\})?\s*;?/g, '$1');
+
+  // Fallback: ensure no standalone import declarations leak into bundle output.
+  cleaned = cleaned.replace(/^[ \t]*import\s*['"][^'"]+['"][ \t]*;?[ \t]*$/gm, '');
+  cleaned = cleaned.replace(
+    /^[ \t]*import(?:\s+type)?[ \t]*[^;\n\r]*\bfrom\b[ \t]*['"][^'"]+['"][ \t]*(?:with[ \t]*\{[^}\n\r]*\})?[ \t]*;?[ \t]*$/gm,
+    ''
+  );
+
+  cleaned = cleaned.replace(/^\s*export\s+default\s+/gm, '');
+  cleaned = cleaned.replace(/^\s*export\s+\{[^}]*\}\s*;?\s*$/gm, '');
+  cleaned = cleaned.replace(/^\s*export\s+(?=(const|let|var|function|class)\b)/gm, '');
+  return cleaned;
+}
+
 function processScriptFile(filePath, processedFiles = new Set()) {
   if (processedFiles.has(filePath)) {
     return '';
@@ -25,7 +50,7 @@ function processScriptFile(filePath, processedFiles = new Set()) {
 
   processedFiles.add(filePath);
 
-  const fullPath = path.join(ROOT_DIR, '_scripts', filePath);
+  const fullPath = path.join(SCRIPTS_DIR, filePath);
 
   if (!fs.existsSync(fullPath)) {
     console.warn(`Warning: File ${filePath} not found`);
@@ -40,12 +65,7 @@ function processScriptFile(filePath, processedFiles = new Set()) {
     importedContent += processScriptFile(importPath, processedFiles);
   }
 
-  // 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, '');
+  content = stripModuleSyntax(content);
 
   if (process.env.NODE_ENV === 'production') {
     content = content.replace(/\/\*\*[\s\S]*?\*\//g, '');
@@ -61,12 +81,13 @@ function buildScripts() {
   try {
     if (global.gc) global.gc();
 
-    const mainPath = path.join(ROOT_DIR, '_scripts', 'main.js');
+    const mainPath = path.join(SCRIPTS_DIR, 'main.js');
     fs.readFileSync(mainPath, 'utf8');
 
     const processedFiles = new Set();
-    const finalContent = processScriptFile('main.js', processedFiles);
-    const outputPath = path.join(ROOT_DIR, 'assets', 'index.js');
+    let finalContent = processScriptFile('main.js', processedFiles);
+    finalContent = stripModuleSyntax(finalContent);
+    const outputPath = path.join(CLIMAYBE_DIR, 'assets', 'index.js');
     fs.writeFileSync(outputPath, finalContent.trim() + '\n');
 
     const fileCount = processedFiles.size;
@@ -83,4 +104,4 @@ if (require.main === module) {
   buildScripts();
 }
 
-module.exports = { buildScripts };
+module.exports = { buildScripts };

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

@@ -133,8 +133,14 @@ jobs:
 
           git fetch origin "$BRANCH"
           git checkout "$BRANCH"
-          git merge origin/main --no-ff -m "Sync main → $BRANCH" || true
-          if [ $? -ne 0 ]; then
+          BRANCH_TREE=$(git rev-parse HEAD^{tree} 2>/dev/null || echo "")
+          MAIN_TREE=$(git rev-parse origin/main^{tree} 2>/dev/null || echo "")
+          if [ -n "$BRANCH_TREE" ] && [ "$BRANCH_TREE" = "$MAIN_TREE" ]; then
+            echo "$BRANCH is already in sync with main (no-op), skipping."
+            exit 0
+          fi
+
+          if ! git merge origin/main --no-ff -m "Sync main → $BRANCH"; then
             echo "Merge had conflicts; aborting. Manual resolution may be needed."
             git merge --abort 2>/dev/null || true
             exit 1

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

@@ -103,6 +103,15 @@ jobs:
           fi
 
           if [ -n "$COMMITS" ]; 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 "")
+            if [ -n "$MAIN_TREE" ] && [ "$MAIN_TREE" = "$SOURCE_TREE" ]; then
+              echo "needs_backport=false" >> $GITHUB_OUTPUT
+              echo "No-op backport: origin/main and origin/$SOURCE trees are identical."
+              exit 0
+            fi
+
             echo "needs_backport=true" >> $GITHUB_OUTPUT
             echo "is_default_store=$([ -n "$DEFAULT_ALIAS" ] && [ "$SOURCE_ALIAS" = "$DEFAULT_ALIAS" ] && echo true || echo false)" >> $GITHUB_OUTPUT
             echo "Commits to sync to main:"

package/src/workflows/single/nightly-hotfix.yml

@@ -90,6 +90,12 @@ jobs:
           while IFS=$'\t' read -r SHA SUBJECT; do
             [ -z "$SHA" ] && continue
 
+            # Ignore metadata-only commits (e.g. no-op merges) so they do not trigger bumps.
+            if git diff-tree --quiet --no-commit-id -r "$SHA"; then
+              echo "Skipping no-op commit (empty tree diff): $SHA"
+              continue
+            fi
+
             HEAD_REF=$(gh api \
               repos/${{ github.repository }}/commits/$SHA/pulls \
               --jq '.[0].head.ref // ""' 2>/dev/null || true)