Merge branch 'main' into background-function-token

Author: nickytonline

.eslintrc.js

@@ -51,10 +51,11 @@ module.exports = {
         // https://github.com/typescript-eslint/typescript-eslint/issues/2483
         'no-shadow': 'off',
         '@typescript-eslint/no-shadow': 'error',
+        'import/max-dependencies': 'off',
       },
     },
     {
-      files: ['cypress/**/*.spec.ts'],
+      files: ['cypress/**/*.cy.ts'],
       rules: {
         'max-nested-callbacks': 0,
         'promise/prefer-await-to-then': 0,

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

@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@v1.5.2
+        uses: tibdex/github-app-token@v1.8.0
         with:
           app_id: ${{ secrets.TOKENS_APP_ID }}
           private_key: ${{ secrets.TOKENS_PRIVATE_KEY }}

.github/workflows/add-zenhub-label.yml

@@ -0,0 +1,24 @@
+# Ensure we add the correct ZenHub label for all new issues
+# Avoids problem where checklist issues are not added to the correct ZenHub pipeline
+
+name: Add ZenHub label to issues
+on:
+  issues:
+    types:
+      - reopened
+      - opened
+jobs:
+  label_issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["Ecosystem: Frameworks"]
+            })

.github/workflows/labeler.yml

@@ -19,7 +19,7 @@ jobs:
             { prefix: 'security', type: 'security' },
           ]
     steps:
-      - uses: netlify/pr-labeler-action@v1.0.0
+      - uses: netlify/pr-labeler-action@v1.1.0
         if: startsWith(github.event.pull_request.title, matrix.pr.prefix)
         with:
           token: '${{ secrets.GITHUB_TOKEN }}'

.nvmrc

@@ -1 +1 @@
-16.15.1
+16.20.1

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.37.1",
-  "packages/next": "1.4.6"
+  "packages/runtime": "4.39.1",
+  "packages/next": "1.4.9"
 }

cypress/e2e/default/api.cy.ts

@@ -6,6 +6,14 @@ describe('API routes', () => {
   })
 })
 
