Merge branch 'main' into pieh-patch-1

Author: LekoArts

.github/workflows/add-to-project.yml

@@ -14,7 +14,7 @@ jobs:
           app_id: ${{ secrets.TOKENS_APP_ID }}
           private_key: ${{ secrets.TOKENS_PRIVATE_KEY }}
       - name: Add issue to Project
-        uses: actions/add-to-project@v0.4.1
+        uses: actions/add-to-project@v0.5.0
         with:
           project-url: https://github.com/orgs/netlify/projects/199
           github-token: ${{ steps.generate_token.outputs.token }}

.github/workflows/cypress-canary.yml

@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - 'demos/canary/**/*.{js,jsx,ts,tsx}'
-      - 'cypress/integration/canary/**/*.{ts,js}'
+      - 'cypress/e2e/canary/**/*.{ts,js}'
       - 'src/**/*.{ts,js}'
 jobs:
   cypress:
@@ -56,15 +56,15 @@ jobs:
       - name: Cypress run
         if: ${{ steps.deploy.outputs.origin-url }}
         id: cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
           browser: chrome
           headless: true
           record: true
           parallel: true
-          config-file: cypress/config/canary.json
+          config-file: cypress/config/canary.config.ts
           group: 'Next Runtime - Demo Canary'
-          spec: cypress/integration/canary/*
+          spec: cypress/e2e/canary/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-demo-nx.yml

@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - 'demos/nx-next-monorepo-demo/**/*.{js,jsx,ts,tsx}'
-      - 'cypress/integration/nx/**/*.{ts,js}'
+      - 'cypress/e2e/nx/**/*.{ts,js}'
       - 'src/**/*.{ts,js}'
 jobs:
   cypress:
@@ -56,15 +56,15 @@ jobs:
       - name: Cypress run
         if: ${{ steps.deploy.outputs.origin-url }}
         id: cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
           browser: chrome
           headless: true
           record: true
           parallel: true
-          config-file: cypress/config/nx-demo.json
+          config-file: cypress/config/nx-demo.config.ts
           group: 'Next Runtime - Demo NX'
-          spec: cypress/integration/nx/*
+          spec: cypress/e2e/nx/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-demo-static.yml

@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - 'demos/static-root/**/*.{js,jsx,ts,tsx}'
-      - 'cypress/integration/static/**/*.{ts,js}'
+      - 'cypress/e2e/static/**/*.{ts,js}'
       - 'src/**/*.{ts,js}'
 jobs:
   cypress:
@@ -56,15 +56,15 @@ jobs:
       - name: Cypress run
         if: ${{ steps.deploy.outputs.origin-url }}
         id: cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
           browser: chrome
           headless: true
           record: true
           parallel: true
-          config-file: cypress/config/static-root.json
+          config-file: cypress/config/static-root.config.ts
           group: 'Next Runtime - Demo Static'
-          spec: cypress/integration/static-root/*
+          spec: cypress/e2e/static-root/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-demo.yml

@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - 'demos/default/**/*.{js,jsx,ts,tsx}'
-      - 'cypress/integration/default/**/*.{ts,js}'
+      - 'cypress/e2e/default/**/*.{ts,js}'
       - 'src/**/*.{ts,js}'
 jobs:
   cypress:
@@ -56,15 +56,15 @@ jobs:
       - name: Cypress run
         if: ${{ steps.deploy.outputs.origin-url }}
         id: cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
           browser: chrome
           headless: true
           record: true
           parallel: true
-          config-file: cypress/config/ci.json
+          config-file: cypress/config/ci.config.ts
           group: 'Next Runtime - Demo'
-          spec: cypress/integration/default/*
+          spec: cypress/e2e/default/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/cypress-middleware.yml

@@ -7,7 +7,7 @@ on:
       - main
     paths:
       - 'demos/middleware/**/*.{js,jsx,ts,tsx}'
