climaybe 1.4.0 → 1.4.3

package/bin/cli.js

@@ -1,13 +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';
 
-// Resolve version from package.json next to this bin (works with npm link / global install)
 const require = createRequire(import.meta.url);
 const binDir = dirname(fileURLToPath(import.meta.url));
-const pkg = require(join(binDir, '..', 'package.json'));
+const packageDir = join(binDir, '..');
 
-run(process.argv, pkg.version);
+// 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;
+}
+
+run(process.argv, version, packageDir);

package/bin/version.txt

@@ -0,0 +1 @@
+1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "climaybe",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config for single-store and multi-store theme repos",
   "type": "module",
   "bin": {
@@ -31,7 +31,8 @@
   "homepage": "https://github.com/electricmaybe/climaybe#readme",
   "scripts": {
     "test": "node scripts/run-tests.js 2>&1 | tee test.log",
-    "prepare": "husky"
+    "prepare": "husky",
+    "prepublishOnly": "node -e \"require('fs').writeFileSync('bin/version.txt', require('./package.json').version)\""
   },
   "release": {
     "branches": [

package/src/commands/init.js

@@ -140,12 +140,12 @@ async function runInitFlow() {
   const existingNames =
     ciHost === 'github' ? listGitHubSecrets() : listGitLabVariables();
   const namesWeWillPrompt = new Set(secretsToPrompt.map((s) => s.name));
-  const alreadySet = existingNames.filter((n) => namesWeWillPrompt.has(n));
-  if (alreadySet.length > 0) {
-    const doUpdate = await promptUpdateExistingSecrets(alreadySet);
-    if (!doUpdate) {
-      console.log(pc.dim('\n  Skipping. Existing secrets left unchanged.\n'));
-      return;
+  const alreadySet = new Set(existingNames.filter((n) => namesWeWillPrompt.has(n)));
+  let doUpdateExisting = true;
+  if (alreadySet.size > 0) {
+    doUpdateExisting = await promptUpdateExistingSecrets([...alreadySet]);
+    if (!doUpdateExisting) {
+      console.log(pc.dim('\n  Skipping only the secret(s) already set; will still prompt for the rest.\n'));
     }
   }
 
@@ -159,6 +159,7 @@ async function runInitFlow() {
     stores,
   });
   for (const { name, value } of storeUrlSecrets) {
+    if (alreadySet.has(name) && !doUpdateExisting) continue;
     try {
       await setter.set(name, value);
       console.log(pc.green(`  Set ${name} (from store config).`));
@@ -168,10 +169,12 @@ async function runInitFlow() {
     }
   }
 
-  console.log(pc.cyan(`\n  Configure ${total} ${setter.name} secret(s)/variable(s). Leave optional ones blank to skip.\n`));
-  for (let i = 0; i < secretsToPrompt.length; i++) {
-    const secret = secretsToPrompt[i];
-    const value = await promptSecretValue(secret, i, total);
+  const toPrompt = secretsToPrompt.filter((s) => !alreadySet.has(s.name) || doUpdateExisting);
+  const totalToPrompt = toPrompt.length;
+  console.log(pc.cyan(`\n  Configure ${totalToPrompt} ${setter.name} secret(s)/variable(s). Leave optional ones blank to skip.\n`));
+  for (let i = 0; i < toPrompt.length; i++) {
+    const secret = toPrompt[i];
+    const value = await promptSecretValue(secret, i, totalToPrompt);
     if (!value) continue;
 
     const isThemeToken =

package/src/index.js

@@ -8,14 +8,16 @@ import { updateWorkflowsCommand } from './commands/update-workflows.js';
 /**
  * Create the CLI program (for testing and for run).
  * @param {string} [version] - Version string (from bin/cli.js when run as CLI; from package.json in tests).
+ * @param {string} [packageDir] - Package root dir (shown with --version so user can see which install is running).
  */
-export function createProgram(version = '0.0.0') {
+export function createProgram(version = '0.0.0', packageDir = '') {
   const program = new Command();
+  const versionDisplay = packageDir ? `${version}\n  from: ${packageDir}` : version;
 
   program
     .name('climaybe')
     .description('Shopify CI/CD CLI — scaffolds workflows, branch strategy, and store config')
-    .version(version);
+    .version(versionDisplay);
 
   program
     .command('init')
@@ -52,6 +54,6 @@ export function createProgram(version = '0.0.0') {
   return program;
 }
 
-export function run(argv, version) {
-  createProgram(version).parse(argv);
+export function run(argv, version, packageDir = '') {
+  createProgram(version, packageDir).parse(argv);
 }

package/src/workflows/preview/pr-update.yml

@@ -86,8 +86,15 @@ jobs:
           fi
           echo "Shopify credentials are configured for alias: ${{ steps.resolve.outputs.alias }}"
 
+  cleanup-themes:
+    needs: extract-pr-number
+    uses: ./.github/workflows/reusable-cleanup-themes.yml
+    with:
+      pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}
+    secrets: inherit
+
   share-theme:
-    needs: [validate-environment, extract-pr-number]
+    needs: [validate-environment, extract-pr-number, cleanup-themes]
     uses: ./.github/workflows/reusable-share-theme.yml
     with:
       pr_number: ${{ needs.extract-pr-number.outputs.pr_number }}