climaybe 2.2.3 → 2.2.4

package/bin/cli.js

@@ -1,25 +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 packageName = require(join(packageDir, 'package.json')).name || 'climaybe';
+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.3
+2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "2.2.3",
+  "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;
+}