Skip to content

Commit e81d9c8

Browse files
committed
Chore: Update yarn to 4.9.1 and refactor CI
1 parent 93841d4 commit e81d9c8

File tree

11 files changed

+1526
-1204
lines changed

11 files changed

+1526
-1204
lines changed

.github/actions/node-setup/action.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,18 @@ runs:
2222
- uses: actions/cache@v4
2323
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
2424
with:
25-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
25+
path: |
26+
${{ steps.yarn-cache-dir-path.outputs.dir }}
27+
.yarn/unplugged
28+
.yarn/build-state.yml
29+
.yarn/install-state.gz
2630
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
2731
restore-keys: |
2832
${{ runner.os }}-yarn-
2933
3034
- name: Package Install
3135
run: |
36+
yarn config set winLinkType symlinks
3237
if [ "${{ inputs.strict }}" = "true" ]; then
3338
yarn install --immutable --check-resolutions --refresh-lockfile
3439
yarn constraints

.github/workflows/fast-forward.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
COMMENT_BODY: ${{ github.event.comment.body }}
2525
run: |
2626
if [[ "$COMMENT_BODY" =~ (^|[[:space:]])/fast-forward($|[[:space:]]) ]]; then
27-
echo "MATCH=true" >> $GITHUB_ENV
27+
echo "MATCH=true" >> $GITHUB_OUTPUT
2828
else
29-
echo "MATCH=false" >> $GITHUB_ENV
29+
echo "MATCH=false" >> $GITHUB_OUTPUT
3030
fi
3131
3232
- name: Fast forwarding
33-
if: env.MATCH == 'true'
33+
if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
3434
uses: sequoia-pgp/fast-forward@v1
3535
with:
3636
merge: true
@@ -41,7 +41,7 @@ jobs:
4141
comment: always
4242

4343
- name: Check target branch
44-
if: env.MATCH == 'true'
44+
if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
4545
id: check_branch
4646
env:
4747
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,11 +113,21 @@ jobs:
113113
statuses: write
114114

115115
steps:
116+
- name: Get PR Branch
117+
id: get_pr_branch
118+
run: |
119+
PR_NUMBER=${{ github.event.issue.number }}
120+
PR_BRANCH=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
121+
"https://api.github.com/repos/${{ github.repository }}/pulls/$PR_NUMBER" \
122+
| jq -r .head.ref)
123+
124+
echo "branch=$PR_BRANCH" >> $GITHUB_OUTPUT
125+
116126
- name: Checkout Repo
117127
uses: actions/checkout@v4
118128
with:
119129
fetch-depth: 0
120-
ref: main
130+
ref: ${{ steps.get_pr_branch.outputs.branch }}
121131

122132
- name: Setup
123133
uses: ./.github/actions/node-setup

.github/workflows/rebase.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ jobs:
2222
COMMENT_BODY: ${{ github.event.comment.body }}
2323
run: |
2424
if [[ "$COMMENT_BODY" =~ (^|[[:space:]])/rebase($|[[:space:]]) ]]; then
25-
echo "MATCH=true" >> $GITHUB_ENV
25+
echo "MATCH=true" >> $GITHUB_OUTPUT
2626
else
27-
echo "MATCH=false" >> $GITHUB_ENV
27+
echo "MATCH=false" >> $GITHUB_OUTPUT
2828
fi
2929
3030
- name: Checkout repository
31-
if: env.MATCH == 'true'
31+
if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
3232
uses: actions/checkout@v4
3333
with:
3434
fetch-depth: 0
3535

3636
- name: Install git-branchless
37-
if: env.MATCH == 'true'
37+
if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
3838
run: |
3939
brew install --no-quarantine git-branchless
4040
git-branchless init
4141
4242
- name: Rebase PR
43-
if: env.MATCH == 'true'
43+
if: ${{ steps.check_comment.outputs.MATCH == 'true' }}
4444
run: |
4545
git config user.name "github-actions[bot]"
4646
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

.yarn/releases/yarn-4.6.0.cjs

Lines changed: 0 additions & 934 deletions
This file was deleted.

.yarn/releases/yarn-4.9.1.cjs

Lines changed: 948 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ plugins:
1616
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
1717
spec: "https://mskelton.dev/yarn-outdated/v3"
1818

19-
yarnPath: .yarn/releases/yarn-4.6.0.cjs
19+
pnpmStoreFolder: .cache/.store
20+
21+
yarnPath: .yarn/releases/yarn-4.9.1.cjs

