climaybe 3.1.1 → 3.1.3

package/README.md

@@ -94,7 +94,7 @@ Switch your local dev environment to a specific store (multi-store only).
 npx climaybe switch voldt-norway
 ```
 
-Copies `stores/<alias>/` JSON files to the repo root so you can preview that store locally.
+Copies `stores/<alias>/` JSON files to the repo root so you can preview that store locally, and sets `default_store` in `climaybe.config.json` so `climaybe serve` / `shopify theme dev` targets that store. If your current git branch is `staging-<alias>` or `live-<alias>`, `climaybe serve` uses that store’s domain from config (even if `default_store` differs), matching CI preview behavior.
 
 ### `climaybe sync [alias]` / `climaybe theme sync`
 

package/bin/version.txt

@@ -1 +1 @@
-3.1.1
+3.1.3

package/package.json

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

package/src/commands/switch.js

@@ -1,5 +1,5 @@
 import pc from 'picocolors';
-import { getStoreAliases, getMode } from '../lib/config.js';
+import { getStoreAliases, getMode, readConfig, writeConfig } from '../lib/config.js';
 import { storesToRoot } from '../lib/store-sync.js';
 import { requireThemeProject } from '../lib/theme-guard.js';
 
@@ -23,6 +23,11 @@ export async function switchCommand(alias) {
 
   const ok = storesToRoot(alias);
   if (ok) {
+    const config = readConfig();
+    const domain = config?.stores?.[alias];
+    if (domain) {
+      writeConfig({ default_store: domain });
+    }
     console.log(pc.bold(pc.green(`\n  Switched to store: ${alias}\n`)));
     console.log(pc.dim('  Root JSON files now reflect this store\'s data.'));
     console.log(pc.dim('  Use "climaybe theme sync" (or "climaybe sync") to write changes back.\n'));

package/src/index.js

@@ -77,7 +77,7 @@ function registerThemeCommands(cmd) {
   cmd.command('build').description('Build assets (Tailwind + scripts build)').action(() => buildAll());
   cmd
     .command('build-scripts')
-    .description('Build _scripts → assets/index.js')
+    .description('Build _scripts → assets/*.js')
     .option('--minify', 'Minify output bundles')
     .action(buildScriptsCommand);
   cmd

package/src/lib/build-scripts.js

@@ -40,6 +40,8 @@ function stripModuleSyntax(content) {
   );
 
   cleaned = cleaned.replace(/^\s*export\s+default\s+/gm, '');
+  // Remove named exports (single-line and multiline forms).
+  cleaned = cleaned.replace(/(^|\n)\s*export\s*\{[\s\S]*?\}\s*;?/g, '$1');
   cleaned = cleaned.replace(/^\s*export\s+\{[^}]*\}\s*;?\s*$/gm, '');
   cleaned = cleaned.replace(/^\s*export\s+(?=(const|let|var|function|class)\b)/gm, '');
   return cleaned;
@@ -179,26 +181,38 @@ function buildSingleEntrypoint({ cwd, entryFile, minify = false }) {
     throw new Error(`Missing required file: _scripts/${entryFile}`);
   }
 
-  const processedFiles = new Set();
+  const processedFilesReadable = new Set();
+  const processedFilesMinified = new Set();
   const isolateFiles = collectFilesToIsolate({ scriptsDir, entryFile });
-  let finalContent = processScriptFile({
+  const readableContent = processScriptFile({
     scriptsDir,
     filePath: entryFile,
-    processedFiles,
-    minify,
+    processedFiles: processedFilesReadable,
+    minify: false,
+    isolateFiles
+  });
+
+  const minifiedContent = processScriptFile({
+    scriptsDir,
+    filePath: entryFile,
+    processedFiles: processedFilesMinified,
+    minify: true,
     isolateFiles
   });
-  finalContent = stripModuleSyntax(finalContent);
-  if (minify) finalContent = minifyScriptContent(finalContent);
 
   const assetsDir = join(cwd, 'assets');
   mkdirSync(assetsDir, { recursive: true });
 
   const outFile = outputNameForEntrypoint(entryFile);
   const outputPath = join(assetsDir, outFile);
-  writeFileSync(outputPath, finalContent.trim() + '\n', 'utf-8');
+  const outReadable = stripModuleSyntax(readableContent).trim() + '\n';
+  const outMinified = minifyScriptContent(stripModuleSyntax(minifiedContent)).trim() + '\n';
+
+  // When minify=true, the primary output file is minified.
+  writeFileSync(outputPath, (minify ? outMinified : outReadable), 'utf-8');
 
-  return { entryFile, fileCount: processedFiles.size, outputPath };
+  const fileCount = Math.max(processedFilesReadable.size, processedFilesMinified.size);
+  return { entryFile, fileCount, outputPath };
 }
 
 export function buildScripts({ cwd = process.cwd(), entry = null, minify = false } = {}) {

package/src/lib/config.js

@@ -1,6 +1,6 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { getLatestTagVersion } from './git.js';
+import { getLatestTagVersion, isGitRepo, currentBranch } from './git.js';
 
 const PKG = 'package.json';
 const CLIMAYBE_CONFIG = 'climaybe.config.json';
@@ -188,6 +188,37 @@ export function getMode(cwd = process.cwd()) {
   return aliases.length > 1 ? 'multi' : 'single';
 }
 
+/**
+ * When on git branches `staging-<alias>` or `live-<alias>`, resolve the Shopify domain
+ * for that store from config. Returns null if not a git repo, branch doesn't match,
+ * or the alias is unknown.
+ * @param {string} [cwd]
+ * @returns {string | null}
+ */
+export function getStoreDomainFromBranch(cwd = process.cwd()) {
+  if (!isGitRepo(cwd)) return null;
+  let branch;
+  try {
+    branch = currentBranch(cwd);
+  } catch {
+    return null;
+  }
+  const config = readConfig(cwd);
+  const stores = config?.stores;
+  if (!stores || typeof stores !== 'object') return null;
+
+  let alias = '';
+  if (branch.startsWith('staging-')) {
+    alias = branch.slice('staging-'.length);
+  } else if (branch.startsWith('live-')) {
+    alias = branch.slice('live-'.length);
+  }
+  if (!alias) return null;
+
+  const domain = stores[alias];
+  return typeof domain === 'string' && domain.trim() ? domain.trim() : null;
+}
+
 /**
  * Whether optional preview/cleanup workflows are enabled.
  */

package/src/lib/dev-runtime.js

@@ -3,7 +3,7 @@ import { existsSync } from 'node:fs';
 import { watchTree } from './watch.js';
 import { isAbsolute, join, relative } from 'node:path';
 import pc from 'picocolors';
-import { readConfig } from './config.js';
+import { readConfig, getStoreDomainFromBranch } from './config.js';
 import { buildScripts } from './build-scripts.js';
 import { buildSchemas } from './schema-builder.js';
 import { runShopify } from './shopify-cli.js';
@@ -211,7 +211,8 @@ function runThemeCheckFiltered({ cwd = process.cwd() } = {}) {
 
 export function serveShopify({ cwd = process.cwd() } = {}) {
   const config = readConfig(cwd) || {};
-  const store = config.default_store || config.store || '';
+  const branchStore = getStoreDomainFromBranch(cwd);
+  const store = branchStore || config.default_store || config.store || '';
   const args = ['theme', 'dev', '--theme-editor-sync'];
   if (store) args.push(`--store=${store}`);
   // Keep Shopify on inherited stdio so reconciliation prompts remain interactive.

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

@@ -50,12 +50,6 @@ 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: Decide which build steps to run
         id: run
@@ -94,11 +88,7 @@ jobs:
       - name: Build scripts
         if: steps.run.outputs.build_ran == 'true' && steps.run.outputs.run_scripts == 'true'
         run: |
-          if [ "${{ steps.detect.outputs.scripts_minify }}" = "true" ]; then
-            npx --no-install climaybe build-scripts --minify
-          else
-            npx --no-install climaybe build-scripts
-          fi
+          npx --no-install climaybe build-scripts
 
       - name: Run Tailwind build
         if: steps.run.outputs.build_ran == 'true' && steps.run.outputs.run_tailwind == 'true'