Skip to content

Commit 81552f7

Browse files
piehpieh
authored
Merge branch 'main' into fix/node-middleware-not-supported
2 parents ff5ee51 + 45b43e6 commit 81552f7

File tree

68 files changed

+3948
-5496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3948
-5496
lines changed

‎.github/workflows/deno-test.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,25 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v5
11+
12+
- name: 'Install Node'
13+
uses: actions/setup-node@v4
14+
with:
15+
node-version: '18.x'
16+
cache: 'npm'
17+
cache-dependency-path: '**/package-lock.json'
18+
1119
- name: Setup Deno
1220
uses: denoland/setup-deno@v1
1321
with:
14-
deno-version: v1.x.x
22+
deno-version: v2.2.4
23+
24+
- name: 'Install dependencies'
25+
run: npm ci
26+
1527
- name: Vendor Deno modules
16-
run: deno vendor edge-runtime/vendor.ts --output=edge-runtime/vendor --force
28+
run: deno --allow-import --vendor edge-runtime/vendor.ts
29+
1730
- name: Test
1831
run: deno test -A edge-runtime/

‎.github/workflows/e2e-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
setup:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
- name: Get run id
3131
id: get-run-id
3232
run: |

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
ref: ${{ github.head_ref }}
1818
fetch-depth: 0

‎.github/workflows/pre-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
id-token: write
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: actions/setup-node@v4
1717
with:
1818
node-version: lts/*
@@ -24,7 +24,7 @@ jobs:
2424
uses: denoland/setup-deno@v1
2525
with:
2626
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
27-
deno-version: v1.46.3
27+
deno-version: v2.2.4
2828
- name: Extract tag and version
2929
id: extract
3030
run: |-

‎.github/workflows/release-please.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: googleapis/release-please-action@v4
1818
id: release
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v5
2020
if: ${{ steps.release.outputs.release_created }}
2121
- uses: actions/setup-node@v4
2222
with:
@@ -32,7 +32,7 @@ jobs:
3232
uses: denoland/setup-deno@v1
3333
with:
3434
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
35-
deno-version: v1.46.3
35+
deno-version: v2.2.4
3636
- name: Build
3737
run: npm run build
3838
if: ${{ steps.release.outputs.release_created }}

‎.github/workflows/run-tests.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
shard: [1, 2, 3, 4, 5]
5252

5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v5
5555
- name: 'Install Node'
5656
uses: actions/setup-node@v4
5757
with:
@@ -68,7 +68,7 @@ jobs:
6868
uses: denoland/setup-deno@v1
6969
with:
7070
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
71-
deno-version: v1.46.3
71+
deno-version: v2.2.4
7272
- name: 'Install dependencies'
7373
run: npm ci
7474
- name: 'Prepare Netlify CLI'
@@ -127,7 +127,7 @@ jobs:
127127
version: '14.2.15'
128128
runs-on: ${{ matrix.os }}
129129
steps:
130-
- uses: actions/checkout@v4
130+
- uses: actions/checkout@v5
131131
- name: 'Install Node'
132132
uses: actions/setup-node@v4
133133
with:
@@ -151,7 +151,7 @@ jobs:
151151
uses: denoland/setup-deno@v1
152152
with:
153153
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/edge-bundler/blob/e55f825bd985d3c92e21d1b765d71e70d5628fba/node/bridge.ts#L17
154-
deno-version: v1.46.3
154+
deno-version: v2.2.4
155155
- name: 'Install dependencies'
156156
run: npm ci
157157
- name: 'Build'
@@ -204,7 +204,7 @@ jobs:
204204
matrix:
205205
version: ${{ fromJson(needs.setup.outputs.matrix) }}
206206
steps:
207-
- uses: actions/checkout@v4
207+
- uses: actions/checkout@v5
208208
- name: 'Install Node'
209209
uses: actions/setup-node@v4
210210
with:
@@ -218,7 +218,7 @@ jobs:
218218
uses: denoland/setup-deno@v1
219219
with:
220220
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
221-
deno-version: v1.46.3
221+
deno-version: v2.2.4
222222
- name: 'Install dependencies'
223223
run: npm ci
224224
- name: 'Build'
@@ -254,7 +254,7 @@ jobs:
254254

255255
runs-on: ubuntu-latest
256256
steps:
257-
- uses: actions/checkout@v4
257+
- uses: actions/checkout@v5
258258
- uses: actions/setup-node@v4
259259
with:
260260
node-version: 18

‎.github/workflows/size-check.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,23 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
2020
node-version: '18.x'
2121
cache: 'npm'
2222
cache-dependency-path: '**/package-lock.json'
23+
2324
- name: Install Deno
2425
uses: denoland/setup-deno@v1
2526
with:
2627
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
27-
deno-version: v1.46.3
28-
- run: npm ci
28+
deno-version: v2.2.4
29+
30+
- name: 'Install dependencies'
31+
run: npm ci
2932

3033
- name: Package size report
3134
uses: pkg-size/action@v1

‎.github/workflows/test-e2e.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ jobs:
100100

101101
steps:
102102
- name: checkout Next.js repo
103-
uses: actions/checkout@v4
103+
uses: actions/checkout@v5
104104
with:
105105
repository: ${{ env.NEXT_REPO }}
106106
path: ${{ env.next-path }}
107107
ref: ${{ matrix.version_spec.tag }}
108108

109109
- name: checkout runtime repo
110-
uses: actions/checkout@v4
110+
uses: actions/checkout@v5
111111
with:
112112
path: ${{ env.runtime-path }}
113113

@@ -146,7 +146,7 @@ jobs:
146146
- name: patch Next.js
147147
run: |
148148
cp ../${{ env.runtime-path }}/tests/netlify-deploy.ts test/lib/next-modes/
149-
git apply ../${{ env.runtime-path }}/tests/e2e-utils.patch || git apply ../${{ env.runtime-path }}/tests/e2e-utils-v2.patch
149+
git apply ../${{ env.runtime-path }}/tests/e2e-utils.patch || git apply ../${{ env.runtime-path }}/tests/e2e-utils-v2.patch || git apply ../${{ env.runtime-path }}/tests/e2e-utils-v3.patch
150150
working-directory: ${{ env.next-path }}
151151

152152
- name: install Next.js
@@ -165,7 +165,7 @@ jobs:
165165
uses: denoland/setup-deno@v1
166166
with:
167167
# Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
168-
deno-version: v1.46.3
168+
deno-version: v2.2.4
169169

170170
- name: install runtime
171171
run: npm install --ignore-scripts
@@ -231,7 +231,7 @@ jobs:
231231

232232
steps:
233233
- name: checkout runtime repo
234-
uses: actions/checkout@v4
234+
uses: actions/checkout@v5
235235

236236
- name: Install Deno
237237
uses: denoland/setup-deno@v1

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "5.11.6"
2+
".": "5.12.0"
33
}

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [5.12.0](https://github.com/opennextjs/opennextjs-netlify/compare/v5.11.6...v5.12.0) (2025-07-31)
4+
5+
6+
### Features
7+
8+
* restore NETLIFY_NEXT_PLUGIN_SKIP ([#3017](https://github.com/opennextjs/opennextjs-netlify/issues/3017)) ([0b51c47](https://github.com/opennextjs/opennextjs-netlify/commit/0b51c4741ee82a230987122c222a14415f65dfd9))
9+
310
## [5.11.6](https://github.com/opennextjs/opennextjs-netlify/compare/v5.11.5...v5.11.6) (2025-07-14)
411

512

0 commit comments

Comments
 (0)