climaybe 3.0.6 → 3.0.8

package/README.md

@@ -108,7 +108,7 @@ If no alias is given, syncs to the default store.
 
 ### `climaybe ensure-branches` / `climaybe theme ensure-branches`
 
-Create missing `staging` and per-store branches (`staging-<alias>`, `live-<alias>`) from your current branch (usually `main`). Use when the repo only has `main` (e.g. after a fresh clone) so the main → staging-&lt;store&gt; sync can run.
+Create missing branches from your current branch (usually `main`). In single-store mode, this creates `staging` only. In multi-store mode, this creates `staging` plus per-store branches (`staging-<alias>`, `live-<alias>`). Use when the repo only has `main` (e.g. after a fresh clone) so the configured sync flow can run.
 
 ```bash
 npx climaybe ensure-branches
@@ -242,8 +242,11 @@ Enabled via `climaybe init` prompt (`Enable build + Lighthouse workflows?`; defa
 When enabled, builds are **resilient**:
 - If `_scripts/*.js` or `_styles/main.css` are missing, the build workflow **skips** those steps and continues.
 - `init` may offer to create entrypoints; **default answer is No**.
+- Script bundling preserves comments/spacing and emits bundles only for root entry files (files imported by other top-level `_scripts/*.js` are inlined, not emitted separately).
+- On `live-<alias>` branches only, script bundles are minified and overwrite `assets/*.js`; `main` and `staging-*` keep readable built JS.
+- Live minified `assets/*` changes are intentionally excluded from hotfix backports to `main` (no branch-specific `.gitignore` split required).
 
-Build workflows run bundling via `npx -y climaybe@latest build-scripts` and Tailwind via `npx -y climaybe@latest build` (no per-repo build script is installed).
+Build workflows install deps with `npm ci` and run `npx --no-install climaybe build-scripts` plus `npx --no-install climaybe build`, so CI uses lockfile-pinned versions (no `@latest` drift).
 
 | Workflow | Trigger | What it does |
 |----------|---------|-------------|
@@ -258,6 +261,9 @@ dev config defaults (`.theme-check.yml`, `.shopifyignore`, `.prettierrc`,
 `.lighthouserc.js`), writes `climaybe.config.json`, appends a managed `.gitignore` block, and optionally adds
 `.vscode/tasks.json` (default: yes) wired to run `climaybe` dev commands.
 
+Local serve commands keep Theme Check disabled by default for faster startup. Enable it explicitly with
+`climaybe serve --theme-check` or `climaybe serve:assets --theme-check`.
+
 You can create optional build entrypoints later with:
 
 `climaybe create-entrypoints`

package/bin/version.txt

@@ -1 +1 @@
-3.0.6
+3.0.8

package/package.json

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

package/src/commands/build-scripts.js

@@ -2,19 +2,21 @@ import pc from 'picocolors';
 import { requireThemeProject } from '../lib/theme-guard.js';
 import { buildScripts } from '../lib/build-scripts.js';
 
-export async function buildScriptsCommand() {
+export async function buildScriptsCommand(opts = {}) {
   console.log(pc.bold('\n  climaybe — Build scripts\n'));
   if (!requireThemeProject()) return;
 
   try {
+    const minify = opts.minify === true;
     if (global.gc) global.gc();
-    const { bundles } = buildScripts({ cwd: process.cwd() });
+    const { bundles } = buildScripts({ cwd: process.cwd(), minify });
     if (!bundles || bundles.length === 0) {
       console.log(pc.yellow('  No _scripts/*.js entrypoints found; nothing to build.'));
       return;
     }
     const totalFiles = bundles.reduce((sum, b) => sum + (b.fileCount || 0), 0);
-    console.log(pc.green(`  Scripts built (${bundles.length} bundle(s), ${totalFiles} files total)`));
+    const mode = minify ? 'minified' : 'readable';
+    console.log(pc.green(`  Scripts built (${bundles.length} bundle(s), ${totalFiles} files total, ${mode})`));
     for (const b of bundles) {
       console.log(pc.dim(`  - ${b.entryFile} → ${b.outputPath}`));
     }

package/src/commands/ensure-branches.js

@@ -11,8 +11,8 @@ import {
 } from '../lib/git.js';
 
 /**
- * Create missing staging and per-store branches from current HEAD.
- * Use when the repo only has main (e.g. after clone) so the main → staging-<store> sync can run.
+ * Create missing staging (single-store) or staging + per-store branches (multi-store) from current HEAD.
+ * Use when the repo only has main (e.g. after clone) so the mode-appropriate sync flow can run.
  */
 export async function ensureBranchesCommand() {
   console.log(pc.bold('\n  climaybe — Ensure Branches\n'));
@@ -39,9 +39,11 @@ export async function ensureBranchesCommand() {
 
   ensureStagingBranch();
   const branchesToPush = ['staging'];
-  for (const alias of aliases) {
-    createStoreBranches(alias);
-    branchesToPush.push(`staging-${alias}`, `live-${alias}`);
+  if (mode === 'multi') {
+    for (const alias of aliases) {
+      createStoreBranches(alias);
+      branchesToPush.push(`staging-${alias}`, `live-${alias}`);
+    }
   }
 
   console.log(pc.bold(pc.green('\n  Branches ensured.\n')));

package/src/commands/init.js

@@ -125,7 +125,6 @@ async function runInitFlow() {
   // 5. Create branches
   if (mode === 'single') {
     ensureStagingBranch();
-    createStoreBranches(stores[0].alias);
   } else {
     // Multi-store: staging branch + per-store branches
     ensureStagingBranch();
@@ -181,7 +180,6 @@ async function runInitFlow() {
 
   if (mode === 'single') {
     console.log(pc.dim('  Branches: main, staging'));
-    console.log(pc.dim(`    staging-${stores[0].alias}, live-${stores[0].alias}`));
     console.log(pc.dim('  Workflow: staging → main with versioning + nightly hotfix tagging'));
   } else {
     console.log(pc.dim('  Branches: main, staging'));

package/src/index.js

@@ -61,20 +61,24 @@ function registerThemeCommands(cmd) {
 
   cmd
     .command('serve')
-    .description('Run local theme dev (Shopify + assets + Theme Check)')
-    .option('--no-theme-check', 'Disable Theme Check watcher')
-    .action((opts) => serveAll({ includeThemeCheck: opts.themeCheck !== false }));
+    .description('Run local theme dev (Shopify + assets; Theme Check off by default)')
+    .option('--theme-check', 'Enable Theme Check watcher')
+    .action((opts) => serveAll({ includeThemeCheck: opts.themeCheck === true }));
   cmd.command('serve:shopify').description('Run Shopify theme dev server').action(() => serveShopify());
   cmd
     .command('serve:assets')
-    .description('Run assets watch (Tailwind + scripts + Theme Check)')
-    .option('--no-theme-check', 'Disable Theme Check watcher')
-    .action((opts) => serveAssets({ includeThemeCheck: opts.themeCheck !== false }));
+    .description('Run assets watch (Tailwind + scripts; Theme Check off by default)')
+    .option('--theme-check', 'Enable Theme Check watcher')
+    .action((opts) => serveAssets({ includeThemeCheck: opts.themeCheck === true }));
 
   cmd.command('lint').description('Run theme linting (liquid, js, css)').action(() => lintAll());
 
   cmd.command('build').description('Build assets (Tailwind + scripts build)').action(() => buildAll());
-  cmd.command('build-scripts').description('Build _scripts → assets/index.js').action(buildScriptsCommand);
+  cmd
+    .command('build-scripts')
+    .description('Build _scripts → assets/index.js')
+    .option('--minify', 'Minify output bundles')
+    .action(buildScriptsCommand);
   cmd
     .command('create-entrypoints')
     .description('Create _scripts/main.js and _styles/main.css (optional)')

package/src/lib/build-scripts.js

@@ -41,7 +41,24 @@ function stripModuleSyntax(content) {
   return cleaned;
 }
 
-function processScriptFile({ scriptsDir, filePath, processedFiles }) {
+function minifyScriptContent(content) {
+  let minified = content;
+  // Strip block comments first so line-level processing is simpler.
+  minified = minified.replace(/\/\*[\s\S]*?\*\//g, '');
+  // Strip line comments and trim lines.
+  minified = minified
+    .split('\n')
+    .map((line) => line.replace(/\/\/.*$/g, '').trim())
+    .filter(Boolean)
+    .join('\n');
+  // Collapse excessive whitespace around common tokens.
+  minified = minified.replace(/\s*([{}();,:=+\-*/<>[\]])\s*/g, '$1');
+  // Keep one space where token concatenation could break identifiers.
+  minified = minified.replace(/\b(const|let|var|function|class|return|if|for|while|switch|case|new)\s+/g, '$1 ');
+  return minified;
+}
+
+function processScriptFile({ scriptsDir, filePath, processedFiles, minify = false }) {
   if (processedFiles.has(filePath)) return '';
   processedFiles.add(filePath);
 
@@ -61,17 +78,11 @@ function processScriptFile({ scriptsDir, filePath, processedFiles }) {
   for (const importPath of imports) {
     const resolvedImport = resolveImportPath(filePath, importPath);
     if (!resolvedImport) continue;
-    importedContent += processScriptFile({ scriptsDir, filePath: resolvedImport, processedFiles });
+    importedContent += processScriptFile({ scriptsDir, filePath: resolvedImport, processedFiles, minify });
   }
 
   content = stripModuleSyntax(content);
-
-  if (process.env.NODE_ENV === 'production') {
-    content = content.replace(/\/\*\*[\s\S]*?\*\//g, '');
-    content = content.replace(/^\s*\*.*$/gm, '');
-    content = content.replace(/console\.(log|warn|error)\([^)]*\);?\s*/g, '');
-    content = content.replace(/^\s*\n/gm, '');
-  }
+  if (minify) content = minifyScriptContent(content);
 
   return importedContent + '\n' + content;
 }
@@ -115,7 +126,7 @@ function outputNameForEntrypoint(entryFile) {
   return basename(entryFile);
 }
 
-function buildSingleEntrypoint({ cwd, entryFile }) {
+function buildSingleEntrypoint({ cwd, entryFile, minify = false }) {
   const scriptsDir = join(cwd, '_scripts');
   const entryPath = join(scriptsDir, entryFile);
   if (!existsSync(entryPath)) {
@@ -123,8 +134,9 @@ function buildSingleEntrypoint({ cwd, entryFile }) {
   }
 
   const processedFiles = new Set();
-  let finalContent = processScriptFile({ scriptsDir, filePath: entryFile, processedFiles });
+  let finalContent = processScriptFile({ scriptsDir, filePath: entryFile, processedFiles, minify });
   finalContent = stripModuleSyntax(finalContent);
+  if (minify) finalContent = minifyScriptContent(finalContent);
 
   const assetsDir = join(cwd, 'assets');
   mkdirSync(assetsDir, { recursive: true });
@@ -136,18 +148,28 @@ function buildSingleEntrypoint({ cwd, entryFile }) {
   return { entryFile, fileCount: processedFiles.size, outputPath };
 }
 
-export function buildScripts({ cwd = process.cwd(), entry = null } = {}) {
+export function buildScripts({ cwd = process.cwd(), entry = null, minify = false } = {}) {
   const scriptsDir = join(cwd, '_scripts');
   let entrypoints = entry ? [entry.endsWith('.js') ? entry : `${entry}.js`] : listTopLevelEntrypoints(scriptsDir);
-  if (!entry && entrypoints.includes('main.js')) {
-    const importedByMain = collectImportedFiles({ scriptsDir, entryFile: 'main.js' });
-    importedByMain.delete('main.js');
-    entrypoints = entrypoints.filter((ep) => ep === 'main.js' || !importedByMain.has(ep));
+  if (!entry && entrypoints.length > 1) {
+    // Emit only root top-level scripts. If one top-level file is imported by another
+    // top-level file, it is bundled into the importer and should not be emitted alone.
+    const importedByTopLevel = new Set();
+    for (const ep of entrypoints) {
+      const imported = collectImportedFiles({ scriptsDir, entryFile: ep });
+      imported.delete(ep);
+      for (const file of imported) importedByTopLevel.add(file);
+    }
+
+    const rootEntrypoints = entrypoints.filter((ep) => !importedByTopLevel.has(ep));
+    if (rootEntrypoints.length > 0) {
+      entrypoints = rootEntrypoints;
+    }
   }
   if (entrypoints.length === 0) {
     return { bundles: [] };
   }
-  const bundles = entrypoints.map((entryFile) => buildSingleEntrypoint({ cwd, entryFile }));
+  const bundles = entrypoints.map((entryFile) => buildSingleEntrypoint({ cwd, entryFile, minify }));
   return { bundles };
 }
 

package/src/lib/dev-runtime.js

@@ -217,7 +217,7 @@ export function serveShopify({ cwd = process.cwd() } = {}) {
   return runShopify(args, { cwd, name: 'shopify' });
 }
 
-export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
+export function serveAssets({ cwd = process.cwd(), includeThemeCheck = false } = {}) {
   printServeStartupHeader();
   const env = { ...process.env, NODE_ENV: 'production' };
   const styleEntrypoint = join(cwd, '_styles', 'main.css');
@@ -312,7 +312,7 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
   return { tailwind, devMcp, scriptsWatch, themeCheckWatch, cleanup };
 }
 
-export function serveAll({ cwd = process.cwd(), includeThemeCheck = true } = {}) {
+export function serveAll({ cwd = process.cwd(), includeThemeCheck = false } = {}) {
   // Start assets first, then bring up Shopify after a short delay.
   const assets = serveAssets({ cwd, includeThemeCheck });
   let shopify = null;

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

@@ -67,13 +67,6 @@ function processScriptFile(filePath, processedFiles = new Set()) {
 
   content = stripModuleSyntax(content);
 
-  if (process.env.NODE_ENV === 'production') {
-    content = content.replace(/\/\*\*[\s\S]*?\*\//g, '');
-    content = content.replace(/^\s*\*.*$/gm, '');
-    content = content.replace(/console\.(log|warn|error)\([^)]*\);?\s*/g, '');
-    content = content.replace(/^\s*\n/gm, '');
-  }
-
   return importedContent + '\n' + content;
 }
 

package/src/workflows/build/reusable-build.yml

@@ -23,6 +23,14 @@ jobs:
         with:
           node-version: "24"
 
+      - name: Install dependencies from lockfile
+        run: |
+          if [ ! -f "package-lock.json" ]; then
+            echo "package-lock.json is required for deterministic build workflow installs."
+            exit 1
+          fi
+          npm ci
+
       - name: Detect build entrypoints
         id: detect
         run: |
@@ -36,16 +44,27 @@ jobs:
           fi
           echo "has_scripts=$HAS_SCRIPTS" >> $GITHUB_OUTPUT
           echo "has_styles=$HAS_STYLES" >> $GITHUB_OUTPUT
+          BRANCH_NAME="${{ github.head_ref || github.ref_name }}"
+          if [[ "$BRANCH_NAME" == live-* ]]; then
+            echo "scripts_minify=true" >> $GITHUB_OUTPUT
+          else
+            echo "scripts_minify=false" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build scripts
         if: steps.detect.outputs.has_scripts == 'true'
-        run: npx -y climaybe@latest build-scripts
+        run: |
+          if [ "${{ steps.detect.outputs.scripts_minify }}" = "true" ]; then
+            npx --no-install climaybe build-scripts --minify
+          else
+            npx --no-install climaybe build-scripts
+          fi
 
       - name: Run Tailwind build
         id: build
         run: |
           if [ "${{ steps.detect.outputs.has_styles }}" = "true" ]; then
-            NODE_ENV=production npx -y climaybe@latest build
+            NODE_ENV=production npx --no-install climaybe build
           else
             echo "No _styles/main.css found; skipping Tailwind build."
           fi

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

@@ -92,11 +92,12 @@ jobs:
             exit 0
           fi
 
-          # Default store: commits outside stores/ (root + code) trigger backport.
+          # 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/' 2>/dev/null | \
-              grep -v "\[stores-to-root\]" | grep -v "\[root-to-stores\]" | grep -v "chore(release)" || true)
+            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)