From 1d2eeba8f49d19bb89d368026a089c7a83e36a79 Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Wed, 20 Jul 2022 14:26:26 -0400 Subject: [PATCH 1/5] fix: update where middleware is found in project Changes were required due to breaking changes in next@12.2 --- pages/_middleware.js => middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename pages/_middleware.js => middleware.js (74%) diff --git a/pages/_middleware.js b/middleware.js similarity index 74% rename from pages/_middleware.js rename to middleware.js index d779ef1..6ef4f14 100644 --- a/pages/_middleware.js +++ b/middleware.js @@ -1,4 +1,4 @@ -import { NextRequest, NextResponse } from 'next/server' +import { NextResponse } from 'next/server' export async function middleware(req) { const { nextUrl: url, geo } = req From 64f9e41fa301fea71eee6566d76aa3cbb2460991 Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Wed, 20 Jul 2022 15:24:53 -0400 Subject: [PATCH 2/5] test: debug logging --- middleware.js | 1 + 1 file changed, 1 insertion(+) diff --git a/middleware.js b/middleware.js index 6ef4f14..a65899a 100644 --- a/middleware.js +++ b/middleware.js @@ -1,6 +1,7 @@ import { NextResponse } from 'next/server' export async function middleware(req) { + console.log('REQUEST RECEIVED', req) const { nextUrl: url, geo } = req url.searchParams.set('country', geo.country) return NextResponse.rewrite(url) From 3dc4b7bafe98288882b2b4fe7eef47ca2a74837c Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Wed, 20 Jul 2022 15:31:30 -0400 Subject: [PATCH 3/5] test: more debugging --- middleware.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/middleware.js b/middleware.js index a65899a..6f05b81 100644 --- a/middleware.js +++ b/middleware.js @@ -1,8 +1,9 @@ import { NextResponse } from 'next/server' -export async function middleware(req) { +export async function middleware(req, context) { console.log('REQUEST RECEIVED', req) - const { nextUrl: url, geo } = req - url.searchParams.set('country', geo.country) + console.log('CONTEXT', context) + const { nextUrl: url } = req + url.searchParams.set('country', context.geo?.country || 'NZ') return NextResponse.rewrite(url) } From 140417e4bfe881008e76108eda69388153d3e04c Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Thu, 21 Jul 2022 09:08:39 -0400 Subject: [PATCH 4/5] test --- middleware.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/middleware.js b/middleware.js index 6f05b81..d11fa55 100644 --- a/middleware.js +++ b/middleware.js @@ -1,9 +1,8 @@ import { NextResponse } from 'next/server' -export async function middleware(req, context) { +export async function middleware(req) { console.log('REQUEST RECEIVED', req) - console.log('CONTEXT', context) - const { nextUrl: url } = req - url.searchParams.set('country', context.geo?.country || 'NZ') - return NextResponse.rewrite(url) + const { nextUrl: url, geo } = req + url.searchParams.set('country', geo.country) + return NextResponse.redirect(url) } From 3712d2934516f1ea9737a4ec782ef91c9e06a0cc Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Thu, 21 Jul 2022 09:34:29 -0400 Subject: [PATCH 5/5] Go back to original implementation as it works --- middleware.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/middleware.js b/middleware.js index d11fa55..6ef4f14 100644 --- a/middleware.js +++ b/middleware.js @@ -1,8 +1,7 @@ import { NextResponse } from 'next/server' export async function middleware(req) { - console.log('REQUEST RECEIVED', req) const { nextUrl: url, geo } = req url.searchParams.set('country', geo.country) - return NextResponse.redirect(url) + return NextResponse.rewrite(url) }