diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04075842..366dc525 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -119,23 +119,24 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - token: ${{ secrets.GH_PAT_CLASSIC }} + # Please upvote https://github.com/orgs/community/discussions/13836 + token: ${{ secrets.GH_PAT }} - name: Install pnpm uses: pnpm/action-setup@v2.2.4 - name: Setup Node uses: actions/setup-node@v3 with: - node-version: 18 cache: "pnpm" - name: Install dependencies run: pnpm install - name: Publish to npm and GitHub run: pnpm release env: - # Use GH_PAT when this is fixed: - # https://github.com/github/roadmap/issues/622 - GITHUB_TOKEN: ${{ secrets.GH_PAT_CLASSIC }} + # Please upvote https://github.com/orgs/community/discussions/13836 + GITHUB_TOKEN: ${{ secrets.GH_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + DRY_RUN: 1 + VERBOSE: 1 release-pr: name: Publish PR runs-on: ubuntu-latest diff --git a/package.json b/package.json index 8571afbe..3be0c6ae 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@actions/core": "^1.10.0", - "@balazsorban/monorepo-release": "0.1.8", + "@balazsorban/monorepo-release": "0.2.4", "@types/jest": "^28.1.3", "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": "5.47.0", @@ -62,7 +62,7 @@ ], "pnpm": { "patchedDependencies": { - "@balazsorban/monorepo-release@0.1.8": "patches/@balazsorban__monorepo-release@0.1.8.patch" + "@balazsorban/monorepo-release@0.2.4": "patches/@balazsorban__monorepo-release@0.2.4.patch" } }, "eslintIgnore": [ diff --git a/patches/@balazsorban__monorepo-release@0.1.8.patch b/patches/@balazsorban__monorepo-release@0.2.4.patch similarity index 59% rename from patches/@balazsorban__monorepo-release@0.1.8.patch rename to patches/@balazsorban__monorepo-release@0.2.4.patch index 2ea6501a..f10ac0dc 100644 --- a/patches/@balazsorban__monorepo-release@0.1.8.patch +++ b/patches/@balazsorban__monorepo-release@0.2.4.patch @@ -1,16 +1,16 @@ diff --git a/dist/publish.js b/dist/publish.js -index 1d39a76a5625a10637e3cf23f3a652441702cfb2..4b69b30645db1d1e84c8b6987a23b53c06f66438 100644 +index 9ff19090801bbd6791f6ad29a0ae27bc77bd14fd..50c042c08abd010ed580d76e25cbe4af493fe56b 100644 --- a/dist/publish.js +++ b/dist/publish.js -@@ -54,8 +54,9 @@ export async function publish(packages, options) { - console.log(`Creating git tag...`); +@@ -53,8 +53,9 @@ export async function publish(packages, options) { + log.info(`Creating git tag.`); execSync(`git tag ${gitTag}`); execSync("git push --tags"); -- console.log(`Creating GitHub release notes...`); +- log.info(`Creating GitHub release notes.`); - execSync(`gh release create ${gitTag} --notes '${changelog}'`); + const prerelease = name.startsWith("@auth") ? "--prerelease " : "" -+ console.log(`Creating GitHub release notes${prerelease ? " (as prerelease)" : ""}...`); ++ console.log(`Creating GitHub release notes${prerelease ? " (as prerelease)" : ""}`); + execSync(`gh release create ${gitTag} ${prerelease}--notes '${changelog}'`); } } - console.log("Pushing commits"); \ No newline at end of file + if (dryRun) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 715edc82..5855cd07 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,9 @@ settings: excludeLinksFromLockfile: false patchedDependencies: - '@balazsorban/monorepo-release@0.1.8': - hash: 75pao37sq3m6hqdrtxyjcxjfry - path: patches/@balazsorban__monorepo-release@0.1.8.patch + '@balazsorban/monorepo-release@0.2.4': + hash: 5tj43pohdiiztyxh7rvgp45gjq + path: patches/@balazsorban__monorepo-release@0.2.4.patch importers: @@ -17,8 +17,8 @@ importers: specifier: ^1.10.0 version: 1.10.0 '@balazsorban/monorepo-release': - specifier: 0.1.8 - version: 0.1.8(patch_hash=75pao37sq3m6hqdrtxyjcxjfry) + specifier: 0.2.4 + version: 0.2.4(patch_hash=5tj43pohdiiztyxh7rvgp45gjq) '@types/jest': specifier: ^28.1.3 version: 28.1.3 @@ -2662,6 +2662,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/highlight': 7.18.6 + dev: false /@babel/code-frame@7.21.4: resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==} @@ -6867,7 +6868,7 @@ packages: resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.18.6 + '@babel/code-frame': 7.21.4 '@babel/parser': 7.20.15 '@babel/types': 7.20.7 @@ -6891,7 +6892,7 @@ packages: resolution: {integrity: sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.18.6 + '@babel/code-frame': 7.21.4 '@babel/generator': 7.20.14 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 @@ -6979,15 +6980,18 @@ packages: '@babel/helper-validator-identifier': 7.19.1 to-fast-properties: 2.0.0 - /@balazsorban/monorepo-release@0.1.8(patch_hash=75pao37sq3m6hqdrtxyjcxjfry): - resolution: {integrity: sha512-PHYQ25gUdj1SABKJBYg6Wy4X5sxyF9OEsBJnuQWnBy0i1SsGaWoo+b42GExgLBXMCLUB7zCVg1uQwEG97aHz/w==} - engines: {node: '>=16.16.0'} + /@balazsorban/monorepo-release@0.2.4(patch_hash=5tj43pohdiiztyxh7rvgp45gjq): + resolution: {integrity: sha512-cRUq62+Ui4wL1Bq5fXqh3oIYdBdK8sI+JXR/MfbP+2K8ntdCAhcU/LfuR5FQE/Zzxmm7JAkBqHP0OMAr/KYYDw==} + engines: {node: '>=18.18.0'} hasBin: true dependencies: - '@commitlint/parse': 17.0.0 + '@changesets/get-dependents-graph': 1.3.6 + '@commitlint/parse': 17.7.0 + '@manypkg/get-packages': 2.2.0 git-log-parser: 1.2.0 - semver: 7.3.7 + semver: 7.5.4 stream-to-array: 2.3.0 + yoctocolors: 1.0.0 dev: true patched: true @@ -6997,6 +7001,24 @@ packages: /@braintree/sanitize-url@6.0.2: resolution: {integrity: sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==} + /@changesets/get-dependents-graph@1.3.6: + resolution: {integrity: sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==} + dependencies: + '@changesets/types': 5.2.1 + '@manypkg/get-packages': 1.1.3 + chalk: 2.4.2 + fs-extra: 7.0.1 + semver: 7.5.4 + dev: true + + /@changesets/types@4.1.0: + resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} + dev: true + + /@changesets/types@5.2.1: + resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==} + dev: true + /@cloudflare/workers-types@4.20230914.0: resolution: {integrity: sha512-OVeN4lFVu1O0PJGZ2d0FwpK8lelFcr33qYOgCh77ErEYmEBO4adwnIxcIsdQbFbhF0ffN6joiVcljD4zakdaeQ==} dev: true @@ -7016,17 +7038,17 @@ packages: requiresBuild: true dev: true - /@commitlint/parse@17.0.0: - resolution: {integrity: sha512-cKcpfTIQYDG1ywTIr5AG0RAiLBr1gudqEsmAGCTtj8ffDChbBRxm6xXs2nv7GvmJN7msOt7vOKleLvcMmRa1+A==} + /@commitlint/parse@17.7.0: + resolution: {integrity: sha512-dIvFNUMCUHqq5Abv80mIEjLVfw8QNuA4DS7OWip4pcK/3h5wggmjVnlwGCDvDChkw2TjK1K6O+tAEV78oxjxag==} engines: {node: '>=v14'} dependencies: - '@commitlint/types': 17.0.0 - conventional-changelog-angular: 5.0.13 - conventional-commits-parser: 3.2.4 + '@commitlint/types': 17.4.4 + conventional-changelog-angular: 6.0.0 + conventional-commits-parser: 4.0.0 dev: true - /@commitlint/types@17.0.0: - resolution: {integrity: sha512-hBAw6U+SkAT5h47zDMeOu3HSiD0SODw4Aq7rRNh1ceUmL7GyLKYhPbUvlRWqZ65XjBLPHZhFyQlRaPNz8qvUyQ==} + /@commitlint/types@17.4.4: + resolution: {integrity: sha512-amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ==} engines: {node: '>=v14'} dependencies: chalk: 4.1.2 @@ -8590,7 +8612,7 @@ packages: debug: 4.3.4(supports-color@7.2.0) espree: 9.4.1 globals: 13.19.0 - ignore: 5.2.0 + ignore: 5.2.4 import-fresh: 3.3.0 js-yaml: 4.1.0 minimatch: 3.1.2 @@ -9908,6 +9930,53 @@ packages: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: true + /@manypkg/find-root@1.1.0: + resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} + dependencies: + '@babel/runtime': 7.20.13 + '@types/node': 12.20.55 + find-up: 4.1.0 + fs-extra: 8.1.0 + dev: true + + /@manypkg/find-root@2.2.1: + resolution: {integrity: sha512-34NlypD5mmTY65cFAK7QPgY5Tzt0qXR4ZRXdg97xAlkiLuwXUPBEXy5Hsqzd+7S2acsLxUz6Cs50rlDZQr4xUA==} + engines: {node: '>=14.18.0'} + dependencies: + '@manypkg/tools': 1.1.0 + find-up: 4.1.0 + fs-extra: 8.1.0 + dev: true + + /@manypkg/get-packages@1.1.3: + resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} + dependencies: + '@babel/runtime': 7.20.13 + '@changesets/types': 4.1.0 + '@manypkg/find-root': 1.1.0 + fs-extra: 8.1.0 + globby: 11.1.0 + read-yaml-file: 1.1.0 + dev: true + + /@manypkg/get-packages@2.2.0: + resolution: {integrity: sha512-B5p5BXMwhGZKi/syEEAP1eVg5DZ/9LP+MZr0HqfrHLgu9fq0w4ZwH8yVen4JmjrxI2dWS31dcoswYzuphLaRxg==} + engines: {node: '>=14.18.0'} + dependencies: + '@manypkg/find-root': 2.2.1 + '@manypkg/tools': 1.1.0 + dev: true + + /@manypkg/tools@1.1.0: + resolution: {integrity: sha512-SkAyKAByB9l93Slyg8AUHGuM2kjvWioUTCckT/03J09jYnfEzMO/wSXmEhnKGYs6qx9De8TH4yJCl0Y9lRgnyQ==} + engines: {node: '>=14.18.0'} + dependencies: + fs-extra: 8.1.0 + globby: 11.1.0 + jju: 1.4.0 + read-yaml-file: 1.1.0 + dev: true + /@mapbox/node-pre-gyp@1.0.9: resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==} hasBin: true @@ -9919,7 +9988,7 @@ packages: nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 - semver: 7.3.8 + semver: 7.5.1 tar: 6.1.13 transitivePeerDependencies: - encoding @@ -12627,7 +12696,7 @@ packages: eslint: 8.30.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.30.0) - semver: 7.3.8 + semver: 7.5.1 transitivePeerDependencies: - supports-color - typescript @@ -12647,7 +12716,7 @@ packages: eslint: 8.30.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0(eslint@8.30.0) - semver: 7.3.8 + semver: 7.5.1 transitivePeerDependencies: - supports-color - typescript @@ -15115,25 +15184,22 @@ packages: engines: {node: '>= 0.6'} dev: true - /conventional-changelog-angular@5.0.13: - resolution: {integrity: sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==} - engines: {node: '>=10'} + /conventional-changelog-angular@6.0.0: + resolution: {integrity: sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==} + engines: {node: '>=14'} dependencies: compare-func: 2.0.0 - q: 1.5.1 dev: true - /conventional-commits-parser@3.2.4: - resolution: {integrity: sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==} - engines: {node: '>=10'} + /conventional-commits-parser@4.0.0: + resolution: {integrity: sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==} + engines: {node: '>=14'} hasBin: true dependencies: JSONStream: 1.3.5 is-text-path: 1.0.1 - lodash: 4.17.21 meow: 8.1.2 split2: 3.2.2 - through2: 4.0.2 dev: true /convert-source-map@1.8.0: @@ -19167,7 +19233,6 @@ packages: graceful-fs: 4.2.10 jsonfile: 4.0.0 universalify: 0.1.2 - dev: false /fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} @@ -19603,7 +19668,7 @@ packages: array-union: 2.1.0 dir-glob: 3.0.1 fast-glob: 3.2.12 - ignore: 5.2.0 + ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 dev: true @@ -19615,7 +19680,7 @@ packages: array-union: 2.1.0 dir-glob: 3.0.1 fast-glob: 3.2.12 - ignore: 5.2.0 + ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 dev: true @@ -19627,7 +19692,7 @@ packages: array-union: 3.0.1 dir-glob: 3.0.1 fast-glob: 3.2.12 - ignore: 5.2.0 + ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 dev: true @@ -22600,7 +22665,7 @@ packages: jest-resolve: 26.6.2 natural-compare: 1.4.0 pretty-format: 26.6.2 - semver: 7.5.1 + semver: 7.5.4 transitivePeerDependencies: - supports-color dev: false @@ -25254,7 +25319,7 @@ packages: nopt: 5.0.0 npmlog: 6.0.2 rimraf: 3.0.2 - semver: 7.3.8 + semver: 7.5.1 tar: 6.1.13 which: 2.0.2 transitivePeerDependencies: @@ -25294,7 +25359,7 @@ packages: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.5.1 + semver: 7.5.4 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -25345,7 +25410,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.11.0 - semver: 7.5.1 + semver: 7.5.4 validate-npm-package-license: 3.0.4 dev: true @@ -27604,11 +27669,6 @@ packages: engines: {node: '>=0.6.0', teleport: '>=0.2.0'} dev: true - /q@1.5.1: - resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==} - engines: {node: '>=0.6.0', teleport: '>=0.2.0'} - dev: true - /qs@6.10.3: resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==} engines: {node: '>=0.6'} @@ -27927,6 +27987,16 @@ packages: parse-json: 5.2.0 type-fest: 0.6.0 + /read-yaml-file@1.1.0: + resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} + engines: {node: '>=6'} + dependencies: + graceful-fs: 4.2.10 + js-yaml: 3.14.1 + pify: 4.0.1 + strip-bom: 3.0.0 + dev: true + /readable-stream@0.0.4: resolution: {integrity: sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw==} dev: true @@ -28685,6 +28755,14 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 + dev: true + + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -30364,12 +30442,6 @@ packages: readable-stream: 3.6.0 dev: true - /through2@4.0.2: - resolution: {integrity: sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==} - dependencies: - readable-stream: 3.6.0 - dev: true - /through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true @@ -32448,6 +32520,11 @@ packages: requiresBuild: true dev: true + /yoctocolors@1.0.0: + resolution: {integrity: sha512-qJNAmSF77lWjfRVwCZK3PcKYWrr+55RUQTiXDxXHGbxzf8WuuRgftIB3hqZ5fykjOF/MC62cazsG/2ZDBedOnQ==} + engines: {node: '>=14.16'} + dev: true + /zip-stream@4.1.0: resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==} engines: {node: '>= 10'}