Merge branch 'main' into deno-v2

Author: mrstork

.github/workflows/deno-test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: 'Install Node'
         uses: actions/setup-node@v4

.github/workflows/e2e-report.yml

@@ -26,7 +26,7 @@ jobs:
   setup:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Get run id
         id: get-run-id
         run: |

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.head_ref }}
           fetch-depth: 0

.github/workflows/pre-release.yml

@@ -12,7 +12,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version: lts/*

.github/workflows/release-please.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: googleapis/release-please-action@v4
         id: release
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         if: ${{ steps.release.outputs.release_created }}
       - uses: actions/setup-node@v4
         with:

.github/workflows/run-tests.yml

@@ -51,7 +51,7 @@ jobs:
         shard: [1, 2, 3, 4, 5]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: 'Install Node'
         uses: actions/setup-node@v4
         with:
@@ -127,7 +127,7 @@ jobs:
             version: '14.2.15'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: 'Install Node'
         uses: actions/setup-node@v4
         with:
@@ -204,7 +204,7 @@ jobs:
       matrix:
         version: ${{ fromJson(needs.setup.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: 'Install Node'
         uses: actions/setup-node@v4
         with:
@@ -254,7 +254,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - uses: actions/setup-node@v4
       with:
         node-version: 18

.github/workflows/size-check.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/test-e2e.yml

@@ -100,14 +100,14 @@ jobs:
 
     steps:
       - name: checkout Next.js repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ env.NEXT_REPO }}
           path: ${{ env.next-path }}
           ref: ${{ matrix.version_spec.tag }}
 
       - name: checkout runtime repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: ${{ env.runtime-path }}
 
@@ -146,7 +146,7 @@ jobs:
       - name: patch Next.js
         run: |
           cp ../${{ env.runtime-path }}/tests/netlify-deploy.ts test/lib/next-modes/
-          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.patch || git apply ../${{ env.runtime-path }}/tests/e2e-utils-v2.patch || git apply ../${{ env.runtime-path }}/tests/e2e-utils-v3.patch
         working-directory: ${{ env.next-path }}
 
       - name: install Next.js
@@ -231,7 +231,7 @@ jobs:
 
     steps:
       - name: checkout runtime repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Deno
         uses: denoland/setup-deno@v1