Skip to content

Commit 050c76e

Browse files
authored
Merge pull request #128 from expatfile/chore/housekeeping
🧹 Housekeeping
2 parents 00189fe + c2e4a7e commit 050c76e

File tree

8 files changed

+4252
-3632
lines changed

8 files changed

+4252
-3632
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ runs:
3838
git fetch --unshallow
3939
git checkout development
4040
git pull
41-
git merge --no-ff origin/${{ inputs.main_branch }} -m "Back-merge ${{ inputs.main_branch }} into development"
41+
git merge --no-ff origin/${{ inputs.main_branch }} -m "🔀 Back-merge ${{ inputs.main_branch }} into development"
4242
git push

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

+7-30
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@v3
2520
id: pnpm-install
2621
with:
2722
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

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12-
"@types/node": "20.11.30",
13-
"@types/react": "18.2.67",
14-
"@types/react-dom": "18.2.22",
12+
"@types/node": "20.12.12",
13+
"@types/react": "18.3.2",
14+
"@types/react-dom": "18.3.0",
1515
"eslint": "8.57.0",
16-
"eslint-config-next": "14.1.4",
17-
"next": "14.1.4",
16+
"eslint-config-next": "14.2.3",
17+
"next": "14.2.3",
1818
"next-runtime-env": "link:../..",
19-
"react": "18.2.0",
20-
"react-dom": "18.2.0",
21-
"typescript": "5.4.3"
19+
"react": "18.3.1",
20+
"react-dom": "18.3.1",
21+
"typescript": "5.4.5"
2222
}
2323
}

0 commit comments

Comments
 (0)