Skip to content

Commit 669f9cb

Browse files
committed
fix: 🧹 housekeeping
patch CVE-2025-29927 patch shell injection in runner update dependencies
1 parent 20f5609 commit 669f9cb

File tree

11 files changed

+4446
-3842
lines changed

11 files changed

+4446
-3842
lines changed

.github/actions/back-merge/action.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,20 @@ runs:
2828

2929
- name: Setup git config
3030
shell: bash
31+
env:
32+
GIT_USER_EMAIL: ${{ inputs.git_user_email }}
33+
GIT_USER_NAME: ${{ inputs.git_user_name }}
3134
run: |
32-
git config --global user.email ${{ inputs.git_user_email }}
33-
git config --global user.name ${{ inputs.git_user_name }}
35+
git config --global user.email "${GIT_USER_EMAIL}"
36+
git config --global user.name "${GIT_USER_NAME}"
3437
3538
- name: Merge main back to development
3639
shell: bash
40+
env:
41+
MAIN_BRANCH: ${{ inputs.main_branch }}
3742
run: |
3843
git fetch --unshallow
3944
git checkout development
4045
git pull
41-
git merge --no-ff origin/${{ inputs.main_branch }} -m "🔀 Back-merge ${{ inputs.main_branch }} into development"
46+
git merge --no-ff "origin/${MAIN_BRANCH}" -m "ci: 🔀 back-merge ${MAIN_BRANCH} into development"
4247
git push

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616

1717
steps:
1818
- name: Install pnpm
19-
uses: pnpm/action-setup@v3
19+
uses: pnpm/action-setup@v4
2020
id: pnpm-install
2121
with:
2222
version: 9

.github/workflows/ci.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
node-version: [18, 20]
23+
node-version: [18, 20, 22]
2424

2525
steps:
2626
- name: Checkout
@@ -42,7 +42,7 @@ jobs:
4242

4343
strategy:
4444
matrix:
45-
node-version: [18, 20]
45+
node-version: [18, 20, 22]
4646

4747
steps:
4848
- name: Checkout
@@ -64,7 +64,7 @@ jobs:
6464

6565
strategy:
6666
matrix:
67-
node-version: [18, 20]
67+
node-version: [18, 20, 22]
6868

6969
steps:
7070
- name: Checkout
@@ -81,6 +81,8 @@ jobs:
8181
--ci \
8282
--runInBand \
8383
--coverage
84+
env:
85+
JEST_JUNIT_CLASSNAME: '{filepath}'
8486

8587
- name: Upload code coverage
8688
uses: codecov/codecov-action@v4

examples/with-app-router-context/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"@types/node": "20.12.12",
12+
"@types/node": "22.13.13",
1313
"@types/react": "18.3.2",
1414
"@types/react-dom": "18.3.0",
15-
"eslint": "8.57.0",
16-
"eslint-config-next": "14.2.3",
17-
"next": "14.2.3",
15+
"eslint": "9.23.0",
16+
"eslint-config-next": "15.2.4",
17+
"next": "14.2.26",
1818
"next-runtime-env": "link:../..",
1919
"react": "18.3.1",
2020
"react-dom": "18.3.1",
21-
"typescript": "5.4.5"
21+
"typescript": "5.8.2"
2222
}
2323
}

0 commit comments

Comments
 (0)