climaybe 3.0.1 → 3.0.2

package/bin/version.txt

@@ -1 +1 @@
-3.0.1
+3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "3.0.1",
+  "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/lib/theme-dev-kit.js

@@ -128,8 +128,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 +164,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,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.'));