climaybe 3.0.1 → 3.0.3

package/README.md

@@ -115,15 +115,21 @@ npx climaybe ensure-branches
 git push origin --all
 ```
 
-### `climaybe update-workflows` / `climaybe theme update-workflows`
+### `climaybe update` / `climaybe theme update`
 
-Refresh GitHub Actions workflows from the latest bundled templates.
+Refresh all climaybe-managed project files from your installed CLI version:
+- GitHub workflows
+- root dev-kit files (`.theme-check.yml`, `.shopifyignore`, `.prettierrc`, `.lighthouserc.js`, `.gitignore`)
+- `package.json` managed deps (`climaybe`, `tailwindcss`)
+- optional `.vscode/tasks.json` (if enabled)
+- optional commitlint + Husky files (if enabled)
+- optional Cursor bundle files (if enabled)
 
 ```bash
-npx climaybe update-workflows
+npx climaybe update
 ```
 
-Useful after updating the CLI to get the latest workflow improvements.
+`update-workflows` still works as a backward-compatible alias.
 
 ### `climaybe setup-commitlint`
 
@@ -141,7 +147,7 @@ Install Electric Maybe **Cursor rules, skills, and subagents** into `.cursor/rul
 npx climaybe add-cursor
 ```
 
-The previous command name `add-cursor-skill` still works as an alias. Re-running replaces the bundled rules, skills, and subagent files with the copies shipped by your installed climaybe version (same idea as `update-workflows`).
+The previous command name `add-cursor-skill` still works as an alias. Re-running replaces the bundled rules, skills, and subagent files with the copies shipped by your installed climaybe version (same idea as `update`).
 
 ## Configuration
 

package/bin/version.txt

@@ -1 +1 @@
-3.0.1
+3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "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/update-workflows.js

@@ -1,10 +1,20 @@
 import pc from 'picocolors';
-import { getMode, isBuildWorkflowsEnabled, isPreviewWorkflowsEnabled, readConfig } from '../lib/config.js';
+import {
+  getMode,
+  isBuildWorkflowsEnabled,
+  isCommitlintEnabled,
+  isCursorSkillsEnabled,
+  isPreviewWorkflowsEnabled,
+  readConfig,
+} from '../lib/config.js';
 import { scaffoldWorkflows } from '../lib/workflows.js';
 import { requireThemeProject } from '../lib/theme-guard.js';
+import { scaffoldThemeDevKit } from '../lib/theme-dev-kit.js';
+import { scaffoldCommitlint } from '../lib/commit-tooling.js';
+import { scaffoldCursorBundle } from '../lib/cursor-bundle.js';
 
-export async function updateWorkflowsCommand() {
-  console.log(pc.bold('\n  climaybe — Update Workflows\n'));
+export async function updateCommand() {
+  console.log(pc.bold('\n  climaybe — Update\n'));
 
   if (!requireThemeProject()) return;
 
@@ -17,7 +27,24 @@ export async function updateWorkflowsCommand() {
   const mode = getMode();
   const includePreview = isPreviewWorkflowsEnabled();
   const includeBuild = isBuildWorkflowsEnabled();
+
+  // Keep theme project files in sync (root files, package.json, .gitignore, VS Code tasks).
+  scaffoldThemeDevKit({
+    includeVSCodeTasks: !!config.vscode_tasks,
+    defaultStoreDomain: config.default_store || '',
+  });
+
+  if (isCommitlintEnabled()) {
+    scaffoldCommitlint(process.cwd(), { skipInstall: true });
+  }
+  if (isCursorSkillsEnabled()) {
+    scaffoldCursorBundle();
+  }
+
   scaffoldWorkflows(mode, { includePreview, includeBuild });
 
-  console.log(pc.bold(pc.green('\n  Workflows updated!\n')));
+  console.log(pc.bold(pc.green('\n  Project files updated!\n')));
 }
+
+// Backward-compatible export for old command name.
+export const updateWorkflowsCommand = updateCommand;

package/src/index.js

@@ -3,7 +3,7 @@ import { initCommand, reinitCommand } from './commands/init.js';
 import { addStoreCommand } from './commands/add-store.js';
 import { switchCommand } from './commands/switch.js';
 import { syncCommand } from './commands/sync.js';
-import { updateWorkflowsCommand } from './commands/update-workflows.js';
+import { updateCommand } from './commands/update-workflows.js';
 import { ensureBranchesCommand } from './commands/ensure-branches.js';
 import { setupCommitlintCommand } from './commands/setup-commitlint.js';
 import { addCursorSkillCommand } from './commands/add-cursor-skill.js';
@@ -81,9 +81,10 @@ function registerThemeCommands(cmd) {
     .action(createEntrypointsCommand);
 
   cmd
-    .command('update-workflows')
-    .description('Refresh GitHub Actions workflows from latest bundled templates')
-    .action(updateWorkflowsCommand);
+    .command('update')
+    .alias('update-workflows')
+    .description('Refresh workflows and all climaybe-managed project files')
+    .action(updateCommand);
 
   cmd
     .command('ensure-branches')

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

@@ -66,43 +66,20 @@ const VSCODE_TASKS_CONTENT = `{
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Shopify",
+      "label": "Climaybe Serve",
       "type": "shell",
-      "command": "climaybe serve:shopify",
+      "command": "climaybe serve",
       "isBackground": true,
       "presentation": {
         "echo": true,
         "reveal": "always",
         "focus": true,
-        "panel": "new",
+        "panel": "shared",
         "group": "develop",
         "showReuseMessage": false,
         "clear": true
       },
       "problemMatcher": []
-    },
-    {
-      "label": "Tailwind",
-      "type": "shell",
-      "command": "climaybe serve:assets",
-      "isBackground": true,
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "new",
-        "group": "develop",
-        "showReuseMessage": false,
-        "clear": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "label": "Run Both Consoles",
-      "dependsOn": ["Shopify", "Tailwind"],
-      "runOptions": {
-        "runOn": "folderOpen"
-      }
     }
   ]
 }
