climaybe 2.2.2 → 2.2.4

package/README.md

@@ -25,6 +25,8 @@ npm install -D climaybe
 
 Run commands with `npx climaybe` (or add scripts to your `package.json`).
 
+When a newer `climaybe` is available, the CLI can prompt at startup to update. Press **Enter** to accept the update (`npm install -g climaybe@latest`) or type `n` to skip.
+
 ## Quick Start (theme)
 
 ```bash

package/bin/cli.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 
-import { readFileSync, existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { run } from '../src/index.js';
+import { resolveCliVersion } from '../src/lib/cli-version.js';
+import { maybeOfferCliUpdate } from '../src/lib/update-notifier.js';
 
 const require = createRequire(import.meta.url);
 const binDir = dirname(fileURLToPath(import.meta.url));
 const packageDir = join(binDir, '..');
 
-// Prefer version baked at publish (bin/version.txt) so the running binary always reports its own version
-const versionFile = join(binDir, 'version.txt');
-let version;
-if (existsSync(versionFile)) {
-  version = readFileSync(versionFile, 'utf8').trim();
-} else {
-  version = require(join(packageDir, 'package.json')).version;
-}
-
+const pkg = require(join(packageDir, 'package.json'));
+const version = resolveCliVersion({
+  packageDir,
+  binDir,
+  packageVersion: pkg.version,
+});
+const packageName = pkg.name || 'climaybe';
+await maybeOfferCliUpdate({ packageName, currentVersion: version, packageDir });
 run(process.argv, version, packageDir);

package/bin/version.txt

@@ -1 +1 @@
-2.2.2
+2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Shopify CLI — theme CI/CD (workflows, branches, stores) and app repo helpers; also: commitlint and Cursor rules/skills",
   "type": "module",
   "bin": {

package/src/lib/cli-version.js

@@ -0,0 +1,20 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+/**
+ * Resolve the version shown by the CLI.
+ * - In dev checkouts (e.g. npm link), prefer package.json.
+ * - In packaged installs, prefer bin/version.txt and fallback to package.json.
+ */
+export function resolveCliVersion({ packageDir, binDir, packageVersion }) {
+  const devCheckout = existsSync(join(packageDir, '.git'));
+  if (devCheckout) return packageVersion;
+
+  const versionFile = join(binDir, 'version.txt');
+  if (existsSync(versionFile)) {
+    const baked = readFileSync(versionFile, 'utf8').trim();
+    if (baked) return baked;
+  }
+
+  return packageVersion;
+}

package/src/lib/update-notifier.js

@@ -0,0 +1,81 @@
+import { execSync } from 'node:child_process';
+import { stdin as input, stdout as output } from 'node:process';
+import { createInterface } from 'node:readline/promises';
+import pc from 'picocolors';
+
+const NPM_REGISTRY_BASE = 'https://registry.npmjs.org';
+const DEFAULT_TIMEOUT_MS = 1200;
+
+function parseSemver(version) {
+  const match = String(version || '').trim().match(/^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/);
+  if (!match) return null;
+  return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+
+export function isVersionGreater(candidate, current) {
+  const a = parseSemver(candidate);
+  const b = parseSemver(current);
+  if (!a || !b) return false;
+  if (a[0] !== b[0]) return a[0] > b[0];
+  if (a[1] !== b[1]) return a[1] > b[1];
+  return a[2] > b[2];
+}
+
+async function fetchLatestVersion(packageName, timeoutMs = DEFAULT_TIMEOUT_MS) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(`${NPM_REGISTRY_BASE}/${encodeURIComponent(packageName)}/latest`, {
+      signal: controller.signal,
+      headers: { accept: 'application/json' },
+    });
+    if (!response.ok) return null;
+    const json = await response.json();
+    return typeof json.version === 'string' ? json.version : null;
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+function canPromptForUpdate() {
+  return Boolean(input.isTTY && output.isTTY && process.env.CI !== 'true');
+}
+
+function runGlobalUpdate(packageName) {
+  execSync(`npm install -g ${packageName}@latest`, { stdio: 'inherit' });
+}
+
+export async function maybeOfferCliUpdate({
+  packageName,
+  currentVersion,
+  packageDir,
+  timeoutMs = DEFAULT_TIMEOUT_MS,
+} = {}) {
+  if (!packageName || !currentVersion || !canPromptForUpdate()) return;
+
+  const latestVersion = await fetchLatestVersion(packageName, timeoutMs);
+  if (!latestVersion || !isVersionGreater(latestVersion, currentVersion)) return;
+
+  console.log(pc.yellow(`\nA newer ${packageName} is available: ${currentVersion} -> ${latestVersion}`));
+  console.log(pc.dim('Press Enter to update now, or type "n" to continue without updating.'));
+
+  const rl = createInterface({ input, output });
+  try {
+    const answer = (await rl.question('Update now? [Y/n] ')).trim().toLowerCase();
+    const shouldUpdate = answer === '' || answer === 'y' || answer === 'yes';
+    if (!shouldUpdate) return;
+
+    try {
+      runGlobalUpdate(packageName);
+      console.log(pc.green(`Updated ${packageName} to latest. Restarting command...`));
+      process.chdir(packageDir || process.cwd());
+    } catch (err) {
+      console.log(pc.red('Update failed. Continuing with current version.'));
+      if (err?.message) console.log(pc.dim(err.message));
+    }
+  } finally {
+    rl.close();
+  }
+}

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

@@ -3,7 +3,7 @@ const path = require('path');
 const ROOT_DIR = process.cwd();
 
 function extractImports(content) {
-  const importRegex = /import\s+['"]([^'"]+)['"];?/g;
+  const importRegex = /^\s*import\s+(?:[^'"\n;]+?\s+from\s+)?['"]([^'"]+)['"]\s*;?\s*$/gm;
   const imports = [];
   let match;
 
@@ -36,7 +36,7 @@ function processScriptFile(filePath, processedFiles = new Set()) {
     importedContent += processScriptFile(importPath, processedFiles);
   }
 
-  content = content.replace(/import\s+['"][^'"]+['"];?\s*/g, '');
+  content = content.replace(/^\s*import\s+(?:[^'"\n;]+?\s+from\s+)?['"][^'"]+['"]\s*;?\s*$/gm, '');
 
   if (process.env.NODE_ENV === 'production') {
     content = content.replace(/\/\*\*[\s\S]*?\*\//g, '');