Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/actions/back-merge/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,20 @@ runs:

- name: Setup git config
shell: bash
env:
GIT_USER_EMAIL: ${{ inputs.git_user_email }}
GIT_USER_NAME: ${{ inputs.git_user_name }}
run: |
git config --global user.email ${{ inputs.git_user_email }}
git config --global user.name ${{ inputs.git_user_name }}
git config --global user.email "${GIT_USER_EMAIL}"
git config --global user.name "${GIT_USER_NAME}"

- name: Merge main back to development
shell: bash
env:
MAIN_BRANCH: ${{ inputs.main_branch }}
run: |
git fetch --unshallow
git checkout development
git pull
git merge --no-ff origin/${{ inputs.main_branch }} -m "🔀 Back-merge ${{ inputs.main_branch }} into development"
git merge --no-ff "origin/${MAIN_BRANCH}" -m "ci: 🔀 back-merge ${MAIN_BRANCH} into development"
git push
2 changes: 1 addition & 1 deletion .github/actions/setup-pnpm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:

steps:
- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
id: pnpm-install
with:
version: 9
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
node-version: [18, 20]
node-version: [18, 20, 22]

steps:
- name: Checkout
Expand All @@ -42,7 +42,7 @@ jobs:

strategy:
matrix:
node-version: [18, 20]
node-version: [18, 20, 22]

steps:
- name: Checkout
Expand All @@ -64,7 +64,7 @@ jobs:

strategy:
matrix:
node-version: [18, 20]
node-version: [18, 20, 22]

steps:
- name: Checkout
Expand All @@ -81,8 +81,10 @@ jobs:
--ci \
--runInBand \
--coverage
env:
JEST_JUNIT_CLASSNAME: '{filepath}'

- name: Upload code coverage
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

strategy:
matrix:
node-version: [20]
node-version: [22]

steps:
- name: Checkout
Expand Down
14 changes: 7 additions & 7 deletions examples/with-app-router-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"lint": "next lint"
},
"dependencies": {
"@types/node": "20.12.12",
"@types/react": "18.3.2",
"@types/react-dom": "18.3.0",
"eslint": "8.57.0",
"eslint-config-next": "14.2.3",
"next": "14.2.3",
"@types/node": "22.13.14",
"@types/react": "18.3.20",
"@types/react-dom": "18.3.5",
"eslint": "9.23.0",
"eslint-config-next": "15.2.4",
"next": "14.2.26",
"next-runtime-env": "link:../..",
"react": "18.3.1",
"react-dom": "18.3.1",
"typescript": "5.4.5"
"typescript": "5.8.2"
}
}
Loading