@@ -111,6 +88,8 @@ const VSCODE_TASKS_CONTENT = `{
 const GITIGNORE_BLOCK = `# climaybe: theme dev kit (managed)
 .vscode
 node_modules/
+.DS_Store
+**/.DS_Store
 assets/style.css
 assets/index.js
 .shopify
@@ -128,8 +107,21 @@ 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');
 }
 
@@ -151,12 +143,14 @@ function mergePackageJson({ packageName = 'shopify-theme', cwd = process.cwd() }
   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,42 @@ 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';
+}
+
+export function getLocalInstallFlag({ packageName, cwd = process.cwd() } = {}) {
+  // Always keep climaybe in runtime dependencies for theme repos.
+  if (packageName === 'climaybe') return '--save';
+  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({
@@ -54,6 +90,7 @@ export async function maybeOfferCliUpdate({
   timeoutMs = DEFAULT_TIMEOUT_MS,
 } = {}) {
   if (!packageName || !currentVersion || !canPromptForUpdate()) return;
+  const invocationCwd = process.cwd();
 
   const latestVersion = await fetchLatestVersion(packageName, timeoutMs);
   if (!latestVersion || !isVersionGreater(latestVersion, currentVersion)) return;
@@ -68,9 +105,10 @@ export async function maybeOfferCliUpdate({
     if (!shouldUpdate) return;
 
     try {
-      runGlobalUpdate(packageName);
-      console.log(pc.green(`Updated ${packageName} to latest. Restarting command...`));
-      process.chdir(packageDir || process.cwd());
+      const updatedScope = runUpdate(packageName, { packageDir, cwd: process.cwd() });
+      console.log(pc.green(`Updated ${packageName} (${updatedScope}) to latest. Restarting command...`));
+      // Continue in the repo where the user invoked the command.
+      process.chdir(invocationCwd);
     } catch (err) {
       console.log(pc.red('Update failed. Continuing with current version.'));
       if (err?.message) console.log(pc.dim(err.message));