-      - 'cypress/integration/middleware/**/*.{ts,js}'
+      - 'cypress/e2e/middleware/**/*.{ts,js}'
       - 'src/**/*.{ts,js}'
 jobs:
   cypress:
@@ -56,15 +56,15 @@ jobs:
       - name: Cypress run
         if: ${{ steps.deploy.outputs.origin-url }}
         id: cypress
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
           browser: chrome
           headless: true
           record: true
           parallel: true
-          config-file: cypress/config/middleware.json
+          config-file: cypress/config/middleware.config.ts
           group: 'Next Runtime - Middleware'
-          spec: cypress/integration/middleware/*
+          spec: cypress/e2e/middleware/*
         env:
           DEBUG: '@cypress/github-action'
           CYPRESS_baseUrl: ${{ steps.deploy.outputs.origin-url }}

.github/workflows/e2e-appdir.yml

@@ -35,7 +35,13 @@ jobs:
         test-file: ${{ fromJson(needs.setup.outputs['test-files']) }}
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          cache: 'npm'
       - run: npm install
+      - name: Install Netlify CLI
+        run: npm install -g netlify-cli
       - name: Run tests
         run: npx jest --reporters=jest-junit --reporters=default -c test/e2e/jest.config.all.js ${{ matrix.test-file }}
         env:

.github/workflows/e2e-next.yml

@@ -1,10 +1,12 @@
 name: Next.js e2e test suite
 
 on:
-  pull_request:
-    types: [opened, synchronize]
-  push:
-    branches: [main]
+  # pull_request:
+  #   types: [opened, synchronize]
+  # push:
+  #   branches: [main]
+  schedule:
+    - cron: '0 0 * * *'
 
 jobs:
   setup:
@@ -35,7 +37,13 @@ jobs:
         test-file: ${{ fromJson(needs.setup.outputs['test-files']) }}
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          cache: 'npm'
       - run: npm install
+      - name: Install Netlify CLI
+        run: npm install -g netlify-cli
       - name: Run tests
         run: npx jest --reporters=jest-junit --reporters=default -c test/e2e/jest.config.all.js ${{ matrix.test-file }}
         env:

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.33.0",
-  "packages/next": "1.4.4"
+  "packages/runtime": "4.36.0",
+  "packages/next": "1.4.5"
 }

cypress/config/all.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  video: false,
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+  },
+})

cypress/config/all.json

@@ -0,0 +1,10 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+    // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
+    "specPattern": "cypress/e2e/canary",
+    "projectId": "5zbkdv"
+  },
+})

cypress/config/canary.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+    // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
+    "specPattern": "cypress/e2e/default",
+    "projectId": "66va58"
+  },
+})

cypress/config/canary.json

@@ -0,0 +1,10 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:8888',
+    // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
+    "specPattern": "cypress/e2e/middleware",
+    "projectId": "yn8qwi"
+  },
+})

cypress/config/ci.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:4200',
+    // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
+    "specPattern": "cypress/e2e/nx",
+    "projectId": "ijcdpo"
+  },
+})

cypress/config/ci.json

@@ -0,0 +1,11 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+    // integrationFolder was replaced by specPattern in Cypress 12 https://docs.cypress.io/guides/references/migration-guide#integrationFolder
+    "specPattern": "cypress/e2e/static-root",
+    "projectId": "3tvrbe"
+  },
+})
+

cypress/config/middleware.config.ts

@@ -2,7 +2,7 @@ import { ImageResponse } from '@vercel/og'
 import { NextRequest } from 'next/server'
 
 export const config = {
-  runtime: 'experimental-edge',
+  runtime: 'edge',
 }
 
 export default async function handler(req: NextRequest) {

cypress/config/middleware.json

@@ -1,5 +1,5 @@
 export const config = {
-  runtime: 'experimental-edge',
+  runtime: 'edge',
 }
 
 export default (req) => new Response('Hello world!')