Skip to content

Commit 7151ad1

Browse files
committed
feat: 🧹 housekeeping
1 parent 64fdcc6 commit 7151ad1

File tree

12 files changed

+8046
-5349
lines changed

12 files changed

+8046
-5349
lines changed

.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
},
2929
overrides: [
3030
{
31-
files: ['src/__mocks__/.*', '**/*.spec.ts'],
31+
files: ['src/__mocks__/.*', '**/*.spec.ts', '**/*.spec.tsx'],
3232
rules: {
3333
'import/no-extraneous-dependencies': [
3434
'error',
@@ -42,7 +42,7 @@ module.exports = {
4242
settings: {
4343
'import/resolver': {
4444
node: {
45-
extensions: ['.js', '.ts'],
45+
extensions: ['.js', '.ts', '.jsx', '.tsx'],
4646
},
4747
},
4848
},

.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

+8-31
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,21 @@ runs:
1515
using: "composite"
1616

1717
steps:
18-
- name: Install Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v3
20-
with:
21-
node-version: ${{ matrix.node-version }}
22-
2318
- name: Install pnpm
24-
uses: pnpm/action-setup@v2
19+
uses: pnpm/action-setup@v4
2520
id: pnpm-install
2621
with:
27-
version: 8
22+
version: 9
2823
run_install: false
2924

30-
- name: Set pnpm home
31-
shell: bash
32-
run: |
33-
echo "PNPM_HOME=$HOME/.local/share/pnpm" >> $GITHUB_ENV
34-
echo "$HOME/.local/share/pnpm" >> $GITHUB_PATH
35-
36-
- name: Get pnpm store directory
37-
id: pnpm-cache
38-
shell: bash
39-
run: |
40-
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
41-
42-
- name: Setup pnpm cache
43-
uses: actions/cache@v3
25+
- name: Install Node.js ${{ matrix.node-version }}
26+
uses: actions/setup-node@v4
4427
with:
45-
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
46-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
47-
restore-keys: |
48-
${{ runner.os }}-pnpm-store-
49-
50-
- name: Authenticate for private NPM package
51-
shell: bash
28+
node-version: ${{ matrix.node-version }}
29+
cache: pnpm
30+
registry-url: 'https://registry.npmjs.org'
5231
env:
53-
NPM_TOKEN: ${{ inputs.npm_token }}
54-
run: |
55-
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
32+
NODE_AUTH_TOKEN: ${{ inputs.npm_token }}
5633

5734
- name: Install dependencies
5835
shell: bash

.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
node-version: [18, 20]
20+
node-version: [18, 20, 22]
2121

2222
steps:
2323
- name: Checkout
@@ -39,7 +39,7 @@ jobs:
3939

4040
strategy:
4141
matrix:
42-
node-version: [18, 20]
42+
node-version: [18, 20, 22]
4343

4444
steps:
4545
- name: Checkout
@@ -61,7 +61,7 @@ jobs:
6161

6262
strategy:
6363
matrix:
64-
node-version: [18, 20]
64+
node-version: [18, 20, 22]
6565

6666
steps:
6767
- name: Checkout
@@ -78,8 +78,10 @@ jobs:
7878
--ci \
7979
--runInBand \
8080
--coverage
81+
env:
82+
JEST_JUNIT_CLASSNAME: '{filepath}'
8183

8284
- name: Upload code coverage
83-
uses: codecov/codecov-action@v3
85+
uses: codecov/codecov-action@v5
8486
with:
8587
token: ${{ secrets.CODECOV_TOKEN }}

.releaserc.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ branches:
22
- name: 1.x
33
range: 1.x
44
channel: 1.x
5+
- name: 2.x
6+
range: 2.x
7+
channel: 2.x
58
- main
69
- name: development
710
prerelease: alpha

examples/with-pages-router/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"@types/node": "20.8.10",
13-
"@types/react": "18.2.33",
14-
"@types/react-dom": "18.2.14",
15-
"eslint": "8.52.0",
16-
"eslint-config-next": "14.0.1",
17-
"next": "14.0.1",
12+
"@types/node": "22.13.13",
13+
"@types/react": "~18",
14+
"@types/react-dom": "~18",
15+
"eslint": "9.23.0",
16+
"eslint-config-next": "15.2.4",
17+
"next": "15.2.4",
1818
"next-runtime-env": "link:../..",
19-
"react": "18.2.0",
20-
"react-dom": "18.2.0",
21-
"typescript": "5.2.2"
19+
"react": "~18",
20+
"react-dom": "~18",
21+
"typescript": "5.8.2"
2222
}
2323
}

0 commit comments

Comments
 (0)