Fix publish scripts

Author: donnes

.github/workflows/publish.yml

@@ -14,69 +14,56 @@ on:
           - major
 
 jobs:
-  setup:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: ./.github/actions/setup
-
   publish:
-    needs: setup
     runs-on: ubuntu-latest
     permissions:
       contents: write
       id-token: write
+    outputs:
+      version: ${{ steps.publish.outputs.version }}
+      tag: ${{ steps.publish.outputs.tag }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - uses: ./.github/actions/setup
 
-      - name: Publish
+      - name: Publish to NPM
         id: publish
-        run: bun run script/publish.ts
+        run: bun run scripts/publish.ts
         env:
           BUMP: ${{ inputs.bump }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    outputs:
-      version: ${{ steps.publish.outputs.version }}
-      tag: ${{ steps.publish.outputs.tag }}
 
-  commit:
-    needs: publish
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Commit release version
+      - name: Commit version bump
         id: commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "release: v${{ needs.publish.outputs.version }}"
+          commit_message: "release: v${{ steps.publish.outputs.version }}"
           file_pattern: "package.json"
-          token: ${{ secrets.GH_PAT }}
+
+      - name: Save Commit Hash
+        id: save_hash
+        run: echo "hash=${{ steps.commit.outputs.commit_hash || github.sha }}" >> $GITHUB_OUTPUT
 
     outputs:
-      commit_hash: ${{ steps.commit.outputs.commit_hash }}
+      version: ${{ steps.publish.outputs.version }}
+      tag: ${{ steps.publish.outputs.tag }}
+      commit_hash: ${{ steps.save_hash.outputs.hash }}
 
   release:
-    needs: [publish, commit]
+    needs: publish
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
+      - uses: actions/checkout@v4
+
       - name: Create GitHub release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: "v${{ needs.publish.outputs.tag }}"
-          name: "v${{ needs.publish.outputs.version }}"
+          tag_name: ${{ needs.publish.outputs.tag }}
+          name: ${{ needs.publish.outputs.tag }}
           generate_release_notes: true
-          target_commitish: ${{ needs.commit.outputs.commit_hash }}
+          target_commitish: ${{ needs.publish.outputs.commit_hash }}

script/publish.ts

@@ -0,0 +1,68 @@
+#!/usr/bin/env bun
+
+import { $ } from "bun";
+import { writeFile } from "node:fs/promises";
+
+// 1. Validation
+const bump = process.env.BUMP;
+if (!bump || !["patch", "minor", "major"].includes(bump)) {
+  console.error("Missing BUMP env. Use patch, minor, or major.");
+  process.exit(1);
+}
+
+if (!process.env.NPM_TOKEN) {
+  console.error("NPM_TOKEN is not set.");
+  process.exit(1);
+}
+
+// 2. Version Calculation
+const pkgFile = Bun.file("package.json");
+const pkg = await pkgFile.json();
+const currentVersion = pkg.version;
+
+const [major, minor, patch] = currentVersion.split(".").map(Number);
+const newVersion = (() => {
+  switch (bump) {
+    case "major":
+      return `${major + 1}.0.0`;
+    case "minor":
+      return `${major}.${minor + 1}.0`;
+    case "patch":
+      return `${major}.${minor}.${patch + 1}`;
+    default:
+      return currentVersion;
+  }
+})();
+
+console.log(`Bumping ${currentVersion} -> ${newVersion}`);
+
+// 3. Update Files
+pkg.version = newVersion;
+await writeFile("package.json", JSON.stringify(pkg, null, 2) + "\n");
+
+// 4. Build
+console.log("Running build...");
+await $`bun run build`;
+
+// 5. Publish using CLI flag for authentication
+console.log("Publishing to NPM...");
+try {
+  // We pass the token directly to the publish command
+  await $`npm publish --access public --//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}`;
+  console.log("NPM publish successful.");
+} catch (error) {
+  console.error("NPM publish failed.");
+  process.exit(1);
+}
+
+// 6. GitHub Outputs
+const tag = `v${newVersion}`;
+if (process.env.GITHUB_OUTPUT) {
+  await writeFile(
+    process.env.GITHUB_OUTPUT,
+    `version=${newVersion}\ntag=${tag}\n`,
+    { flag: "a" },
+  );
+}
+
+console.log(`Process complete for ${tag}`);