diff --git a/.changeset/config.json b/.changeset/config.json index e9e8e190..963a6997 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -12,5 +12,16 @@ "access": "public", "baseBranch": "master", "updateInternalDependencies": "patch", - "ignore": [] + "ignore": [ + "@forgerock/device-client", + "@forgerock/davinci-client", + "autoscript-apps", + "autoscript-suites", + "davinci-app", + "mock-api", + "token-vault-app", + "@forgerock/token-vault-interceptor", + "token-vault-proxy", + "token-vault-suites" + ] } diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 75451fbd..309719a6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -77,6 +77,7 @@ jobs: id: changesets with: publish: pnpm ci:release + version: pnpm ci:version title: Release PR branch: master setupGitUser: false @@ -84,7 +85,7 @@ jobs: # See https://github.com/changesets/action/issues/147 HOME: ${{ github.workspace }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_CONFIG_PROVENANCE: true + NPM_CONFIG_PROVENANCE: 'true' NPM_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }} - name: rebase develop with main on publish @@ -100,3 +101,4 @@ jobs: git push -f env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_CONFIG_PROVENANCE: true diff --git a/package.json b/package.json index 696afc91..830f084a 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "scripts": { "build": "nx affected --target=build", "clean": "shx rm -rf ./{coverage,dist,docs,node_modules,tmp}/ ./{packages,e2e}/*/{dist,node_modules}/ && git clean -fX -e \"!.env*,nx-cloud.env\"", - "ci:release": "pnpm -r release", + "ci:release": "pnpm publish -r --no-git-checks && changeset tag", + "ci:version": "changeset version && pnpm install --no-frozen-lockfile", "changeset": "pnpm changeset", "commit": "git cz", "docs": "nx affected --target=typedoc", diff --git a/packages/javascript-sdk/package.json b/packages/javascript-sdk/package.json index 21486cf4..f5119005 100644 --- a/packages/javascript-sdk/package.json +++ b/packages/javascript-sdk/package.json @@ -51,9 +51,6 @@ } }, "type": "module", - "scripts": { - "release": "pnpm publish" - }, "devDependencies": { "vitest": "^1.4.0" } diff --git a/packages/ping-protect/package.json b/packages/ping-protect/package.json index d07c9a44..b03a8de1 100644 --- a/packages/ping-protect/package.json +++ b/packages/ping-protect/package.json @@ -21,8 +21,5 @@ "types": "./dist/index.ts.d.ts", "peerDependencies": { "@forgerock/javascript-sdk": "workspace:*" - }, - "scripts": { - "release": "pnpm publish" } } diff --git a/packages/token-vault/package.json b/packages/token-vault/package.json index 42949eba..8923a304 100644 --- a/packages/token-vault/package.json +++ b/packages/token-vault/package.json @@ -22,8 +22,5 @@ }, "peerDependencies": { "@forgerock/javascript-sdk": "workspace:*" - }, - "scripts": { - "release": "pnpm publish" } }