Merge branch 'main' into rs/isr-i18n-homepage-revisit

Author: orinokai

.github/workflows/test-deno.yml

@@ -0,0 +1,21 @@
+name: Deno tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Git Checkout Deno Module
+        uses: actions/checkout@v2
+      - name: Use Deno Version ${{ matrix.deno-version }}
+        uses: denolib/setup-deno@v2
+        with:
+          deno-version: vx.x.x
+      - name: Test Deno
+        run: deno test packages/runtime/src/templates/edge-shared/

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.29.4",
+  "packages/runtime": "4.30.0",
   "packages/next": "1.4.3"
 }

cypress/integration/middleware/enhanced.spec.ts

@@ -1,16 +1,4 @@
 describe('Enhanced middleware', () => {
-  it('adds request headers', () => {
-    cy.request('/api/hello').then((response) => {
-      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
-    })
-  })
-
-  it('adds request headers to a rewrite', () => {
-    cy.request('/headers').then((response) => {
-      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
-    })
-  })
-
   it('rewrites the response body', () => {
     cy.visit('/static')
     cy.get('#message').contains('This was static but has been transformed in')

cypress/integration/middleware/standard.spec.ts

@@ -1,4 +1,16 @@
 describe('Standard middleware', () => {
+  it('adds request headers', () => {
+    cy.request('/api/hello').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
+    })
+  })
+
+  it('adds request headers to a rewrite', () => {
+    cy.request('/headers').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-hello', 'world')
+    })
+  })
+
   it('rewrites to internal page', () => {
     // preview mode is off by default
     cy.visit('/shows/rewriteme')

demos/middleware/middleware.ts

@@ -8,6 +8,18 @@ export async function middleware(req: NextRequest) {
   let response
   const { pathname } = req.nextUrl
 
+  if (pathname.startsWith('/api/hello')) {
+    // Next 13 request header mutation functionality
+    const headers = new Headers(req.headers)
+
+    headers.set('x-hello', 'world')
+    return NextResponse.next({
+      request: {
+        headers
+      }
+    })
+  }
+  
   const request = new MiddlewareRequest(req)
   if (pathname.startsWith('/static')) {
     // Unlike NextResponse.next(), this actually sends the request to the origin
@@ -24,12 +36,6 @@ export async function middleware(req: NextRequest) {
     return res
   }
 
-  if (pathname.startsWith('/api/hello')) {
-    // Add a header to the request
-    req.headers.set('x-hello', 'world')
-    return request.next()
-  }
-
   if (pathname.startsWith('/api/geo')) {
     req.headers.set('x-geo-country', req.geo.country)
     req.headers.set('x-geo-region', req.geo.region)

package-lock.json

@@ -18,6 +18,7 @@
     "postinstall": "run-s build install-husky",
     "install-husky": "if-env CI=1 || husky install node_modules/@netlify/eslint-config-node/.husky",
     "test": "run-s build:demo test:jest",
+    "test:deno": "deno test packages/runtime/src/templates/edge-shared/",
     "test:next": "jest -c test/e2e/jest.config.js",
     "test:next:disabled": "RUN_SKIPPED_TESTS=1 jest -c test/e2e/jest.config.disabled.js",
     "test:next:all": "RUN_SKIPPED_TESTS=1 jest -c test/e2e/jest.config.all.js",
@@ -51,7 +52,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.4.0",
+    "@netlify/build": "^29.4.2",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
@@ -101,7 +102,8 @@
       "**/test/**/*.spec.ts",
       "!**/test/e2e/**",
       "!**/test/fixtures/**",
-      "!**/test/sample/**"
+      "!**/test/sample/**",
+      "!**/test/templates/edge-shared/**"
     ],
     "transform": {
       "\\.[jt]sx?$": "babel-jest"

package.json

@@ -1,5 +1,20 @@
 # Changelog
 
+## [4.30.0](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.29.4...plugin-nextjs-v4.30.0) (2023-01-09)
+
+
+### Features
+
+* add Next 13 request header mutation to middleware ([#1866](https://github.com/netlify/next-runtime/issues/1866)) ([5d60191](https://github.com/netlify/next-runtime/commit/5d60191905e9df8ca6cec7dc586f95917906b750))
+
+
+### Bug Fixes
+
+* **deps:** update dependency @netlify/functions to ^1.4.0 ([#1869](https://github.com/netlify/next-runtime/issues/1869)) ([3960c31](https://github.com/netlify/next-runtime/commit/3960c31f5dc9067eac347f437274f18265ffb589))
+* **deps:** update dependency @netlify/ipx to ^1.3.3 ([#1868](https://github.com/netlify/next-runtime/issues/1868)) ([d75d0ff](https://github.com/netlify/next-runtime/commit/d75d0ffafdc7b7623328f5176e6d4cf45185e69e))
+* merge Middleware and API route response cookies ([#1870](https://github.com/netlify/next-runtime/issues/1870)) ([878ddd7](https://github.com/netlify/next-runtime/commit/878ddd750d21632d2f4e67d2f6d7724bffcef218))
+* serve static files from basePath ([#1850](https://github.com/netlify/next-runtime/issues/1850)) ([d4ff894](https://github.com/netlify/next-runtime/commit/d4ff894e88bed1138fefacb9ce2fcbe62f62f5b0))
+
 ## [4.29.4](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.29.3...plugin-nextjs-v4.29.4) (2022-12-19)
 
 

packages/runtime/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.29.4",
+  "version": "4.30.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.4.0",
+    "@netlify/build": "^29.4.2",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",

packages/runtime/package.json

@@ -0,0 +1,64 @@
+import { assertEquals } from 'https://deno.land/[email protected]/testing/asserts.ts'
+import { beforeEach, describe, it } from 'https://deno.land/[email protected]/testing/bdd.ts'
+import { updateModifiedHeaders, FetchEventResult } from './utils.ts'
+
+describe('updateModifiedHeaders', () => {
+  it("does not modify the headers if 'x-middleware-override-headers' is not found", () => {
+    const mockHeaders = new Headers()
+    // There shouldn't be a case where x-middleware-override-headers is not set and a header has
+    // been modified with 'x-middleware-request' added to it, this is more to confirm the test case
+    mockHeaders.set('x-middleware-request-foo', 'bar')
+
+    const mockResponse = {
+      headers: mockHeaders,
+    }
+
+    const mockRequest = {
+      headers: new Headers(),
+    }
+
+    updateModifiedHeaders(mockRequest.headers, mockResponse.headers)
+
+    assertEquals(mockRequest.headers.get('x-middleware-request-foo'), null)
+  })
+
+  describe("when the 'x-middleware-override-headers' headers is present", () => {
+    let mockHeaders
+    let mockRequest: { headers: Headers }
+    let mockResponse: { headers: Headers }
+
+    beforeEach(() => {
+      mockHeaders = new Headers()
+      mockHeaders.set('foo', 'bar')
+      mockHeaders.set('x-middleware-request-hello', 'world')
+      mockHeaders.set('x-middleware-request-test', '123')
+      mockHeaders.set('x-middleware-override-headers', 'hello,test')
+
+      mockRequest = {
+        headers: new Headers(),
+      }
+
+      mockResponse = {
+        headers: mockHeaders,
+      }
+
+      updateModifiedHeaders(mockRequest.headers, mockResponse.headers)
+    })
+
+    it("does not modify or add headers that are missing 'x-middleware-request' in the name", () => {
+      assertEquals(mockRequest.headers.get('foo'), null)
+    })
+
+    it("removes 'x-middleware-request-' from headers", () => {
+      assertEquals(mockRequest.headers.get('x-middleware-request-hello'), null)
+      assertEquals(mockRequest.headers.get('x-middleware-request-test'), null)
+
+      assertEquals(mockRequest.headers.get('hello'), 'world')
+      assertEquals(mockRequest.headers.get('test'), '123')
+    })
+
+    it("removes 'x-middleware-override-headers' after cleaning headers", () => {
+      assertEquals(mockRequest.headers.get('x-middleware-override-headers'), null)
+    })
+  })
+})