configs/eslint-config-custom/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
}
1818
},
1919
"devDependencies": {
20-
"@eslint/js": "^9.24.0",
21-
"@typescript-eslint/parser": "^8.29.1",
20+
"@eslint/js": "^9.25.0",
21+
"@typescript-eslint/parser": "^8.30.1",
2222
"eslint-config-prettier": "^10.1.2",
2323
"eslint-plugin-prettier": "^5.2.6",
2424
"eslint-plugin-yml": "^1.17.0",
2525
"globals": "^16.0.0",
2626
"prettier-config-custom": "workspace:^",
27-
"typescript-eslint": "^8.29.1",
27+
"typescript-eslint": "^8.30.1",
2828
"yaml-eslint-parser": "^1.3.0"
2929
},
3030
"peerDependencies": {

examples/react-babel/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@
3535
"scheduler": "^0.26.0"
3636
},
3737
"devDependencies": {
38-
"@eslint/js": "^9.24.0",
38+
"@eslint/js": "^9.25.0",
3939
"@types/babel__core": "^7.20.5",
4040
"@types/cssesc": "^3.0.2",
4141
"@types/react": "^19.1.1",
4242
"@types/react-dom": "^19.1.2",
4343
"@types/scheduler": "^0.26.0",
44-
"@vitejs/plugin-react": "^4.3.4",
45-
"eslint": "^9.24.0",
44+
"@vitejs/plugin-react": "^4.4.1",
45+
"eslint": "^9.25.0",
4646
"eslint-plugin-react-hooks": "^5.2.0",
4747
"eslint-plugin-react-refresh": "^0.4.19",
4848
"globals": "^16.0.0",
4949
"typescript": "~5.8.3",
50-
"typescript-eslint": "^8.29.1",
51-
"vite": "^6.2.6"
50+
"typescript-eslint": "^8.30.1",
51+
"vite": "^6.3.2"
5252
}
5353
}

examples/react-swc/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
"react-dom": "^19.1.0"
1616
},
1717
"devDependencies": {
18-
"@eslint/js": "^9.24.0",
18+
"@eslint/js": "^9.25.0",
1919
"@mincho-js/css": "workspace:^",
2020
"@types/react": "^19.1.1",
2121
"@types/react-dom": "^19.1.2",
22-
"@typescript-eslint/eslint-plugin": "^8.29.1",
23-
"@typescript-eslint/parser": "^8.29.1",
22+
"@typescript-eslint/eslint-plugin": "^8.30.1",
23+
"@typescript-eslint/parser": "^8.30.1",
2424
"@vanilla-extract/css": "^1.17.1",
2525
"@vanilla-extract/esbuild-plugin": "^2.3.15",
2626
"@vanilla-extract/vite-plugin": "^5.0.1",
27-
"@vitejs/plugin-react-swc": "^3.8.1",
28-
"eslint": "^9.24.0",
27+
"@vitejs/plugin-react-swc": "^3.9.0",
28+
"eslint": "^9.25.0",
2929
"eslint-plugin-react-hooks": "^5.2.0",
3030
"eslint-plugin-react-refresh": "^0.4.19",
3131
"globals": "^16.0.0",
3232
"typescript": "^5.8.3",
33-
"typescript-eslint": "^8.29.1",
34-
"vite": "^6.2.6"
33+
"typescript-eslint": "^8.30.1",
34+
"vite": "^6.3.2"
3535
}
3636
}

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mincho",
33
"type": "module",
44
"private": true,
5-
"packageManager": "yarn@4.6.0",
5+
"packageManager": "yarn@4.9.1",
66
"workspaces": [
77
"configs/*",
88
"packages/*",
@@ -44,7 +44,7 @@
4444
"prettier": "prettier-config-custom",
4545
"devDependencies": {
4646
"@changesets/changelog-github": "^0.5.1",
47-
"@changesets/cli": "^2.28.1",
47+
"@changesets/cli": "^2.29.2",
4848
"@mincho-js/debug-log": "workspace:^",
4949
"@monorepo-utils/workspaces-to-typescript-project-references": "^2.10.4",
5050
"@types/eslint": "^9.6.1",
@@ -54,17 +54,17 @@
5454
"@vitest/coverage-v8": "^3.1.1",
5555
"@yarnpkg/types": "^4.0.1",
5656
"c8": "^10.1.3",
57-
"eslint": "^9.24.0",
57+
"eslint": "^9.25.0",
5858
"eslint-config-custom": "workspace:^",
5959
"prettier": "^3.5.3",
6060
"prettier-config-custom": "workspace:^",
61-
"prettier-eslint": "^16.3.0",
61+
"prettier-eslint": "^16.4.1",
6262
"rimraf": "6.0.0",
6363
"terser": "^5.39.0",
6464
"tsconfig-custom": "workspace:^",
6565
"turbo": "^2.5.0",
6666
"typescript": "^5.8.3",
67-
"vite": "^6.2.6",
67+
"vite": "^6.3.2",
6868
"vite-node": "^3.1.1",
6969
"vitest": "^3.1.1",
7070
"yarn-constraints-rules": "^0.1.0"

0 commit comments

Comments
 (0)