climaybe 3.0.0 → 3.0.2

package/bin/version.txt

@@ -1 +1 @@
-3.0.0
+3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Shopify CLI by Electric Maybe for theme CI/CD workflows, branch orchestration, app setup, and dev tooling",
   "type": "module",
   "bin": {
@@ -81,14 +81,14 @@
     "@shopify/prettier-plugin-liquid": "^1.6.3",
     "@tailwindcss/cli": "^4.1.17",
     "@tailwindcss/typography": "^0.5.16",
+    "commander": "^14.0.3",
     "eslint": "^9.11.0",
+    "picocolors": "^1.1.1",
     "prettier": "^3.4.2",
+    "prompts": "^2.4.2",
     "stylelint": "^16.9.0",
     "stylelint-config-standard": "^36.0.1",
-    "tailwindcss": "^4.1.18",
-    "commander": "^14.0.3",
-    "picocolors": "^1.1.1",
-    "prompts": "^2.4.2"
+    "tailwindcss": "^4.1.18"
   },
   "devDependencies": {
     "@commitlint/cli": "^20.4.4",

package/src/commands/ensure-branches.js

@@ -36,20 +36,15 @@ export async function ensureBranchesCommand() {
   console.log(pc.dim(`  Mode: ${mode}-store (${aliases.length} store(s))\n`));
 
   ensureStagingBranch();
-
-  if (mode === 'multi') {
-    for (const alias of aliases) {
-      createStoreBranches(alias);
-    }
+  for (const alias of aliases) {
+    createStoreBranches(alias);
   }
 
   console.log(pc.bold(pc.green('\n  Branches ensured.\n')));
   console.log(pc.dim('  Push them so CI can run:'));
   console.log(pc.dim('    git push origin staging'));
-  if (mode === 'multi') {
-    for (const alias of aliases) {
-      console.log(pc.dim(`    git push origin staging-${alias} live-${alias}`));
-    }
+  for (const alias of aliases) {
+    console.log(pc.dim(`    git push origin staging-${alias} live-${alias}`));
   }
   console.log(pc.dim('  Or push all at once: git push origin --all\n'));
 }

package/src/commands/init.js

@@ -1,5 +1,6 @@
 import prompts from 'prompts';
 import pc from 'picocolors';
+import { execSync } from 'node:child_process';
 import {
   promptStoreLoop,
   promptPreviewWorkflows,
@@ -36,11 +37,25 @@ import {
   setGitLabVariable,
 } from '../lib/github-secrets.js';
 
+function installThemeDependencies(cwd = process.cwd()) {
+  try {
+    execSync('npm install', { cwd, stdio: 'inherit' });
+    console.log(pc.green('  Installed theme dependencies (npm install).'));
+    return true;
+  } catch (err) {
+    console.log(pc.yellow(`  npm install failed or skipped: ${err.message}`));
+    return false;
+  }
+}
+
 /**
  * Run the full init flow: prompts, config write, git, branches, workflows.
  * Used by both init (when not already inited or user confirms reinit) and reinit.
  */
 async function runInitFlow() {
+  const hasPackageJson = !!readPkg();
+  const projectName = !hasPackageJson ? await promptProjectName() : undefined;
+
   // 1. Collect stores from user
   const stores = await promptStoreLoop();
   const mode = stores.length > 1 ? 'multi' : 'single';
@@ -48,7 +63,6 @@ async function runInitFlow() {
   const enableBuildWorkflows = await promptBuildWorkflows();
   const enableDevKit = await promptDevKit();
   const enableVSCodeTasks = enableDevKit ? await promptVSCodeDevTasks() : false;
-  const projectName = enableDevKit && !readPkg() ? await promptProjectName() : undefined;
   const enableCommitlint = await promptCommitlint();
   const enableCursorSkills = await promptCursorSkills();
 
@@ -111,6 +125,7 @@ async function runInitFlow() {
   // 5. Create branches
   if (mode === 'single') {
     ensureStagingBranch();
+    createStoreBranches(stores[0].alias);
   } else {
     // Multi-store: staging branch + per-store branches
     ensureStagingBranch();
@@ -158,6 +173,7 @@ async function runInitFlow() {
       packageName: projectName || undefined,
     });
     console.log(pc.green('  Theme dev kit installed (local config + ignore defaults).'));
+    installThemeDependencies();
   }
 
   // Done
@@ -165,6 +181,7 @@ 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/lib/dev-runtime.js

@@ -106,6 +106,24 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
       })
     : null;
 
+  let themeCheckRunning = false;
+  let themeCheckQueued = false;
+  const runThemeCheck = () => {
+    if (themeCheckRunning) {
+      themeCheckQueued = true;
+      return;
+    }
+    themeCheckRunning = true;
+    const child = runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+    child.on('exit', () => {
+      themeCheckRunning = false;
+      if (themeCheckQueued) {
+        themeCheckQueued = false;
+        runThemeCheck();
+      }
+    });
+  };
+
   const themeCheckWatch =
     includeThemeCheck
       ? watchTree({
@@ -118,11 +136,15 @@ export function serveAssets({ cwd = process.cwd(), includeThemeCheck = true } =
             p.includes('/_styles/'),
           debounceMs: 800,
           onChange: () => {
-            runShopify(['theme', 'check'], { cwd, name: 'theme-check' });
+            runThemeCheck();
           },
         })
       : null;
 
+  if (includeThemeCheck) {
+    runThemeCheck();
+  }
+
   const cleanup = () => {
     safeClose(scriptsWatch);
     safeClose(themeCheckWatch);

package/src/lib/theme-dev-kit.js

@@ -1,11 +1,12 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { readPkg, writePkg, writeClimaybeConfig } from './config.js';
+import { getLatestTagVersion } from './git.js';
 
 const DEV_KIT_FILES = {
   '.theme-check.yml': `root: .
 
-extends: :nothing
+extends: theme-check:recommended
 
 ignore:
   - node_modules/*
@@ -109,6 +110,7 @@ const VSCODE_TASKS_CONTENT = `{
 
 const GITIGNORE_BLOCK = `# climaybe: theme dev kit (managed)
 .vscode
+node_modules/
 assets/style.css
 assets/index.js
 .shopify
@@ -126,19 +128,50 @@ function mergeGitignore(cwd = process.cwd()) {
     return;
   }
   const current = readFileSync(path, 'utf-8');
-  if (current.includes('# climaybe: theme dev kit (managed)')) return;
-  const next = `${current.trimEnd()}\n\n${GITIGNORE_BLOCK}`;
+  const marker = '# climaybe: theme dev kit (managed)';
+  if (current.includes(marker)) {
+    const lines = current.split('\n');
+    const start = lines.findIndex((line) => line.trim() === marker);
+    if (start >= 0) {
+      let end = start + 1;
+      while (end < lines.length && lines[end].trim() !== '') end += 1;
+      const before = lines.slice(0, start).join('\n').trimEnd();
+      const after = lines.slice(end).join('\n').trim();
+      const segments = [before, GITIGNORE_BLOCK.trimEnd(), after].filter(Boolean);
+      writeFileSync(path, `${segments.join('\n\n')}\n`, 'utf-8');
+      return;
+    }
+  }
+  const next = `${current.trimEnd()}\n\n${GITIGNORE_BLOCK.trimEnd()}`;
   writeFileSync(path, `${next}\n`, 'utf-8');
 }
 
 function mergePackageJson({ packageName = 'shopify-theme', cwd = process.cwd() } = {}) {
-  const pkg = readPkg(cwd) || { name: packageName, version: '1.0.0', private: true };
+  let pkg = readPkg(cwd);
+  if (!pkg) {
+    let version = '0.1.0';
+    try {
+      const fromTags = getLatestTagVersion(cwd);
+      if (fromTags) version = fromTags;
+    } catch {
+      // not a git repo or no semver tags found
+    }
+    pkg = { name: packageName, version, private: true };
+  }
+  if (!pkg.description) {
+    pkg.description = 'Customizable modular development environment for blazing-fast Shopify theme creation';
+  }
+  if (!pkg.author) {
+    pkg.author = 'Electric Maybe <hello@electricmaybe.com>';
+  }
+  pkg.dependencies = { ...(pkg.dependencies || {}) };
   pkg.devDependencies = { ...(pkg.devDependencies || {}) };
 
   // Ensure teammates can run climaybe + Tailwind after plain npm install.
   const cliVersion = process.env.CLIMAYBE_PACKAGE_VERSION;
   const climaybeRange = /^\d+\.\d+\.\d+/.test(String(cliVersion || '')) ? `^${cliVersion}` : 'latest';
-  if (!pkg.devDependencies.climaybe) pkg.devDependencies.climaybe = climaybeRange;
+  if (!pkg.dependencies.climaybe) pkg.dependencies.climaybe = climaybeRange;
+  if (pkg.devDependencies.climaybe) delete pkg.devDependencies.climaybe;
   if (!pkg.devDependencies.tailwindcss) pkg.devDependencies.tailwindcss = 'latest';
 
   writePkg(pkg, cwd);

package/src/lib/update-notifier.js

@@ -1,6 +1,8 @@
 import { execSync } from 'node:child_process';
 import { stdin as input, stdout as output } from 'node:process';
 import { createInterface } from 'node:readline/promises';
+import { existsSync, readFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 import pc from 'picocolors';
 
 const NPM_REGISTRY_BASE = 'https://registry.npmjs.org';
@@ -43,8 +45,40 @@ function canPromptForUpdate() {
   return Boolean(input.isTTY && output.isTTY && process.env.CI !== 'true');
 }
 
-function runGlobalUpdate(packageName) {
-  execSync(`npm install -g ${packageName}@latest`, { stdio: 'inherit' });
+export function resolveInstallScope({ packageDir, cwd = process.cwd() } = {}) {
+  try {
+    const globalRoot = execSync('npm root -g', { encoding: 'utf-8', stdio: 'pipe' }).trim();
+    if (packageDir && resolve(packageDir).startsWith(resolve(globalRoot))) return 'global';
+  } catch {
+    // ignore and fallback to local checks
+  }
+
+  if (existsSync(join(cwd, 'package.json'))) return 'local';
+  return 'global';
+}
+
+function getLocalInstallFlag({ packageName, cwd = process.cwd() } = {}) {
+  try {
+    const pkgPath = join(cwd, 'package.json');
+    if (!existsSync(pkgPath)) return '--save-dev';
+    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+    if (pkg?.dependencies?.[packageName]) return '--save';
+    if (pkg?.devDependencies?.[packageName]) return '--save-dev';
+    return '--save-dev';
+  } catch {
+    return '--save-dev';
+  }
+}
+
+function runUpdate(packageName, { packageDir, cwd = process.cwd() } = {}) {
+  const scope = resolveInstallScope({ packageDir, cwd });
+  if (scope === 'global') {
+    execSync(`npm install -g ${packageName}@latest`, { stdio: 'inherit' });
+    return 'global';
+  }
+  const flag = getLocalInstallFlag({ packageName, cwd });
+  execSync(`npm install ${packageName}@latest ${flag}`, { cwd, stdio: 'inherit' });
+  return 'local';
 }
 
 export async function maybeOfferCliUpdate({
@@ -68,8 +102,8 @@ export async function maybeOfferCliUpdate({
     if (!shouldUpdate) return;
 
     try {
-      runGlobalUpdate(packageName);
-      console.log(pc.green(`Updated ${packageName} to latest. Restarting command...`));
+      const updatedScope = runUpdate(packageName, { packageDir, cwd: process.cwd() });
+      console.log(pc.green(`Updated ${packageName} (${updatedScope}) to latest. Restarting command...`));
       process.chdir(packageDir || process.cwd());
     } catch (err) {
       console.log(pc.red('Update failed. Continuing with current version.'));

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

@@ -22,7 +22,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "24"
-          cache: "npm"
 
       - name: Detect build entrypoints
         id: detect