+describe('Dynamic API routes', () => {
+  it('are bundled correctly', () => {
+    cy.request('/api/shows/1').then((response) => {
+      expect(response.status).to.equal(200)
+    })
+  })
+})
+
 describe('Extended API routes', () => {
   it('returns HTTP 202 Accepted for background route', () => {
     cy.request('POST', 'https://webhook.site/token').then((tokenResponse) => {

cypress/e2e/default/custom-errors.cy.ts

@@ -4,11 +4,11 @@
  describe('Custom error pages', () => {
   it('should show custom 404 page on /404', () => {
     cy.visit('/404', {failOnStatusCode: false})
-    cy.findByText('Custom 404 - Page Not Found')
+    cy.findByText('Custom 404 - Page Not Found', { selector: 'h1' })
   })
 
   it('should show custom 500 page on /500', () => {
     cy.visit('/500', {failOnStatusCode: false})
-    cy.findByText('Custom 500 - Server-side error occurred')
+    cy.findByText('Custom 500 - Server-side error occurred', { selector: 'h1' })
   })
 })

cypress/e2e/default/i18n.cy.ts

@@ -35,4 +35,34 @@ describe('Localization', () => {
 
     cy.findByText('The current locale is en')
   })
+
+  it(`function handler doesn't produce locale when first language in 'Accept-Language' header is not matching any of locales`, () => {
+    cy.request({
+      url: `/`,
+      followRedirect: false,
+      headers: {
+        // jp is not in i18n config, fr is in config
+        // Netlify Redirects only match on first language
+        // https://docs.netlify.com/routing/redirects/redirect-options/#redirect-by-country-or-language
+        // > Language-based redirects always match against the first language reported by the browser in the Accept-Language header regardless of quality value weighting.
+        // while Next.js matches on every language: https://github.com/vercel/next.js/blob/5d9597879c46b383d595d6f7b37fd373325b7544/test/unit/accept-headers.test.ts
+        'Accept-Language': 'jp, fr;q=0.9',
+        // make sure we don't use cached results
+        cookie: '__prerender_bypass=1',
+        // above cookie header cause us to hit non-ODB function variant
+        // below header allow us to force ODB-only code path despite not running ODB (this is just for testing purposes)
+        'x-next-just-first-accept-language': '1',
+      },
+    }).then((response) => {
+      // make sure we didn't hit SSR handler - not ODB and nothing else handles this request
+      // once platform starts supporting more languages in Accept-Language header - this test
+      // will start failing because then we will get platform level redirect
+      expect(response.headers['x-nf-render-mode']).to.eq('ssr')
+
+      // we don't expect for function handler to respond with a redirect
+      // locale redirects should be handled by Netlify redirects
+      // otherwise we could wrongly cache locale redirect generated by ODB
+      expect(response.status).to.eq(200)
+    })
+  })
 })

cypress/e2e/default/rewrites-redirects.cy.ts

@@ -1,5 +1,6 @@
 describe('Rewrites and Redirects', () => {
-  it('rewrites: points /old to /', () => {
+  // TODO: detect if rewrite is app or page route for __NEXT_PRIVATE_PREBUNDLED_REACT logic
+  it.skip('rewrites: points /old to /', () => {
     // preview mode is off by default
     cy.visit('/old')
     cy.findByText('NextJS on Netlify (imported Header component)')

cypress/e2e/default/trailing-slash.cy.ts

@@ -1,11 +1,11 @@
 describe('Trailing slash enabled', () => {
-  it('should keep the trailing slash, i.e. points /old/ to /old/', () => {
-    cy.visit('/old/')
-    cy.url().should('eq', `${Cypress.config().baseUrl}/old/`)
+  it('should keep the trailing slash, i.e. points /static/ to /static/', () => {
+    cy.visit('/static/')
+    cy.url().should('eq', `${Cypress.config().baseUrl}/static/`)
   })
 
-  it('should put a trailing slash when there is none, i.e. points /old to /old/', () => {
-    cy.visit('/old')
-    cy.url().should('eq', `${Cypress.config().baseUrl}/old/`)
+  it('should put a trailing slash when there is none, i.e. points /static to /static/', () => {
+    cy.visit('/static')
+    cy.url().should('eq', `${Cypress.config().baseUrl}/static/`)
   })
 })

cypress/e2e/middleware/enhanced.cy.ts

@@ -1,5 +1,25 @@
 describe('Enhanced middleware', () => {
-  it('rewrites the response body', () => {
+  it('rewrites the response body using request.rewrite()', () => {
+    cy.visit('/request-rewrite')
+    cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
+    cy.contains("This is an ad that isn't shown by default")
+  })
+
+  it('modifies the page props when using request.rewrite()', () => {
+    cy.visit('/request-rewrite')
+    cy.get('script#__NEXT_DATA__').then((element) => {
+      const { props } = JSON.parse(element.text());
+      expect(props.pageProps.message).to.include('This was static (& escaping test &) but has been transformed in')
+    })
+  })
+
+  it('passes in headers within request.rewrite()', () => {
+    cy.request('/request-rewrite').then((response) => {
+      expect(response.headers).to.have.property('x-rewrite-test', 'hello')
+    })
+  })
+
+  it('rewrites the response body using request.next()', () => {
     cy.visit('/static')
     cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
     cy.contains("This is an ad that isn't shown by default")

cypress/e2e/middleware/standard.cy.ts

@@ -45,6 +45,12 @@ describe('Standard middleware', () => {
       expect(response.headers).to.have.property('x-foo', 'bar')
     })
   })
+
+  it('preserves locale on rewrites (skipMiddlewareUrlNormalize: true)', () => {
+    cy.visit('/de-de/locale-preserving-rewrite')
+    cy.get('div').should('contain', 'Locale: de-DE')
+    cy.url().should('eq', `${Cypress.config().baseUrl}/de-de/locale-preserving-rewrite`)
+  })
 })
 
 describe('Middleware matchers', () => {

demos/base-path/package.json

@@ -14,7 +14,7 @@
     "typescript": "^4.6.3"
   },
   "dependencies": {
-    "next": "^13.3.0"
+    "next": "^13.4.1"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

demos/canary/netlify.toml

@@ -3,6 +3,10 @@ command = "next build"
 publish = ".next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
+[build.environment]
+NEXT_SPLIT_API_ROUTES = "true"
+NEXT_BUNDLE_BASED_ON_NFT_FILES = "true"
+
 [[plugins]]
 package = "@netlify/plugin-nextjs"