diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a613539..6d7db64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,6 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - packages: write steps: - name: Checkout PR head @@ -81,20 +80,20 @@ jobs: - name: Version snapshot from changesets if: steps.changesets.outputs.count != '0' env: - GITHUB_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: bunx changeset version --snapshot pr-${{ github.event.pull_request.number }} - - name: Configure npm auth for GitHub Packages + - name: Configure npm auth for npmjs if: steps.changesets.outputs.count != '0' env: - NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} run: | - echo "@dotgithub:registry=https://npm.pkg.github.com" >> ~/.npmrc - echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc + echo "registry=https://registry.npmjs.org" >> ~/.npmrc + echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc - name: Publish snapshot tag if: steps.changesets.outputs.count != '0' env: - GITHUB_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} - run: bunx changeset publish --tag pr-${{ github.event.pull_request.number }} --registry https://npm.pkg.github.com + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} + run: bunx changeset publish --tag pr-${{ github.event.pull_request.number }} --registry https://registry.npmjs.org diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1e351b..e1fcfb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,6 @@ concurrency: permissions: contents: write - packages: write jobs: release: @@ -44,7 +43,7 @@ jobs: - name: Version packages from changesets if: steps.changesets.outputs.count != '0' env: - GITHUB_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: bun run changeset:version - name: Commit version updates to main @@ -56,17 +55,17 @@ jobs: git commit -m "chore(release): version packages [skip ci]" || exit 0 git push - - name: Configure npm auth for GitHub Packages + - name: Configure npm auth for npmjs if: steps.changesets.outputs.count != '0' env: - NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} run: | - echo "@dotgithub:registry=https://npm.pkg.github.com" >> ~/.npmrc - echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc + echo "registry=https://registry.npmjs.org" >> ~/.npmrc + echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc - name: Publish packages if: steps.changesets.outputs.count != '0' env: - GITHUB_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN || secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} run: bun run changeset:publish diff --git a/package.json b/package.json index f40b9f2..9f2a435 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test:packages": "bun run --filter './packages/*' test", "changeset": "changeset", "changeset:version": "changeset version", - "changeset:publish": "changeset publish --registry https://npm.pkg.github.com", + "changeset:publish": "changeset publish --registry https://registry.npmjs.org", "changeset:status": "changeset status --verbose" }, "devDependencies": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 4141d6f..7d736ee 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -20,7 +20,7 @@ "bun": ">=1.2.22" }, "publishConfig": { - "registry": "https://npm.pkg.github.com", + "registry": "https://registry.npmjs.org", "access": "public" } } diff --git a/packages/core/package.json b/packages/core/package.json index cd81ede..2b1439b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -24,7 +24,7 @@ "bun": ">=1.2.22" }, "publishConfig": { - "registry": "https://npm.pkg.github.com", + "registry": "https://registry.npmjs.org", "access": "public" }, "devoptimizer": {