Merge branch 'main' into mk/all-the-tests

Author: ascorbic

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.29.1",
-  "packages/next": "1.4.0"
+  "packages/runtime": "4.29.2",
+  "packages/next": "1.4.1"
 }

cypress/integration/middleware/enhanced.spec.ts

@@ -25,4 +25,15 @@ describe('Enhanced middleware', () => {
         .that.includes('This was static but has been transformed in')
     })
   })
+
+  it('adds geo data', () => {
+    cy.request('/api/geo').then((response) => {
+      expect(response.body).to.have.nested.property('headers.x-geo-country')
+      expect(response.body).to.have.nested.property('headers.x-geo-region')
+      expect(response.body).to.have.nested.property('headers.x-geo-city')
+      expect(response.body).to.have.nested.property('headers.x-geo-longitude')
+      expect(response.body).to.have.nested.property('headers.x-geo-latitude')
+      expect(response.body).to.have.nested.property('headers.x-geo-timezone')
+    })
+  })
 })

demos/middleware/middleware.ts

@@ -1,7 +1,5 @@
 import { NextResponse } from 'next/server'
-import type { NextRequest } from 'next/server'
-
-import { MiddlewareRequest } from '@netlify/next'
+import { MiddlewareRequest, NextRequest } from '@netlify/next'
 
 export async function middleware(req: NextRequest) {
   let response
@@ -29,6 +27,17 @@ export async function middleware(req: NextRequest) {
     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)
+    req.headers.set('x-geo-city', req.geo.city)
+    req.headers.set('x-geo-longitude', req.geo.longitude)
+    req.headers.set('x-geo-latitude', req.geo.latitude)
+    req.headers.set('x-geo-timezone', req.geo.timezone)
+
+    return request.next()
+  }
+
   if (pathname.startsWith('/headers')) {
     // Add a header to the rewritten request
     req.headers.set('x-hello', 'world')

demos/middleware/pages/api/geo.js

@@ -0,0 +1,3 @@
+export default function handler(req, res) {
+  res.status(200).json({ name: 'geo-test', headers: req.headers })
+}

package-lock.json

@@ -50,7 +50,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^28.1.14",
+    "@netlify/build": "^28.2.2",
     "@netlify/eslint-config-node": "^7.0.0",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.1](https://github.com/netlify/next-runtime/compare/next-v1.4.0...next-v1.4.1) (2022-11-21)
+
+
+### Bug Fixes
+
+* add longitude, latitude, and timezone to RequestData.geo ([#1777](https://github.com/netlify/next-runtime/issues/1777)) ([3f35549](https://github.com/netlify/next-runtime/commit/3f355497f02726a54aa0b5f391c3e9684d45228f))
+
 ## [1.4.0](https://github.com/netlify/next-runtime/compare/next-v1.3.1...next-v1.4.0) (2022-10-25)
 
 

packages/next/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/next",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Enhanced Next.js features on Netlify",
   "main": "lib/index.js",
   "files": [

packages/next/package.json

@@ -1,9 +1,15 @@
 import type { NextURL } from 'next/dist/server/web/next-url'
 import { NextResponse } from 'next/server'
-import type { NextRequest } from 'next/server'
+import type { NextRequest as InternalNextRequest } from 'next/server'
 
 import { MiddlewareResponse } from './response'
 
+export type NextRequest = InternalNextRequest & {
+  get geo(): {
+    timezone?: string
+  }
+}
+
 export interface NextOptions {
   /**
    * Include conditional request headers in the request to the origin.

packages/next/src/middleware/request.ts

@@ -25,6 +25,9 @@ describe('MiddlewareRequest', () => {
           code: chance.province(),
         },
         city: chance.city(),
+        latitude: chance.latitude(),
+        longitude: chance.longitude(),
+        timezone: chance.timezone(),
       },
       ip,
     }
@@ -33,6 +36,9 @@ describe('MiddlewareRequest', () => {
       country: context.geo.country?.code,
       region: context.geo.subdivision?.code,
       city: context.geo.city,
+      latitude: context.geo.latitude?.toString(),
+      longitude: context.geo.longitude?.toString(),
+      timezone: context.geo.timezone,
     }
 
     const req = new URL(url)

packages/next/test/request.spec.ts

@@ -1,5 +1,13 @@
 # Changelog
 
+## [4.29.2](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.29.1...plugin-nextjs-v4.29.2) (2022-11-21)
+
+
+### Bug Fixes
+
+* add longitude, latitude, and timezone to RequestData.geo ([#1777](https://github.com/netlify/next-runtime/issues/1777)) ([3f35549](https://github.com/netlify/next-runtime/commit/3f355497f02726a54aa0b5f391c3e9684d45228f))
+* resolve all pages using nft ([#1780](https://github.com/netlify/next-runtime/issues/1780)) ([267ff0b](https://github.com/netlify/next-runtime/commit/267ff0b5ecf5d9fe5154955542887d9c0c573b85))
+
 ## [4.29.1](https://github.com/netlify/next-runtime/compare/plugin-nextjs-v4.29.0...plugin-nextjs-v4.29.1) (2022-11-14)
 
 

packages/runtime/CHANGELOG.md

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

packages/runtime/package.json

@@ -43,11 +43,14 @@ const handler = async (req, context) => {
     return
   }
 
-  //  This is the format expected by Next.js
+  //  This is the format expected by Next.js along with the timezone which we support.
   const geo = {
     country: context.geo.country?.code,
     region: context.geo.subdivision?.code,
     city: context.geo.city,
+    latitude: context.geo.latitude?.toString(),
+    longitude: context.geo.longitude?.toString(),
+    timezone: context.geo.timezone,
   }
 
   // A default request id is fine locally

packages/runtime/src/templates/edge/next-dev.js

@@ -20,6 +20,7 @@ export interface RequestData {
     region?: string
     latitude?: string
     longitude?: string
+    timezone?: string
   }
   headers: Record<string, string>
   ip?: string
@@ -63,10 +64,13 @@ const handler = async (req: Request, context: Context) => {
     return
   }
 
-  const geo = {
+  const geo: RequestData['geo'] = {
     country: context.geo.country?.code,
     region: context.geo.subdivision?.code,
     city: context.geo.city,
+    latitude: context.geo.latitude?.toString(),
+    longitude: context.geo.longitude?.toString(),
+    timezone: context.geo.timezone,
   }
 
   const requestId = req.headers.get('x-nf-request-id')