Compare commits

..
1 Commits
Author SHA1 Message Date
github-actions[bot] e0538e6866 v1.5.2 2025-05-10 11:25:48 +00:00
45 changed files with 5871 additions and 3732 deletions
+6
View File
@@ -0,0 +1,6 @@
{
"presets": [
["@babel/preset-env", { "targets": { "node": 10 } }],
"@babel/preset-typescript"
]
}
-4
View File
@@ -1,4 +0,0 @@
/.github/workflows/** @Andarist @bluwy @emmatown
/action.yml @Andarist @bluwy @emmatown
/scripts/bump.ts @Andarist @bluwy @emmatown
/scripts/release.ts @Andarist @bluwy @emmatown
-24
View File
@@ -1,24 +0,0 @@
name: Setup CI
description: Setup CI
inputs:
skip-cache:
description: "Whether to skip the cache"
required: false
default: "false"
runs:
using: composite
steps:
- name: Set up pnpm
uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version-file: ".node-version"
package-manager-cache: ${{ inputs.skip-cache != 'true' }}
cache: ${{ inputs.skip-cache != 'true' && 'pnpm' || '' }}
- name: Install dependencies
shell: bash
run: pnpm install --frozen-lockfile
-2
View File
@@ -9,5 +9,3 @@ updates:
directory: "/" # Location of package manifests directory: "/" # Location of package manifests
schedule: schedule:
interval: "weekly" interval: "weekly"
cooldown:
default-days: 7
+14 -68
View File
@@ -1,78 +1,24 @@
name: CI name: Node CI
on: on: [pull_request]
pull_request:
# merge queue is required so all commits on target branches trigger this workflow
# despite lack of the push event trigger here
merge_group:
branches:
- main
permissions:
contents: read
concurrency:
group: ${{ github.workflow }}-${{ github.sha }}
cancel-in-progress: true
jobs: jobs:
lint-workflows: build:
name: Lint workflows
runs-on: ubuntu-latest
permissions:
actions: read # only required in private repos
security-events: write # allow writing security events
steps:
- name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- name: Run zizmor
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
with:
persona: pedantic
annotations: true
advanced-security: false
test:
name: Test
timeout-minutes: 20 timeout-minutes: 20
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out repo - name: Checkout Repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 uses: actions/checkout@v4
with:
persist-credentials: false
- uses: ./.github/actions/ci-setup - name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20.x
- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Test - name: Test
run: pnpm test run: yarn test
typecheck:
name: Typecheck
timeout-minutes: 20
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- uses: ./.github/actions/ci-setup
- name: Typecheck
run: pnpm typecheck
ci-ok:
name: CI OK
runs-on: ubuntu-latest
if: always()
needs: [lint-workflows, test, typecheck]
steps:
- name: Exit with error if some jobs are not successful
run: exit 1
if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) }}
-31
View File
@@ -1,31 +0,0 @@
name: pkg-pr-new
on: pull_request
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
permissions: {}
jobs:
publish:
name: Publish
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- uses: ./.github/actions/ci-setup
with:
skip-cache: true # avoid cache poisoning attacks
- name: Build
run: pnpm build
- run:
| # zizmor: ignore[use-trusted-publishing] we're not publishing to npm here
pnpm exec pkg-pr-new publish --pnpm --packageManager=pnpm --commentWithDev --commentWithSha --no-compact --no-template
-78
View File
@@ -1,78 +0,0 @@
name: Publish
on:
push:
branches:
- main
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false
queue: max
permissions: {} # each job should define its own permission explicitly
jobs:
version:
name: Version
runs-on: ubuntu-latest
timeout-minutes: 20
outputs:
hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
permissions:
contents: write # to create release (changesets/action)
issues: write # to post issue comments (changesets/action)
pull-requests: write # to create pull request (changesets/action)
steps:
- name: Check out repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- uses: ./.github/actions/ci-setup
with:
skip-cache: true # avoid cache poisoning attacks
- name: Build
run: pnpm build
- name: Create or update release pull request
id: changesets
uses: ./
with:
version: pnpm bump
publish:
name: Publish
if: needs.version.outputs.hasChangesets == 'false'
needs: version
runs-on: ubuntu-latest
environment: marketplace
timeout-minutes: 20
permissions:
contents: write # to create release and have it authored by github-actions (changesets/action)
steps:
- uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
id: app-token
with:
client-id: ${{ vars.APP_CLIENT_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Check out repo
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: true
# we need this token to bypass the branch and tag protection rules
token: ${{ steps.app-token.outputs.token }}
- uses: ./.github/actions/ci-setup
with:
skip-cache: true # avoid cache poisoning attacks
- name: Build
run: pnpm build
- name: Publish to marketplace
uses: ./
with:
publish: pnpm release
+35
View File
@@ -0,0 +1,35 @@
name: Version or Publish
on:
push:
branches:
- main
concurrency: ${{ github.workflow }}-${{ github.ref }}
jobs:
changesets:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20.x
- name: Install Dependencies
run: yarn --frozen-lockfile
- name: Build
run: yarn build
- name: Create Release Pull Request or Publish
id: changesets
uses: ./
with:
version: yarn bump
publish: yarn release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-1
View File
@@ -1 +0,0 @@
v24.11.0
-7
View File
@@ -1,7 +0,0 @@
{
"$schema": "./node_modules/oxfmt/configuration_schema.json",
"printWidth": 80,
"sortImports": {
"newlinesBetween": false
}
}
-16
View File
@@ -1,16 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Debug Current Test File",
"autoAttachChildProcesses": true,
"skipFiles": [],
"program": "${workspaceRoot}/node_modules/vitest/vitest.mjs",
"args": ["run", "${relativeFile}"],
"smartStep": true,
"console": "integratedTerminal"
}
]
}
-4
View File
@@ -1,4 +0,0 @@
{
"js/ts.tsdk.path": "node_modules/typescript/lib",
"editor.defaultFormatter": "oxc.oxc-vscode"
}
-48
View File
@@ -1,53 +1,5 @@
# @changesets/action # @changesets/action
## 1.8.0
### Minor Changes
- [#258](https://github.com/changesets/action/pull/258) [`f5dbf72`](https://github.com/changesets/action/commit/f5dbf72f96949cb0daf45152f0f63062df70e97d) Thanks [@tom-sherman](https://github.com/tom-sherman)! - Support draft version PR modes with a new `prDraft` input. Use `create` to create new version PRs as drafts, or `always` to also convert existing version PRs back to draft when updating them.
### Patch Changes
- [#502](https://github.com/changesets/action/pull/502) [`6002dbd`](https://github.com/changesets/action/commit/6002dbd987f49a3c0a134910d9c7bca975b79977) Thanks [@oshytiko](https://github.com/oshytiko)! - Fixed initial `.changeset` state being picked up, when `cwd` parameter is provided
- [#536](https://github.com/changesets/action/pull/536) [`81b3f61`](https://github.com/changesets/action/commit/81b3f61ebffcb868f73e4c0b2682517149c834a2) Thanks [@radnan](https://github.com/radnan)! - Fixed `.changeset` state being picked for the version command when `cwd` parameter is provided
## 1.7.0
### Minor Changes
- [#564](https://github.com/changesets/action/pull/564) [`935fe87`](https://github.com/changesets/action/commit/935fe876b0054dfc962ac86bcddf028460040d46) Thanks [@Andarist](https://github.com/Andarist)! - Automatically use the GitHub-provided token to allow most users to avoid explicit `GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}` configuration.
### Patch Changes
- [#545](https://github.com/changesets/action/pull/545) [`54220dd`](https://github.com/changesets/action/commit/54220dd92c06e7da112b139f95d8beb933e4cdde) Thanks [@ryanbas21](https://github.com/ryanbas21)! - The `.npmrc` generation now intelligently handles both traditional NPM token authentication and trusted publishing scenarios by only appending the auth token when `NPM_TOKEN` is defined. This prevents 'undefined' from being written to the registry configuration when using OIDC tokens from GitHub Actions trusted publishing.
- [#563](https://github.com/changesets/action/pull/563) [`6af4a7e`](https://github.com/changesets/action/commit/6af4a7ec080d23ac6b304f69b67fd0aa92e089e7) Thanks [@Andarist](https://github.com/Andarist)! - Don't error on already committed symlinks and executables that stay untouched
## 1.6.0
### Minor Changes
- [#558](https://github.com/changesets/action/pull/558) [`342005d`](https://github.com/changesets/action/commit/342005d41242bccd9dd9ae8d3679efce96af48ae) Thanks [@harsha-venugopal-ledn](https://github.com/harsha-venugopal-ledn)! - Upgrade from Node.js 20 to Node.js 24 LTS
## 1.5.3
### Patch Changes
- [#477](https://github.com/changesets/action/pull/477) [`9d933dc`](https://github.com/changesets/action/commit/9d933dcd11c284ac49a835db884c3c1008b2b96f) Thanks [@Andarist](https://github.com/Andarist)! - Updated `@actions/*` and `@octokit/*` dependencies.
- [#479](https://github.com/changesets/action/pull/479) [`cf373e4`](https://github.com/changesets/action/commit/cf373e45c90a0cc564cd2770de3e9a3a4cdd4603) Thanks [@Andarist](https://github.com/Andarist)! - Switched to `esbuild` for bundling the dist file. This led to 45% file size reduction.
- [#488](https://github.com/changesets/action/pull/488) [`022692b`](https://github.com/changesets/action/commit/022692ba027b33bf46d4d41907a317fbf04461a7) Thanks [@s0](https://github.com/s0)! - Fix PRs sometimes not getting reopened with `commitMode: github-api`
There was a race-condition that means sometimes existing PRs would not be found,
and new PRs would be opened. This has now been fixed by fetching existing PRs
before making any changes.
- [#486](https://github.com/changesets/action/pull/486) [`7ed1955`](https://github.com/changesets/action/commit/7ed195554624ebd75c08aa477b53110f61cc78f7) Thanks [@s0](https://github.com/s0)! - Fixed situations in which `cwd` was specified as a relative path and used with (default) `commitMode: git-cli`
- [#461](https://github.com/changesets/action/pull/461) [`e9c36b6`](https://github.com/changesets/action/commit/e9c36b696406360bf04204ad32e3dcf3ad752b77) Thanks [@nayounsang](https://github.com/nayounsang)! - Avoid hitting a deprecation warning when encountering errors from `@octokit/request-error`
## 1.5.2 ## 1.5.2
### Patch Changes ### Patch Changes
-21
View File
@@ -1,21 +0,0 @@
MIT License
Copyright (c) Changesets team and other contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+33 -39
View File
@@ -14,14 +14,13 @@ This action for [Changesets](https://github.com/changesets/changesets) creates a
- createGithubReleases - A boolean value to indicate whether to create Github releases after `publish` or not. Default to `true` - createGithubReleases - A boolean value to indicate whether to create Github releases after `publish` or not. Default to `true`
- commitMode - Specifies the commit mode. Use `"git-cli"` to push changes using the Git CLI, or `"github-api"` to push changes via the GitHub API. When using `"github-api"`, all commits and tags are GPG-signed and attributed to the user or app who owns the `GITHUB_TOKEN`. Default to `git-cli`. - commitMode - Specifies the commit mode. Use `"git-cli"` to push changes using the Git CLI, or `"github-api"` to push changes via the GitHub API. When using `"github-api"`, all commits and tags are GPG-signed and attributed to the user or app who owns the `GITHUB_TOKEN`. Default to `git-cli`.
- cwd - Changes node's `process.cwd()` if the project is not located on the root. Default to `process.cwd()` - cwd - Changes node's `process.cwd()` if the project is not located on the root. Default to `process.cwd()`
- prDraft - Controls draft PR behavior. Use `create` to create new version PRs as draft, or `always` to also convert existing version PRs back to draft when updating them. By default, version PRs are not forced into draft mode.
### Outputs ### Outputs
- published - A boolean value to indicate whether a publishing has happened or not - published - A boolean value to indicate whether a publishing has happened or not
- publishedPackages - A JSON array to present the published packages. The format is `[{"name": "@xx/xx", "version": "1.2.0"}, {"name": "@xx/xy", "version": "0.8.9"}]` - publishedPackages - A JSON array to present the published packages. The format is `[{"name": "@xx/xx", "version": "1.2.0"}, {"name": "@xx/xy", "version": "0.8.9"}]`
### Example workflow ### Example workflow:
#### Without Publishing #### Without Publishing
@@ -43,21 +42,20 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v6 uses: actions/checkout@v3
- name: Setup pnpm - name: Setup Node.js 20
uses: pnpm/action-setup@v6 uses: actions/setup-node@v3
- name: Setup Node.js 26
uses: actions/setup-node@v6
with: with:
node-version: 26 node-version: 20
- name: Install Dependencies - name: Install Dependencies
run: pnpm install --frozen-lockfile run: yarn
- name: Create Release Pull Request - name: Create Release Pull Request
uses: changesets/action@v1 uses: changesets/action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
``` ```
#### With Publishing #### With Publishing
@@ -80,26 +78,24 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v6 uses: actions/checkout@v3
- name: Setup pnpm - name: Setup Node.js 20.x
uses: pnpm/action-setup@v6 uses: actions/setup-node@v3
- name: Setup Node.js 26
uses: actions/setup-node@v6
with: with:
node-version: 26 node-version: 20.x
- name: Install Dependencies - name: Install Dependencies
run: pnpm install --frozen-lockfile run: yarn
- name: Create Release Pull Request or Publish to npm - name: Create Release Pull Request or Publish to npm
id: changesets id: changesets
uses: changesets/action@v1 uses: changesets/action@v1
with: with:
# This expects you to have a script called release which does a build for your packages and calls changeset publish # This expects you to have a script called release which does a build for your packages and calls changeset publish
publish: pnpm release publish: yarn release
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Send a Slack notification if a publish happens - name: Send a Slack notification if a publish happens
@@ -110,7 +106,7 @@ jobs:
By default the GitHub Action creates a `.npmrc` file with the following content: By default the GitHub Action creates a `.npmrc` file with the following content:
```txt ```
//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN} //registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}
``` ```
@@ -147,27 +143,26 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v6 uses: actions/checkout@v3
- name: Setup pnpm - name: Setup Node.js 20.x
uses: pnpm/action-setup@v6 uses: actions/setup-node@v3
- name: Setup Node.js 26
uses: actions/setup-node@v6
with: with:
node-version: 26 node-version: 20.x
- name: Install Dependencies - name: Install Dependencies
run: pnpm install --frozen-lockfile run: yarn
- name: Create Release Pull Request or Publish to npm - name: Create Release Pull Request or Publish to npm
id: changesets id: changesets
uses: changesets/action@v1 uses: changesets/action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish - name: Publish
if: steps.changesets.outputs.hasChangesets == 'false' if: steps.changesets.outputs.hasChangesets == 'false'
# You can do something when a publish should happen. # You can do something when a publish should happen.
run: pnpm publish run: yarn publish
``` ```
#### With version script #### With version script
@@ -192,24 +187,23 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v6 uses: actions/checkout@v3
- name: Setup pnpm - name: Setup Node.js 20.x
uses: pnpm/action-setup@v6 uses: actions/setup-node@v3
- name: Setup Node.js 26
uses: actions/setup-node@v6
with: with:
node-version: 26 node-version: 20.x
- name: Install Dependencies - name: Install Dependencies
run: pnpm install --frozen-lockfile run: yarn
- name: Create Release Pull Request - name: Create Release Pull Request
uses: changesets/action@v1 uses: changesets/action@v1
with: with:
# this expects you to have a npm script called version that runs some logic and then calls `changeset version`. # this expects you to have a npm script called version that runs some logic and then calls `changeset version`.
version: pnpm version version: yarn version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
``` ```
#### With Yarn 2 / Plug'n'Play #### With Yarn 2 / Plug'n'Play
@@ -220,5 +214,5 @@ If you are using [Yarn Plug'n'Play](https://yarnpkg.com/features/pnp), you shoul
- uses: changesets/action@v1 - uses: changesets/action@v1
with: with:
version: yarn changeset version version: yarn changeset version
# ... ...
``` ```
@@ -0,0 +1,4 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.3.0/schema.json",
"ignore": ["ignored-package-pkg-a"]
}
@@ -0,0 +1,8 @@
{
"private": true,
"name": "ignored-package",
"version": "1.0.0",
"workspaces": [
"packages/*"
]
}
@@ -0,0 +1,7 @@
{
"name": "ignored-package-pkg-a",
"version": "1.0.0",
"dependencies": {
"ignored-package-pkg-b": "1.0.0"
}
}
@@ -0,0 +1,4 @@
{
"name": "ignored-package-pkg-b",
"version": "1.0.0"
}
@@ -0,0 +1,3 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.3.0/schema.json"
}
+8
View File
@@ -0,0 +1,8 @@
{
"private": true,
"name": "simple-project",
"version": "1.0.0",
"workspaces": [
"packages/*"
]
}
@@ -0,0 +1,7 @@
{
"name": "simple-project-pkg-a",
"version": "1.0.0",
"dependencies": {
"simple-project-pkg-b": "1.0.0"
}
}
@@ -0,0 +1,4 @@
{
"name": "simple-project-pkg-b",
"version": "1.0.0"
}
+1 -8
View File
@@ -1,13 +1,9 @@
name: Changesets name: Changesets
description: A GitHub action to automate releases with Changesets description: A GitHub action to automate releases with Changesets
runs: runs:
using: "node24" using: "node20"
main: "dist/index.js" main: "dist/index.js"
inputs: inputs:
github-token:
description: "The GitHub token to use for authentication. Defaults to the GitHub-provided token."
required: false
default: ${{ github.token }}
publish: publish:
description: "The command to use to build and publish packages" description: "The command to use to build and publish packages"
required: false required: false
@@ -43,9 +39,6 @@ inputs:
branch: branch:
description: Sets the branch in which the action will run. Default to `github.ref_name` if not provided description: Sets the branch in which the action will run. Default to `github.ref_name` if not provided
required: false required: false
prDraft:
description: 'Controls draft PR behavior. Use "create" to create new version PRs as draft, or "always" to also convert existing version PRs back to draft when updating them.'
required: false
outputs: outputs:
published: published:
description: A boolean value to indicate whether a publishing is happened or not description: A boolean value to indicate whether a publishing is happened or not
+67
View File
File diff suppressed because one or more lines are too long
+46 -40
View File
@@ -1,57 +1,63 @@
{ {
"name": "@changesets/action", "name": "@changesets/action",
"version": "1.8.0", "version": "1.5.2",
"main": "dist/index.js",
"license": "MIT", "license": "MIT",
"type": "module", "devDependencies": {
"exports": "./dist/index.js", "@babel/core": "^7.13.10",
"files": [ "@babel/preset-env": "^7.13.10",
"dist", "@babel/preset-typescript": "^7.13.0",
"action.yml" "@changesets/changelog-github": "^0.4.2",
], "@changesets/cli": "^2.20.0",
"@changesets/write": "^0.1.6",
"@types/fs-extra": "^8.0.0",
"@types/jest": "^29.5.1",
"@types/node": "^20.11.17",
"@types/semver": "^7.5.0",
"@vercel/ncc": "^0.36.1",
"babel-jest": "^29.5.0",
"fixturez": "^1.1.0",
"husky": "^3.0.3",
"jest": "^29.5.0",
"prettier": "^2.0.5",
"typescript": "^5.0.4"
},
"scripts": { "scripts": {
"build": "rolldown -c", "build": "ncc build src/index.ts -o dist --transpile-only --minify",
"test": "vitest", "test": "jest",
"test:watch": "pnpm test --watch", "test:watch": "yarn test --watch",
"typecheck": "tsc",
"format": "oxfmt --check",
"format:fix": "oxfmt",
"changeset": "changeset", "changeset": "changeset",
"bump": "node --experimental-strip-types ./scripts/bump.ts", "bump": "node ./scripts/bump.js",
"release": "node --experimental-strip-types ./scripts/release.ts" "release": "node ./scripts/release.js"
},
"engines": {
"node": ">= 20"
}, },
"dependencies": { "dependencies": {
"@actions/core": "^3.0.1", "@actions/core": "^1.10.0",
"@actions/exec": "^3.0.0", "@actions/exec": "^1.1.1",
"@actions/github": "^9.1.1", "@actions/github": "^5.1.1",
"@changesets/ghcommit": "^2.0.1", "@changesets/ghcommit": "1.4.0",
"@changesets/pre": "^2.0.2", "@changesets/pre": "^1.0.9",
"@changesets/read": "^0.6.5", "@changesets/read": "^0.5.3",
"@manypkg/get-packages": "^1.1.3", "@manypkg/get-packages": "^1.1.3",
"@octokit/core": "^7.0.6", "@octokit/plugin-throttling": "^5.2.1",
"@octokit/plugin-throttling": "^11.0.3", "fs-extra": "^8.1.0",
"@types/mdast": "^3.0.0",
"mdast-util-to-string": "^1.0.6", "mdast-util-to-string": "^1.0.6",
"remark-parse": "^7.0.1", "remark-parse": "^7.0.1",
"remark-stringify": "^7.0.3", "remark-stringify": "^7.0.3",
"resolve-from": "^5.0.0",
"semver": "^7.5.3", "semver": "^7.5.3",
"unified": "^8.3.2" "unified": "^8.3.2"
}, },
"devDependencies": { "husky": {
"@changesets/changelog-github": "^0.5.1", "hooks": {}
"@changesets/cli": "^2.29.3",
"@changesets/types": "^6.1.0",
"@changesets/write": "^0.4.0",
"@types/node": "^24.12.2",
"@types/semver": "^7.5.0",
"fs-fixture": "^2.13.0",
"oxfmt": "^0.48.0",
"pkg-pr-new": "^0.0.71",
"rolldown": "^1.0.1",
"typescript": "^5.8.3",
"vitest": "^4.1.6"
}, },
"engines": { "prettier": {},
"node": ">=24" "resolutions": {
"**/@octokit/core": "4.2.0",
"trim": "^0.0.3",
"y18n": "^4.0.1"
}, },
"packageManager": "pnpm@11.1.1+sha512.d1fdf5f73c617b64fa1a56a81c3c8dfe0e966e33a6010aa256b517ae77be21d93e05affc0de1a83b0e4f29d569f68b446ae8f068cd7247c0bb3df0fb4d7bdf9a" "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
} }
-2697
View File
File diff suppressed because it is too large Load Diff
-17
View File
@@ -1,17 +0,0 @@
blockExoticSubdeps: true
dedupePeers: true
dedupePeerDependents: true
minimumReleaseAge: 10080
minimumReleaseAgeExclude:
- '@oxc-project/*'
- '@rolldown/*'
- rolldown@1.0.1
- vite@8.0.13
- vitest@4.1.6
overrides:
lightningcss: '-' # we do not bundle any css
postcss: '-' # we do not bundle any css
shellEmulator: true
trustPolicy: no-downgrade
-13
View File
@@ -1,13 +0,0 @@
import { defineConfig } from 'rolldown'
export default defineConfig({
input: 'src/index.ts',
output: {
dir: 'dist',
format: 'esm',
cleanDir: true,
minify: true,
comments: false,
},
platform: 'node',
})
+19
View File
@@ -0,0 +1,19 @@
const fs = require("fs");
const path = require("path");
const { exec } = require("@actions/exec");
process.chdir(path.join(__dirname, ".."));
(async () => {
await exec("changeset", ["version"]);
const releaseLine = `v${require("../package.json").version.split(".")[0]}`;
const readmePath = path.join(__dirname, "..", "README.md");
const content = fs.readFileSync(readmePath, "utf8");
const updatedContent = content.replace(
/changesets\/action@[^\s]+/g,
`changesets/action@${releaseLine}`
);
fs.writeFileSync(readmePath, updatedContent);
})();
-18
View File
@@ -1,18 +0,0 @@
import fs from "node:fs";
import path from "node:path";
import { exec } from "@actions/exec";
import pkgJson from "../package.json" with { type: "json" };
process.chdir(path.join(import.meta.dirname, ".."));
await exec("changeset", ["version"]);
const releaseLine = `v${pkgJson.version.split(".")[0]}`;
const readmePath = path.join(import.meta.dirname, "..", "README.md");
const content = fs.readFileSync(readmePath, "utf8");
const updatedContent = content.replace(
/changesets\/action@[^\s]+/g,
`changesets/action@${releaseLine}`,
);
fs.writeFileSync(readmePath, updatedContent);
+8 -8
View File
@@ -1,11 +1,11 @@
import path from "node:path"; const path = require("path");
import { exec, getExecOutput } from "@actions/exec"; const { exec, getExecOutput } = require("@actions/exec");
import pkgJson from "../package.json" with { type: "json" };
const tag = `v${pkgJson.version}`; const { version } = require("../package.json");
const releaseLine = `v${pkgJson.version.split(".")[0]}`; const tag = `v${version}`;
const releaseLine = `v${version.split(".")[0]}`;
process.chdir(path.join(import.meta.dirname, "..")); process.chdir(path.join(__dirname, ".."));
(async () => { (async () => {
const { exitCode, stderr } = await getExecOutput( const { exitCode, stderr } = await getExecOutput(
@@ -13,11 +13,11 @@ process.chdir(path.join(import.meta.dirname, ".."));
["ls-remote", "--exit-code", "origin", "--tags", `refs/tags/${tag}`], ["ls-remote", "--exit-code", "origin", "--tags", `refs/tags/${tag}`],
{ {
ignoreReturnCode: true, ignoreReturnCode: true,
}, }
); );
if (exitCode === 0) { if (exitCode === 0) {
console.log( console.log(
`Action is not being published because version ${tag} is already published`, `Action is not being published because version ${tag} is already published`
); );
return; return;
} }
+12 -131
View File
@@ -1,6 +1,6 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`version > creates a draft PR when prDraft is "create" 1`] = ` exports[`version creates simple PR 1`] = `
[ [
{ {
"base": "some-branch", "base": "some-branch",
@@ -8,30 +8,7 @@ exports[`version > creates a draft PR when prDraft is "create" 1`] = `
# Releases # Releases
## changesets-dev-simple-project-pkg-a@1.1.0 ## simple-project-pkg-a@1.1.0
### Minor Changes
- Awesome feature
",
"draft": true,
"head": "changeset-release/some-branch",
"owner": "changesets",
"repo": "action",
"title": "Version Packages",
},
]
`;
exports[`version > creates simple PR 1`] = `
[
{
"base": "some-branch",
"body": "This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and publish to npm yourself or [setup this action to publish automatically](https://github.com/changesets/action#with-publishing). If you're not ready to do a release yet, that's fine, whenever you add more changesets to some-branch, this PR will be updated.
# Releases
## changesets-dev-simple-project-pkg-a@1.1.0
### Minor Changes ### Minor Changes
@@ -40,15 +17,14 @@ exports[`version > creates simple PR 1`] = `
### Patch Changes ### Patch Changes
- Updated dependencies - Updated dependencies
- changesets-dev-simple-project-pkg-b@1.1.0 - simple-project-pkg-b@1.1.0
## changesets-dev-simple-project-pkg-b@1.1.0 ## simple-project-pkg-b@1.1.0
### Minor Changes ### Minor Changes
- Awesome feature - Awesome feature
", ",
"draft": false,
"head": "changeset-release/some-branch", "head": "changeset-release/some-branch",
"owner": "changesets", "owner": "changesets",
"repo": "action", "repo": "action",
@@ -57,7 +33,7 @@ exports[`version > creates simple PR 1`] = `
] ]
`; `;
exports[`version > does not include any release information if a message with simplified release info exceeds size limit 1`] = ` exports[`version does not include any release information if a message with simplified release info exceeds size limit 1`] = `
[ [
{ {
"base": "some-branch", "base": "some-branch",
@@ -67,7 +43,6 @@ exports[`version > does not include any release information if a message with si
# Releases # Releases
> All release information have been omitted from this message, as the content exceeds the size limit.", > All release information have been omitted from this message, as the content exceeds the size limit.",
"draft": false,
"head": "changeset-release/some-branch", "head": "changeset-release/some-branch",
"owner": "changesets", "owner": "changesets",
"repo": "action", "repo": "action",
@@ -76,7 +51,7 @@ exports[`version > does not include any release information if a message with si
] ]
`; `;
exports[`version > does not include changelog entries if full message exceeds size limit 1`] = ` exports[`version does not include changelog entries if full message exceeds size limit 1`] = `
[ [
{ {
"base": "some-branch", "base": "some-branch",
@@ -87,10 +62,9 @@ exports[`version > does not include changelog entries if full message exceeds si
> The changelog information of each package has been omitted from this message, as the content exceeds the size limit. > The changelog information of each package has been omitted from this message, as the content exceeds the size limit.
## changesets-dev-simple-project-pkg-a@1.1.0 ## simple-project-pkg-a@1.1.0
", ",
"draft": false,
"head": "changeset-release/some-branch", "head": "changeset-release/some-branch",
"owner": "changesets", "owner": "changesets",
"repo": "action", "repo": "action",
@@ -99,7 +73,7 @@ exports[`version > does not include changelog entries if full message exceeds si
] ]
`; `;
exports[`version > doesn't include ignored package that got a dependency update in the PR body 1`] = ` exports[`version doesn't include ignored package that got a dependency update in the PR body 1`] = `
[ [
{ {
"base": "some-branch", "base": "some-branch",
@@ -107,13 +81,12 @@ exports[`version > doesn't include ignored package that got a dependency update
# Releases # Releases
## changesets-dev-ignored-package-pkg-b@1.1.0 ## ignored-package-pkg-b@1.1.0
### Minor Changes ### Minor Changes
- Awesome feature - Awesome feature
", ",
"draft": false,
"head": "changeset-release/some-branch", "head": "changeset-release/some-branch",
"owner": "changesets", "owner": "changesets",
"repo": "action", "repo": "action",
@@ -122,7 +95,7 @@ exports[`version > doesn't include ignored package that got a dependency update
] ]
`; `;
exports[`version > only includes bumped packages in the PR body 1`] = ` exports[`version only includes bumped packages in the PR body 1`] = `
[ [
{ {
"base": "some-branch", "base": "some-branch",
@@ -130,13 +103,12 @@ exports[`version > only includes bumped packages in the PR body 1`] = `
# Releases # Releases
## changesets-dev-simple-project-pkg-a@1.1.0 ## simple-project-pkg-a@1.1.0
### Minor Changes ### Minor Changes
- Awesome feature - Awesome feature
", ",
"draft": false,
"head": "changeset-release/some-branch", "head": "changeset-release/some-branch",
"owner": "changesets", "owner": "changesets",
"repo": "action", "repo": "action",
@@ -144,94 +116,3 @@ exports[`version > only includes bumped packages in the PR body 1`] = `
}, },
] ]
`; `;
exports[`version > updates an existing PR via GraphQL and converts it to draft when prDraft is "always" 1`] = `
[
"
mutation UpdatePullRequest(
$pullRequestId: ID!
$title: String!
$body: String!
) {
convertPullRequestToDraft(
input: {
pullRequestId: $pullRequestId
}
) {
pullRequest {
id
}
}
updatePullRequest(
input: {
pullRequestId: $pullRequestId
title: $title
body: $body
state: OPEN
}
) {
pullRequest {
id
}
}
}
",
{
"body": "This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and publish to npm yourself or [setup this action to publish automatically](https://github.com/changesets/action#with-publishing). If you're not ready to do a release yet, that's fine, whenever you add more changesets to some-branch, this PR will be updated.
# Releases
## changesets-dev-simple-project-pkg-a@1.1.0
### Minor Changes
- Awesome feature
",
"pullRequestId": "PR_kwDOA",
"title": "Version Packages",
},
]
`;
exports[`version > updates an existing PR via GraphQL without converting it to draft when prDraft is "create" 1`] = `
[
"
mutation UpdatePullRequest(
$pullRequestId: ID!
$title: String!
$body: String!
) {
updatePullRequest(
input: {
pullRequestId: $pullRequestId
title: $title
body: $body
state: OPEN
}
) {
pullRequest {
id
}
}
}
",
{
"body": "This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and publish to npm yourself or [setup this action to publish automatically](https://github.com/changesets/action#with-publishing). If you're not ready to do a release yet, that's fine, whenever you add more changesets to some-branch, this PR will be updated.
# Releases
## changesets-dev-simple-project-pkg-a@1.1.0
### Minor Changes
- Awesome feature
",
"pullRequestId": "PR_kwDOA",
"title": "Version Packages",
},
]
`;
+1 -1
View File
@@ -1,4 +1,4 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`it sorts the things right 1`] = ` exports[`it sorts the things right 1`] = `
[ [
+5 -5
View File
@@ -2,7 +2,7 @@ import * as core from "@actions/core";
import { exec, getExecOutput } from "@actions/exec"; import { exec, getExecOutput } from "@actions/exec";
import * as github from "@actions/github"; import * as github from "@actions/github";
import { commitChangesFromRepo } from "@changesets/ghcommit/git"; import { commitChangesFromRepo } from "@changesets/ghcommit/git";
import type { Octokit } from "./octokit.ts"; import { Octokit } from "./octokit";
type GitOptions = { type GitOptions = {
cwd: string; cwd: string;
@@ -14,7 +14,7 @@ const push = async (branch: string, options: GitOptions) => {
const switchToMaybeExistingBranch = async ( const switchToMaybeExistingBranch = async (
branch: string, branch: string,
options: GitOptions, options: GitOptions
) => { ) => {
let { stderr } = await getExecOutput("git", ["checkout", branch], { let { stderr } = await getExecOutput("git", ["checkout", branch], {
ignoreReturnCode: true, ignoreReturnCode: true,
@@ -41,7 +41,7 @@ const checkIfClean = async (options: GitOptions): Promise<boolean> => {
const { stdout } = await getExecOutput( const { stdout } = await getExecOutput(
"git", "git",
["status", "--porcelain"], ["status", "--porcelain"],
options, options
); );
return !stdout.length; return !stdout.length;
}; };
@@ -71,7 +71,7 @@ export class Git {
], ],
{ {
cwd: this.cwd, cwd: this.cwd,
}, }
); );
} }
@@ -117,7 +117,7 @@ export class Git {
base: { base: {
commit: github.context.sha, commit: github.context.sha,
}, },
cwd: this.cwd, addFromDirectory,
force: true, force: true,
}); });
} }
+38 -63
View File
@@ -1,41 +1,36 @@
import fs from "node:fs/promises";
import path from "node:path";
import * as core from "@actions/core"; import * as core from "@actions/core";
import { Git } from "./git.ts"; import fs from "fs-extra";
import { setupOctokit } from "./octokit.ts"; import { Git } from "./git";
import readChangesetState from "./readChangesetState.ts"; import { setupOctokit } from "./octokit";
import { runPublish, runVersion } from "./run.ts"; import readChangesetState from "./readChangesetState";
import { fileExists } from "./utils.ts"; import { runPublish, runVersion } from "./run";
const getOptionalInput = (name: string) => core.getInput(name) || undefined; const getOptionalInput = (name: string) => core.getInput(name) || undefined;
(async () => { (async () => {
// to maintain compatibility with workflows created before github-token input was introduced let githubToken = process.env.GITHUB_TOKEN;
// it's important to prefer the explicitly set GITHUB_TOKEN over the default token coming from github.token
let githubToken = process.env.GITHUB_TOKEN || core.getInput("github-token");
if (!githubToken) { if (!githubToken) {
core.setFailed("Please add the GITHUB_TOKEN to the changesets action"); core.setFailed("Please add the GITHUB_TOKEN to the changesets action");
return; return;
} }
const cwd = path.resolve(getOptionalInput("cwd") ?? ""); const inputCwd = getOptionalInput("cwd");
core.info(`using resolved cwd: ${cwd}`); if (inputCwd) {
core.info("changing directory to the one given as the input");
process.chdir(inputCwd);
}
const cwd = inputCwd || process.cwd();
const octokit = setupOctokit(githubToken); const octokit = setupOctokit(githubToken);
const commitMode = getOptionalInput("commitMode") ?? "git-cli"; const commitMode = getOptionalInput("commitMode") ?? "git-cli";
const prDraft = getOptionalInput("prDraft");
if (commitMode !== "git-cli" && commitMode !== "github-api") { if (commitMode !== "git-cli" && commitMode !== "github-api") {
core.setFailed(`Invalid commit mode: ${commitMode}`); core.setFailed(`Invalid commit mode: ${commitMode}`);
return; return;
} }
if (prDraft !== undefined && prDraft !== "always" && prDraft !== "create") {
core.setFailed(`Invalid prDraft: ${prDraft}`);
return;
}
const git = new Git({ const git = new Git({
octokit: commitMode === "github-api" ? octokit : undefined, octokit: commitMode === "github-api" ? octokit : undefined,
cwd, cwd
}); });
let setupGitUser = core.getBooleanInput("setupGitUser"); let setupGitUser = core.getBooleanInput("setupGitUser");
@@ -48,15 +43,15 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
core.info("setting GitHub credentials"); core.info("setting GitHub credentials");
await fs.writeFile( await fs.writeFile(
`${process.env.HOME}/.netrc`, `${process.env.HOME}/.netrc`,
`machine github.com\nlogin github-actions[bot]\npassword ${githubToken}`, `machine github.com\nlogin github-actions[bot]\npassword ${githubToken}`
); );
let { changesets } = await readChangesetState(cwd); let { changesets } = await readChangesetState();
let publishScript = core.getInput("publish"); let publishScript = core.getInput("publish");
let hasChangesets = changesets.length !== 0; let hasChangesets = changesets.length !== 0;
const hasNonEmptyChangesets = changesets.some( const hasNonEmptyChangesets = changesets.some(
(changeset) => changeset.releases.length > 0, (changeset) => changeset.releases.length > 0
); );
let hasPublishScript = !!publishScript; let hasPublishScript = !!publishScript;
@@ -67,62 +62,45 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
switch (true) { switch (true) {
case !hasChangesets && !hasPublishScript: case !hasChangesets && !hasPublishScript:
core.info( core.info(
"No changesets present or were removed by merging release PR. Not publishing because no publish script found.", "No changesets present or were removed by merging release PR. Not publishing because no publish script found."
); );
return; return;
case !hasChangesets && hasPublishScript: { case !hasChangesets && hasPublishScript: {
core.info( core.info(
"No changesets found. Attempting to publish any unpublished packages to npm", "No changesets found. Attempting to publish any unpublished packages to npm"
); );
if (process.env.NPM_TOKEN) { let userNpmrcPath = `${process.env.HOME}/.npmrc`;
const userNpmrcPath = `${process.env.HOME}/.npmrc`; if (fs.existsSync(userNpmrcPath)) {
core.info("Found existing user .npmrc file");
if (await fileExists(userNpmrcPath)) { const userNpmrcContent = await fs.readFile(userNpmrcPath, "utf8");
core.info("Found existing user .npmrc file"); const authLine = userNpmrcContent.split("\n").find((line) => {
const userNpmrcContent = await fs.readFile(userNpmrcPath, "utf8"); // check based on https://github.com/npm/cli/blob/8f8f71e4dd5ee66b3b17888faad5a7bf6c657eed/test/lib/adduser.js#L103-L105
const authLine = userNpmrcContent.split("\n").find((line) => { return /^\s*\/\/registry\.npmjs\.org\/:[_-]authToken=/i.test(line);
// check based on https://github.com/npm/cli/blob/8f8f71e4dd5ee66b3b17888faad5a7bf6c657eed/test/lib/adduser.js#L103-L105 });
return /^\s*\/\/registry\.npmjs\.org\/:[_-]authToken=/i.test(line); if (authLine) {
}); core.info(
if (authLine) { "Found existing auth token for the npm registry in the user .npmrc file"
core.info( );
"Found existing auth token for the npm registry in the user .npmrc file",
);
} else {
core.info(
"Didn't find existing auth token for the npm registry in the user .npmrc file, creating one",
);
await fs.appendFile(
userNpmrcPath,
`\n//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`,
);
}
} else { } else {
core.info( core.info(
"No user .npmrc file found, creating one with NPM_TOKEN used as auth token", "Didn't find existing auth token for the npm registry in the user .npmrc file, creating one"
); );
await fs.writeFile( fs.appendFileSync(
userNpmrcPath, userNpmrcPath,
`//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`, `\n//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`
); );
} }
} else if (
process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN &&
process.env.ACTIONS_ID_TOKEN_REQUEST_URL
) {
core.info(
"No NPM_TOKEN found, but OIDC is available - using npm trusted publishing",
);
} else { } else {
core.info( core.info("No user .npmrc file found, creating one");
"No NPM_TOKEN or OIDC available - assuming npm is already authenticated", fs.writeFileSync(
userNpmrcPath,
`//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`
); );
} }
const result = await runPublish({ const result = await runPublish({
script: publishScript, script: publishScript,
githubToken,
git, git,
octokit, octokit,
createGithubReleases: core.getBooleanInput("createGithubReleases"), createGithubReleases: core.getBooleanInput("createGithubReleases"),
@@ -133,7 +111,7 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
core.setOutput("published", "true"); core.setOutput("published", "true");
core.setOutput( core.setOutput(
"publishedPackages", "publishedPackages",
JSON.stringify(result.publishedPackages), JSON.stringify(result.publishedPackages)
); );
} }
return; return;
@@ -145,14 +123,11 @@ const getOptionalInput = (name: string) => core.getInput(name) || undefined;
const octokit = setupOctokit(githubToken); const octokit = setupOctokit(githubToken);
const { pullRequestNumber } = await runVersion({ const { pullRequestNumber } = await runVersion({
script: getOptionalInput("version"), script: getOptionalInput("version"),
githubToken,
git, git,
octokit, octokit,
cwd,
prTitle: getOptionalInput("title"), prTitle: getOptionalInput("title"),
commitMessage: getOptionalInput("commit"), commitMessage: getOptionalInput("commit"),
hasPublishScript, hasPublishScript,
prDraft,
branch: getOptionalInput("branch"), branch: getOptionalInput("branch"),
}); });
+7 -9
View File
@@ -1,15 +1,14 @@
import * as core from "@actions/core"; import * as core from "@actions/core";
import { getOctokit } from "@actions/github"; import { GitHub, getOctokitOptions } from "@actions/github/lib/utils";
import { throttling } from "@octokit/plugin-throttling"; import { throttling } from "@octokit/plugin-throttling";
export const setupOctokit = (githubToken: string) => { export const setupOctokit = (githubToken: string) => {
return getOctokit( return new (GitHub.plugin(throttling))(
githubToken, getOctokitOptions(githubToken, {
{
throttle: { throttle: {
onRateLimit: (retryAfter, options: any, octokit, retryCount) => { onRateLimit: (retryAfter, options: any, octokit, retryCount) => {
core.warning( core.warning(
`Request quota exhausted for request ${options.method} ${options.url}`, `Request quota exhausted for request ${options.method} ${options.url}`
); );
if (retryCount <= 2) { if (retryCount <= 2) {
@@ -21,10 +20,10 @@ export const setupOctokit = (githubToken: string) => {
retryAfter, retryAfter,
options: any, options: any,
octokit, octokit,
retryCount, retryCount
) => { ) => {
core.warning( core.warning(
`SecondaryRateLimit detected for request ${options.method} ${options.url}`, `SecondaryRateLimit detected for request ${options.method} ${options.url}`
); );
if (retryCount <= 2) { if (retryCount <= 2) {
@@ -33,8 +32,7 @@ export const setupOctokit = (githubToken: string) => {
} }
}, },
}, },
}, })
throttling,
); );
}; };
+2 -2
View File
@@ -1,6 +1,6 @@
import { PreState, NewChangeset } from "@changesets/types";
import { readPreState } from "@changesets/pre"; import { readPreState } from "@changesets/pre";
import readChangesets from "@changesets/read"; import readChangesets from "@changesets/read";
import type { PreState, NewChangeset } from "@changesets/types";
export type ChangesetState = { export type ChangesetState = {
preState: PreState | undefined; preState: PreState | undefined;
@@ -8,7 +8,7 @@ export type ChangesetState = {
}; };
export default async function readChangesetState( export default async function readChangesetState(
cwd: string = process.cwd(), cwd: string = process.cwd()
): Promise<ChangesetState> { ): Promise<ChangesetState> {
let preState = await readPreState(cwd); let preState = await readPreState(cwd);
let changesets = await readChangesets(cwd); let changesets = await readChangesets(cwd);
+62 -207
View File
@@ -1,13 +1,13 @@
import path from "node:path"; import { Changeset } from "@changesets/types";
import type { Changeset } from "@changesets/types";
import writeChangeset from "@changesets/write"; import writeChangeset from "@changesets/write";
import { createFixture } from "fs-fixture"; import fixturez from "fixturez";
import { beforeEach, describe, expect, it, vi } from "vitest"; import fs from "fs-extra";
import { Git } from "./git.ts"; import path from "path";
import { setupOctokit } from "./octokit.ts"; import { Git } from "./git";
import { runVersion } from "./run.ts"; import { setupOctokit } from "./octokit";
import { runVersion } from "./run";
vi.mock("@actions/github", () => ({ jest.mock("@actions/github", () => ({
context: { context: {
repo: { repo: {
owner: "changesets", owner: "changesets",
@@ -16,89 +16,53 @@ vi.mock("@actions/github", () => ({
ref: "refs/heads/some-branch", ref: "refs/heads/some-branch",
sha: "xeac7", sha: "xeac7",
}, },
getOctokit: () => ({
rest: mockedGithubMethods,
graphql: mockedGraphql,
}),
})); }));
vi.mock("./git.ts"); jest.mock("@actions/github/lib/utils", () => ({
vi.mock("@changesets/ghcommit/git"); GitHub: {
plugin: () => {
// function necessary to be used as constructor
return function () {
return {
rest: mockedGithubMethods,
};
};
},
},
getOctokitOptions: jest.fn(),
}));
jest.mock("./git");
jest.mock("@changesets/ghcommit/git");
let mockedGithubMethods = { let mockedGithubMethods = {
pulls: { pulls: {
create: vi.fn(), create: jest.fn(),
list: vi.fn(), list: jest.fn(),
}, },
repos: { repos: {
createRelease: vi.fn(), createRelease: jest.fn(),
}, },
}; };
let mockedGraphql = vi.fn();
const nodeModulesDir = path.join(import.meta.dirname, "..", "node_modules"); let f = fixturez(__dirname);
function createSimpleProjectFixture() {
return createFixture({
node_modules: (api) => api.symlink(nodeModulesDir),
".changeset/config.json": JSON.stringify({}),
"packages/pkg-a/package.json": JSON.stringify({
name: "changesets-dev-simple-project-pkg-a",
version: "1.0.0",
dependencies: {
"changesets-dev-simple-project-pkg-b": "1.0.0",
},
}),
"packages/pkg-b/package.json": JSON.stringify({
name: "changesets-dev-simple-project-pkg-b",
version: "1.0.0",
}),
"package.json": JSON.stringify({
name: "simple-project",
version: "1.0.0",
private: true,
workspaces: ["packages/*"],
}),
});
}
function createIgnoredPackageFixture() {
return createFixture({
node_modules: (api) => api.symlink(nodeModulesDir),
".changeset/config.json": JSON.stringify({
ignore: ["changesets-dev-ignored-package-pkg-a"],
}),
"packages/pkg-a/package.json": JSON.stringify({
name: "changesets-dev-ignored-package-pkg-a",
version: "1.0.0",
dependencies: {
"changesets-dev-ignored-package-pkg-b": "1.0.0",
},
}),
"packages/pkg-b/package.json": JSON.stringify({
name: "changesets-dev-ignored-package-pkg-b",
version: "1.0.0",
}),
"package.json": JSON.stringify({
name: "ignored-package",
version: "1.0.0",
private: true,
workspaces: ["packages/*"],
}),
});
}
const linkNodeModules = async (cwd: string) => {
await fs.symlink(
path.join(__dirname, "..", "node_modules"),
path.join(cwd, "node_modules")
);
};
const writeChangesets = (changesets: Changeset[], cwd: string) => { const writeChangesets = (changesets: Changeset[], cwd: string) => {
return Promise.all(changesets.map((commit) => writeChangeset(commit, cwd))); return Promise.all(changesets.map((commit) => writeChangeset(commit, cwd)));
}; };
beforeEach(() => { beforeEach(() => {
vi.clearAllMocks(); jest.clearAllMocks();
}); });
describe("version", () => { describe("version", () => {
it("creates simple PR", async () => { it("creates simple PR", async () => {
await using fixture = await createSimpleProjectFixture(); let cwd = f.copy("simple-project");
const cwd = fixture.path; linkNodeModules(cwd);
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] })); mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
@@ -111,69 +75,32 @@ describe("version", () => {
{ {
releases: [ releases: [
{ {
name: "changesets-dev-simple-project-pkg-a", name: "simple-project-pkg-a",
type: "minor", type: "minor",
}, },
{ {
name: "changesets-dev-simple-project-pkg-b", name: "simple-project-pkg-b",
type: "minor", type: "minor",
}, },
], ],
summary: "Awesome feature", summary: "Awesome feature",
}, },
], ],
cwd, cwd
); );
await runVersion({ await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"), octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN", git: new Git(),
git: new Git({ cwd }),
cwd, cwd,
}); });
expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot(); expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot();
}); });
it('creates a draft PR when prDraft is "create"', async () => {
await using fixture = await createSimpleProjectFixture();
const cwd = fixture.path;
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
mockedGithubMethods.pulls.create.mockImplementationOnce(() => ({
data: { number: 123 },
}));
await writeChangesets(
[
{
releases: [
{
name: "changesets-dev-simple-project-pkg-a",
type: "minor",
},
],
summary: "Awesome feature",
},
],
cwd,
);
await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN",
git: new Git({ cwd }),
cwd,
prDraft: "create",
});
expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot();
});
it("only includes bumped packages in the PR body", async () => { it("only includes bumped packages in the PR body", async () => {
await using fixture = await createSimpleProjectFixture(); let cwd = f.copy("simple-project");
const cwd = fixture.path; linkNodeModules(cwd);
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] })); mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
@@ -186,20 +113,19 @@ describe("version", () => {
{ {
releases: [ releases: [
{ {
name: "changesets-dev-simple-project-pkg-a", name: "simple-project-pkg-a",
type: "minor", type: "minor",
}, },
], ],
summary: "Awesome feature", summary: "Awesome feature",
}, },
], ],
cwd, cwd
); );
await runVersion({ await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"), octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN", git: new Git(),
git: new Git({ cwd }),
cwd, cwd,
}); });
@@ -207,8 +133,8 @@ describe("version", () => {
}); });
it("doesn't include ignored package that got a dependency update in the PR body", async () => { it("doesn't include ignored package that got a dependency update in the PR body", async () => {
await using fixture = await createIgnoredPackageFixture(); let cwd = f.copy("ignored-package");
const cwd = fixture.path; linkNodeModules(cwd);
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] })); mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
@@ -221,20 +147,19 @@ describe("version", () => {
{ {
releases: [ releases: [
{ {
name: "changesets-dev-ignored-package-pkg-b", name: "ignored-package-pkg-b",
type: "minor", type: "minor",
}, },
], ],
summary: "Awesome feature", summary: "Awesome feature",
}, },
], ],
cwd, cwd
); );
await runVersion({ await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"), octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN", git: new Git(),
git: new Git({ cwd }),
cwd, cwd,
}); });
@@ -242,8 +167,8 @@ describe("version", () => {
}); });
it("does not include changelog entries if full message exceeds size limit", async () => { it("does not include changelog entries if full message exceeds size limit", async () => {
await using fixture = await createSimpleProjectFixture(); let cwd = f.copy("simple-project");
const cwd = fixture.path; linkNodeModules(cwd);
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] })); mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
@@ -256,7 +181,7 @@ describe("version", () => {
{ {
releases: [ releases: [
{ {
name: "changesets-dev-simple-project-pkg-a", name: "simple-project-pkg-a",
type: "minor", type: "minor",
}, },
], ],
@@ -283,26 +208,25 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
`, `,
}, },
], ],
cwd, cwd
); );
await runVersion({ await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"), octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN", git: new Git(),
git: new Git({ cwd }),
cwd, cwd,
prBodyMaxCharacters: 1000, prBodyMaxCharacters: 1000,
}); });
expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot(); expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot();
expect(mockedGithubMethods.pulls.create.mock.calls[0][0].body).toMatch( expect(mockedGithubMethods.pulls.create.mock.calls[0][0].body).toMatch(
/The changelog information of each package has been omitted from this message/, /The changelog information of each package has been omitted from this message/
); );
}); });
it("does not include any release information if a message with simplified release info exceeds size limit", async () => { it("does not include any release information if a message with simplified release info exceeds size limit", async () => {
await using fixture = await createSimpleProjectFixture(); let cwd = f.copy("simple-project");
const cwd = fixture.path; linkNodeModules(cwd);
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] })); mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({ data: [] }));
@@ -315,7 +239,7 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
{ {
releases: [ releases: [
{ {
name: "changesets-dev-simple-project-pkg-a", name: "simple-project-pkg-a",
type: "minor", type: "minor",
}, },
], ],
@@ -342,88 +266,19 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
`, `,
}, },
], ],
cwd, cwd
); );
await runVersion({ await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"), octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN", git: new Git(),
git: new Git({ cwd }),
cwd, cwd,
prBodyMaxCharacters: 500, prBodyMaxCharacters: 500,
}); });
expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot(); expect(mockedGithubMethods.pulls.create.mock.calls[0]).toMatchSnapshot();
expect(mockedGithubMethods.pulls.create.mock.calls[0][0].body).toMatch( expect(mockedGithubMethods.pulls.create.mock.calls[0][0].body).toMatch(
/All release information have been omitted from this message, as the content exceeds the size limit/, /All release information have been omitted from this message, as the content exceeds the size limit/
); );
}); });
it('updates an existing PR via GraphQL without converting it to draft when prDraft is "create"', async () => {
await using fixture = await createSimpleProjectFixture();
const cwd = fixture.path;
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({
data: [{ number: 123, node_id: "PR_kwDOA" }],
}));
await writeChangesets(
[
{
releases: [
{
name: "changesets-dev-simple-project-pkg-a",
type: "minor",
},
],
summary: "Awesome feature",
},
],
cwd,
);
await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN",
git: new Git({ cwd }),
cwd,
prDraft: "create",
});
expect(mockedGraphql.mock.calls[0]).toMatchSnapshot();
});
it('updates an existing PR via GraphQL and converts it to draft when prDraft is "always"', async () => {
await using fixture = await createSimpleProjectFixture();
const cwd = fixture.path;
mockedGithubMethods.pulls.list.mockImplementationOnce(() => ({
data: [{ number: 123, node_id: "PR_kwDOA" }],
}));
await writeChangesets(
[
{
releases: [
{
name: "changesets-dev-simple-project-pkg-a",
type: "minor",
},
],
summary: "Awesome feature",
},
],
cwd,
);
await runVersion({
octokit: setupOctokit("@@GITHUB_TOKEN"),
githubToken: "@@GITHUB_TOKEN",
git: new Git({ cwd }),
cwd,
prDraft: "always",
});
expect(mockedGraphql.mock.calls[0]).toMatchSnapshot();
});
}); });
+68 -131
View File
@@ -1,24 +1,21 @@
import fs from "node:fs/promises";
import { createRequire } from "node:module";
import path from "node:path";
import * as core from "@actions/core"; import * as core from "@actions/core";
import { exec, getExecOutput } from "@actions/exec"; import { exec, getExecOutput } from "@actions/exec";
import * as github from "@actions/github"; import * as github from "@actions/github";
import type { PreState } from "@changesets/types"; import { PreState } from "@changesets/types";
import { type Package, getPackages } from "@manypkg/get-packages"; import { Package, getPackages } from "@manypkg/get-packages";
import semverLt from "semver/functions/lt.js"; import fs from "fs-extra";
import { Git } from "./git.ts"; import path from "path";
import type { Octokit } from "./octokit.ts"; import resolveFrom from "resolve-from";
import readChangesetState from "./readChangesetState.ts"; import * as semver from "semver";
import { Git } from "./git";
import { Octokit } from "./octokit";
import readChangesetState from "./readChangesetState";
import { import {
getChangedPackages, getChangedPackages,
getChangelogEntry, getChangelogEntry,
getVersionsByDirectory, getVersionsByDirectory,
isErrorWithCode,
sortTheThings, sortTheThings,
} from "./utils.ts"; } from "./utils";
const require = createRequire(import.meta.url);
// GitHub Issues/PRs messages have a max size limit on the // GitHub Issues/PRs messages have a max size limit on the
// message body payload. // message body payload.
@@ -28,39 +25,44 @@ const MAX_CHARACTERS_PER_MESSAGE = 60000;
const createRelease = async ( const createRelease = async (
octokit: Octokit, octokit: Octokit,
{ pkg, tagName }: { pkg: Package; tagName: string }, { pkg, tagName }: { pkg: Package; tagName: string }
) => { ) => {
let changelog;
try { try {
changelog = await fs.readFile(path.join(pkg.dir, "CHANGELOG.md"), "utf8"); let changelogFileName = path.join(pkg.dir, "CHANGELOG.md");
} catch (err) {
if (isErrorWithCode(err, "ENOENT")) {
// if we can't find a changelog, the user has probably disabled changelogs
return;
}
throw err;
}
let changelogEntry = getChangelogEntry(changelog, pkg.packageJson.version);
if (!changelogEntry) {
// we can find a changelog but not the entry for this version
// if this is true, something has probably gone wrong
throw new Error(
`Could not find changelog entry for ${pkg.packageJson.name}@${pkg.packageJson.version}`,
);
}
await octokit.rest.repos.createRelease({ let changelog = await fs.readFile(changelogFileName, "utf8");
name: tagName,
tag_name: tagName, let changelogEntry = getChangelogEntry(changelog, pkg.packageJson.version);
body: changelogEntry.content, if (!changelogEntry) {
prerelease: pkg.packageJson.version.includes("-"), // we can find a changelog but not the entry for this version
...github.context.repo, // if this is true, something has probably gone wrong
}); throw new Error(
`Could not find changelog entry for ${pkg.packageJson.name}@${pkg.packageJson.version}`
);
}
await octokit.rest.repos.createRelease({
name: tagName,
tag_name: tagName,
body: changelogEntry.content,
prerelease: pkg.packageJson.version.includes("-"),
...github.context.repo,
});
} catch (err) {
// if we can't find a changelog, the user has probably disabled changelogs
if (
err &&
typeof err === "object" &&
"code" in err &&
err.code !== "ENOENT"
) {
throw err;
}
}
}; };
type PublishOptions = { type PublishOptions = {
script: string; script: string;
githubToken: string;
octokit: Octokit; octokit: Octokit;
createGithubReleases: boolean; createGithubReleases: boolean;
git: Git; git: Git;
@@ -80,7 +82,6 @@ type PublishResult =
export async function runPublish({ export async function runPublish({
script, script,
githubToken,
git, git,
octokit, octokit,
createGithubReleases, createGithubReleases,
@@ -91,7 +92,7 @@ export async function runPublish({
let changesetPublishOutput = await getExecOutput( let changesetPublishOutput = await getExecOutput(
publishCommand, publishCommand,
publishArgs, publishArgs,
{ cwd, env: { ...process.env, GITHUB_TOKEN: githubToken } }, { cwd }
); );
let { packages, tool } = await getPackages(cwd); let { packages, tool } = await getPackages(cwd);
@@ -111,7 +112,7 @@ export async function runPublish({
if (pkg === undefined) { if (pkg === undefined) {
throw new Error( throw new Error(
`Package "${pkgName}" not found.` + `Package "${pkgName}" not found.` +
"This is probably a bug in the action, please open an issue", "This is probably a bug in the action, please open an issue"
); );
} }
releasedPackages.push(pkg); releasedPackages.push(pkg);
@@ -123,14 +124,14 @@ export async function runPublish({
const tagName = `${pkg.packageJson.name}@${pkg.packageJson.version}`; const tagName = `${pkg.packageJson.name}@${pkg.packageJson.version}`;
await git.pushTag(tagName); await git.pushTag(tagName);
await createRelease(octokit, { pkg, tagName }); await createRelease(octokit, { pkg, tagName });
}), })
); );
} }
} else { } else {
if (packages.length === 0) { if (packages.length === 0) {
throw new Error( throw new Error(
`No package found.` + `No package found.` +
"This is probably a bug in the action, please open an issue", "This is probably a bug in the action, please open an issue"
); );
} }
let pkg = packages[0]; let pkg = packages[0];
@@ -166,16 +167,16 @@ export async function runPublish({
const requireChangesetsCliPkgJson = (cwd: string) => { const requireChangesetsCliPkgJson = (cwd: string) => {
try { try {
return require( return require(resolveFrom(cwd, "@changesets/cli/package.json"));
require.resolve("@changesets/cli/package.json", {
paths: [cwd],
}),
);
} catch (err) { } catch (err) {
if (isErrorWithCode(err, "MODULE_NOT_FOUND")) { if (
err &&
typeof err === "object" &&
"code" in err &&
err.code === "MODULE_NOT_FOUND"
) {
throw new Error( throw new Error(
`Have you forgotten to install \`@changesets/cli\` in "${cwd}"?`, `Have you forgotten to install \`@changesets/cli\` in "${cwd}"?`
{ cause: err },
); );
} }
throw err; throw err;
@@ -253,7 +254,6 @@ export async function getVersionPrBody({
type VersionOptions = { type VersionOptions = {
script?: string; script?: string;
githubToken: string;
git: Git; git: Git;
octokit: Octokit; octokit: Octokit;
cwd?: string; cwd?: string;
@@ -261,7 +261,6 @@ type VersionOptions = {
commitMessage?: string; commitMessage?: string;
hasPublishScript?: boolean; hasPublishScript?: boolean;
prBodyMaxCharacters?: number; prBodyMaxCharacters?: number;
prDraft?: "always" | "create";
branch?: string; branch?: string;
}; };
@@ -271,7 +270,6 @@ type RunVersionResult = {
export async function runVersion({ export async function runVersion({
script, script,
githubToken,
git, git,
octokit, octokit,
cwd = process.cwd(), cwd = process.cwd(),
@@ -280,7 +278,6 @@ export async function runVersion({
hasPublishScript = false, hasPublishScript = false,
prBodyMaxCharacters = MAX_CHARACTERS_PER_MESSAGE, prBodyMaxCharacters = MAX_CHARACTERS_PER_MESSAGE,
branch = github.context.ref.replace("refs/heads/", ""), branch = github.context.ref.replace("refs/heads/", ""),
prDraft,
}: VersionOptions): Promise<RunVersionResult> { }: VersionOptions): Promise<RunVersionResult> {
let versionBranch = `changeset-release/${branch}`; let versionBranch = `changeset-release/${branch}`;
@@ -290,29 +287,17 @@ export async function runVersion({
let versionsByDirectory = await getVersionsByDirectory(cwd); let versionsByDirectory = await getVersionsByDirectory(cwd);
const env = { ...process.env, GITHUB_TOKEN: githubToken };
if (script) { if (script) {
let [versionCommand, ...versionArgs] = script.split(/\s+/); let [versionCommand, ...versionArgs] = script.split(/\s+/);
await exec(versionCommand, versionArgs, { cwd, env }); await exec(versionCommand, versionArgs, { cwd });
} else { } else {
let changesetsCliPkgJson = requireChangesetsCliPkgJson(cwd); let changesetsCliPkgJson = requireChangesetsCliPkgJson(cwd);
let cmd = semverLt(changesetsCliPkgJson.version, "2.0.0") let cmd = semver.lt(changesetsCliPkgJson.version, "2.0.0")
? "bump" ? "bump"
: "version"; : "version";
await exec( await exec("node", [resolveFrom(cwd, "@changesets/cli/bin.js"), cmd], {
"node", cwd,
[ });
require.resolve("@changesets/cli/bin.js", {
paths: [cwd],
}),
cmd,
],
{
cwd,
env,
},
);
} }
let changedPackages = await getChangedPackages(cwd, versionsByDirectory); let changedPackages = await getChangedPackages(cwd, versionsByDirectory);
@@ -320,7 +305,7 @@ export async function runVersion({
changedPackages.map(async (pkg) => { changedPackages.map(async (pkg) => {
let changelogContents = await fs.readFile( let changelogContents = await fs.readFile(
path.join(pkg.dir, "CHANGELOG.md"), path.join(pkg.dir, "CHANGELOG.md"),
"utf8", "utf8"
); );
let entry = getChangelogEntry(changelogContents, pkg.packageJson.version); let entry = getChangelogEntry(changelogContents, pkg.packageJson.version);
@@ -330,7 +315,7 @@ export async function runVersion({
content: entry.content, content: entry.content,
header: `## ${pkg.packageJson.name}@${pkg.packageJson.version}`, header: `## ${pkg.packageJson.name}@${pkg.packageJson.version}`,
}; };
}), })
); );
const finalPrTitle = `${prTitle}${!!preState ? ` (${preState.tag})` : ""}`; const finalPrTitle = `${prTitle}${!!preState ? ` (${preState.tag})` : ""}`;
@@ -338,28 +323,15 @@ export async function runVersion({
!!preState ? ` (${preState.tag})` : "" !!preState ? ` (${preState.tag})` : ""
}`; }`;
/** await git.pushChanges({ branch: versionBranch, message: finalCommitMessage });
* Fetch any existing pull requests that are open against the branch,
* before we push any changes that may inadvertently close the existing PRs. let existingPullRequests = await octokit.rest.pulls.list({
*
* (`@changesets/ghcommit` has to reset the branch to the same commit as the base,
* which GitHub will then react to by closing the PRs)
*/
const existingPullRequests = await octokit.rest.pulls.list({
...github.context.repo, ...github.context.repo,
state: "open", state: "open",
head: `${github.context.repo.owner}:${versionBranch}`, head: `${github.context.repo.owner}:${versionBranch}`,
base: branch, base: branch,
}); });
core.info( core.info(JSON.stringify(existingPullRequests.data, null, 2));
`Existing pull requests: ${JSON.stringify(
existingPullRequests.data,
null,
2,
)}`,
);
await git.pushChanges({ branch: versionBranch, message: finalCommitMessage });
const changedPackagesInfo = (await changedPackagesInfoPromises) const changedPackagesInfo = (await changedPackagesInfoPromises)
.filter((x) => x) .filter((x) => x)
@@ -380,7 +352,6 @@ export async function runVersion({
head: versionBranch, head: versionBranch,
title: finalPrTitle, title: finalPrTitle,
body: prBody, body: prBody,
draft: prDraft !== undefined,
...github.context.repo, ...github.context.repo,
}); });
@@ -391,46 +362,12 @@ export async function runVersion({
const [pullRequest] = existingPullRequests.data; const [pullRequest] = existingPullRequests.data;
core.info(`updating found pull request #${pullRequest.number}`); core.info(`updating found pull request #${pullRequest.number}`);
const convertPullRequestToDraftMutation = await octokit.rest.pulls.update({
prDraft === "always" pull_number: pullRequest.number,
? `
convertPullRequestToDraft(
input: {
pullRequestId: $pullRequestId
}
) {
pullRequest {
id
}
}`
: "";
const updatePullRequestMutation = `
mutation UpdatePullRequest(
$pullRequestId: ID!
$title: String!
$body: String!
) {
${convertPullRequestToDraftMutation}
updatePullRequest(
input: {
pullRequestId: $pullRequestId
title: $title
body: $body
state: OPEN
}
) {
pullRequest {
id
}
}
}
`;
await octokit.graphql(updatePullRequestMutation, {
pullRequestId: pullRequest.node_id,
title: finalPrTitle, title: finalPrTitle,
body: prBody, body: prBody,
...github.context.repo,
state: "open",
}); });
return { return {
+1 -2
View File
@@ -1,5 +1,4 @@
import { expect, test } from "vitest"; import { getChangelogEntry, BumpLevels, sortTheThings } from "./utils";
import { BumpLevels, getChangelogEntry, sortTheThings } from "./utils.ts";
let changelog = `# @keystone-alpha/email let changelog = `# @keystone-alpha/email
+12 -27
View File
@@ -1,11 +1,9 @@
import fs from "node:fs/promises"; import unified from "unified";
import { getPackages, type Package } from "@manypkg/get-packages";
import type { Root } from "mdast";
// @ts-ignore
import mdastToString from "mdast-util-to-string";
import remarkParse from "remark-parse"; import remarkParse from "remark-parse";
import remarkStringify from "remark-stringify"; import remarkStringify from "remark-stringify";
import unified from "unified"; // @ts-ignore
import mdastToString from "mdast-util-to-string";
import { getPackages, Package } from "@manypkg/get-packages";
export const BumpLevels = { export const BumpLevels = {
dep: 0, dep: 0,
@@ -21,7 +19,7 @@ export async function getVersionsByDirectory(cwd: string) {
export async function getChangedPackages( export async function getChangedPackages(
cwd: string, cwd: string,
previousVersions: Map<string, string>, previousVersions: Map<string, string>
) { ) {
let { packages } = await getPackages(cwd); let { packages } = await getPackages(cwd);
let changedPackages = new Set<Package>(); let changedPackages = new Set<Package>();
@@ -37,11 +35,11 @@ export async function getChangedPackages(
} }
export function getChangelogEntry(changelog: string, version: string) { export function getChangelogEntry(changelog: string, version: string) {
let ast = unified().use(remarkParse).parse(changelog) as Root; let ast = unified().use(remarkParse).parse(changelog);
let highestLevel: number = BumpLevels.dep; let highestLevel: number = BumpLevels.dep;
let nodes = ast.children; let nodes = ast.children as Array<any>;
let headingStartInfo: let headingStartInfo:
| { | {
index: number; index: number;
@@ -77,7 +75,10 @@ export function getChangelogEntry(changelog: string, version: string) {
} }
} }
if (headingStartInfo) { if (headingStartInfo) {
ast.children = ast.children.slice(headingStartInfo.index + 1, endIndex); ast.children = (ast.children as any).slice(
headingStartInfo.index + 1,
endIndex
);
} }
return { return {
content: unified().use(remarkStringify).stringify(ast), content: unified().use(remarkStringify).stringify(ast),
@@ -87,7 +88,7 @@ export function getChangelogEntry(changelog: string, version: string) {
export function sortTheThings( export function sortTheThings(
a: { private: boolean; highestLevel: number }, a: { private: boolean; highestLevel: number },
b: { private: boolean; highestLevel: number }, b: { private: boolean; highestLevel: number }
) { ) {
if (a.private === b.private) { if (a.private === b.private) {
return b.highestLevel - a.highestLevel; return b.highestLevel - a.highestLevel;
@@ -97,19 +98,3 @@ export function sortTheThings(
} }
return -1; return -1;
} }
export function isErrorWithCode(err: unknown, code: string) {
return (
typeof err === "object" &&
err !== null &&
"code" in err &&
err.code === code
);
}
export function fileExists(filePath: string) {
return fs.access(filePath, fs.constants.F_OK).then(
() => true,
() => false,
);
}
+59 -10
View File
@@ -1,14 +1,63 @@
{ {
"compilerOptions": { "compilerOptions": {
"allowImportingTsExtensions": true, /* Basic Options */
"erasableSyntaxOnly": true, // "incremental": true, /* Enable incremental compilation */
"isolatedModules": true, "target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
"module": "node18", "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
"moduleResolution": "node16", // "lib": [], /* Specify library files to be included in the compilation. */
"noEmit": true, // "allowJs": true, /* Allow javascript files to be compiled. */
"resolveJsonModule": true, // "checkJs": true, /* Report errors in .js files. */
"strict": true, // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"target": "esnext", // "declaration": true, /* Generates corresponding '.d.ts' file. */
"verbatimModuleSyntax": true // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
"noEmit": true /* Do not emit outputs. */,
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
"isolatedModules": true /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */,
/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
/* Module Resolution Options */
"moduleResolution": "nodenext", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
} }
} }
+17
View File
@@ -0,0 +1,17 @@
type Opts = {
glob?: string | Array<string>;
root?: string;
cleanup?: boolean;
};
declare module "fixturez" {
export default function (
cwd: string,
opts?: Opts
): {
find: (a: string) => string;
temp: () => string;
copy: (a: string) => string;
cleanup: () => any;
};
}
+5313
View File
File diff suppressed because it is too large Load Diff