climaybe 1.3.3 → 1.4.2

package/README.md

@@ -246,7 +246,7 @@ Add the following secrets to your GitHub repository (or use **GitLab CI/CD varia
 
 - **Branch:** Single default branch `main`. Feature branches open as PRs into `main`.
 - **Versioning:** [SemVer](https://semver.org/). Versions are **bumped automatically** when PRs are merged to `main` using [conventional commits](https://www.conventionalcommits.org/): `fix:` → patch, `feat:` → minor, `BREAKING CHANGE` or `feat!:` → major.
-- **Flow:** Merge to `main` → [Release version](.github/workflows/release-version.yml) runs semantic-release (bumps `package.json`, pushes tag) → tag push triggers [Release](.github/workflows/release.yml) (tests + publish to npm). Requires `NPM_TOKEN` secret for npm publish.
+- **Flow:** Merge to `main` → [Release version](.github/workflows/release-version.yml) runs semantic-release (bumps `package.json`, pushes tag) → tag push triggers [Release](.github/workflows/release.yml) (tests + publish to npm). Requires `NPM_TOKEN` secret for npm publish. Do not create tags manually; only the Release version workflow creates tags so that tag and package version stay in sync.
 - **CI:** Every PR and push to `main` runs tests on Node 20 and 22 ([CI workflow](.github/workflows/ci.yml)).
 
 See [CONTRIBUTING.md](CONTRIBUTING.md) for branch, PR, and conventional-commit details.

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.2

package/package.json

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