Skip to content

Commit cba698e

Browse files
authored
Merge branch 'main' into exclude-static-paths
2 parents 55f2ac5 + 74e40d4 commit cba698e

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

.github/workflows/deno-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: 'Install Node'
1313
uses: actions/setup-node@v4
1414
with:
15-
node-version: '18.x'
15+
node-version: '20.x'
1616
cache: 'npm'
1717
cache-dependency-path: '**/package-lock.json'
1818

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Node.js
2020
uses: actions/setup-node@v4
2121
with:
22-
node-version: '18.x'
22+
node-version: '20.x'
2323
cache: 'npm'
2424
cache-dependency-path: '**/package-lock.json'
2525
- run: npm ci

.github/workflows/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: 'Install Node'
5656
uses: actions/setup-node@v4
5757
with:
58-
node-version: '18.x'
58+
node-version: '20.x'
5959
cache: 'npm'
6060
cache-dependency-path: '**/package-lock.json'
6161
- uses: oven-sh/setup-bun@v2
@@ -131,7 +131,7 @@ jobs:
131131
- name: 'Install Node'
132132
uses: actions/setup-node@v4
133133
with:
134-
node-version: '18.x'
134+
node-version: '20.x'
135135
cache: 'npm'
136136
cache-dependency-path: '**/package-lock.json'
137137
- name: Prefer npm global on windows
@@ -208,7 +208,7 @@ jobs:
208208
- name: 'Install Node'
209209
uses: actions/setup-node@v4
210210
with:
211-
node-version: '18.x'
211+
node-version: '20.x'
212212
cache: 'npm'
213213
cache-dependency-path: '**/package-lock.json'
214214
- name: setup pnpm/yarn

.github/workflows/size-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: '18.x'
20+
node-version: '20.x'
2121
cache: 'npm'
2222
cache-dependency-path: '**/package-lock.json'
2323

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
env:
22-
NODE_VERSION: 18.18.0
22+
NODE_VERSION: 20.9.0
2323
PNPM_VERSION: 8.9.0
2424
NEXT_REPO: vercel/next.js
2525
NEXT_TEST_MODE: deploy

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"devDependencies": {
5555
"@fastly/http-compute-js": "1.1.5",
5656
"@netlify/blobs": "^8.2.0",
57-
"@netlify/build": "^35.1.4",
57+
"@netlify/build": "^35.1.5",
5858
"@netlify/config": "^24.0.3",
5959
"@netlify/edge-bundler": "^14.5.4",
6060
"@netlify/edge-functions-bootstrap": "^2.14.0",

tests/prepare.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const e2eOnlyFixtures = new Set([
2727
'middleware-node-runtime-specific',
2828
'middleware-static-asset-matcher',
2929
'middleware-subrequest-vuln',
30-
// There is also a bug on Windows on Node.js 18.20.6, that cause build failures on this fixture
30+
// There is a bug on Windows on Node.js 18.20.6, that causes build failures on this fixture
3131
// see https://github.com/opennextjs/opennextjs-netlify/actions/runs/13268839161/job/37043172448?pr=2749#step:12:78
3232
'middleware-og',
3333
'middleware-single-matcher',

0 commit comments

Comments
 (0)