Merge branch 'main' into fix/nextjsBody

Author: khuezy

README.md

@@ -1,6 +1,11 @@
 import { NextResponse } from "next/server";
 
 export async function middleware(request) {
+  if (request.nextUrl.pathname === "/middleware-rewrite") {
+    const { nextUrl: url } = request
+    url.searchParams.set("rewritten", "true")
+    return NextResponse.rewrite(url);
+  }
   if (request.nextUrl.pathname === "/middleware-redirect") {
     return NextResponse.redirect(new URL("/middleware-redirect-destination", request.url));
   }
@@ -25,8 +30,28 @@ export async function middleware(request) {
     console.log(await fetch("https://webhook.site/facbcacc-08f2-4fb1-b67f-a26e3382b64e"));
     return NextResponse.next();
   }
+  if (request.nextUrl.pathname === "/middleware-geolocation") {
+    const { nextUrl: url, geo } = request
+    //console.log("== request", request);
+    //console.log("== geo", geo);
+    const country = geo.country || "US"
+    const city = geo.city || "San Francisco"
+    const region = geo.region || "CA"
+  
+    url.searchParams.set('country', country)
+    url.searchParams.set('city', city)
+    url.searchParams.set('region', region)
+  
+    return NextResponse.rewrite(url);
+  }
 }
 
 export const config = {
-  matcher: ["/middleware-redirect", "/middleware-set-header", "/middleware-fetch"],
+  matcher: [
+    "/middleware-rewrite",
+    "/middleware-redirect",
+    "/middleware-set-header",
+    "/middleware-fetch",
+    "/middleware-geolocation",
+  ],
 }

example/middleware.js

@@ -31,11 +31,14 @@ export default function Home({}) {
         <Link href={`/ssr-redirect`}>Server Side Rendering — redirect</Link><br />
         <Link href={`/ssr-not-found`}>Server Side Rendering — page not found</Link><br />
         <Link href={`/api-route`}>API Route</Link><br />
+        <Link href={`/middleware-rewrite`}>Middleware — rewrite</Link><br />
         <Link href={`/middleware-redirect`}>Middleware — redirect</Link><br />
         <Link href={`/middleware-set-header`}>Middleware — set header</Link><br />
+        <Link href={`/middleware-geolocation`}>Middleware — geolocation</Link><br />
         <Link href={`/image-optimization-imported`}>Image Optimization — imported image</Link><br />
         <Link href={`/image-optimization-remote`}>Image Optimization — remote image</Link><br />
         <Link href={`/image-html-tag`}>Image using html image tag</Link><br />
+        <Link href={`/page-does-not-exist`}>404 Page not found</Link><br />
       </section>
     </Layout>
   );

example/pages/index.js

@@ -0,0 +1,26 @@
+import Layout from "../components/layout";
+
+export async function getServerSideProps(context) {
+  return {
+    props: {
+      qs: JSON.stringify(context.query),
+    },
+  };
+}
+
+export default function Page({ qs }) {
+  return (
+    <Layout>
+      <article>
+        <h1>
+          Middleware - geolocation
+        </h1>
+        <hr />
+        <p>
+          <b>Test 1:</b>
+          URL query contains country, city, and region: {qs}
+        </p>
+      </article>
+    </Layout>
+  );
+}

example/pages/middleware-geolocation.js

@@ -0,0 +1,27 @@
+import Layout from "../components/layout";
+
+export async function getServerSideProps(context) {
+  return {
+    props: {
+      isRewritten: context.query.rewritten === "true"
+        ? "✅"
+        : "❌",
+    },
+  };
+}
+
+export default function Page({ isRewritten }) {
+  return (
+    <Layout>
+      <article>
+        <h1>
+          Middleware - rewrite
+        </h1>
+        <hr />
+        <p>
+          <b>Test 1:</b>URL is rewritten { isRewritten }
+        </p>
+      </article>
+    </Layout>
+  );
+}

example/pages/middleware-rewrite.js

@@ -1,6 +1,6 @@
 {
   "name": "open-next",
-  "version": "0.4.0",
+  "version": "0.0.1",
   "description": "Open source Next.js serverless adapter",
   "homepage": "https://open-next.js.org",
   "type": "module",
@@ -25,7 +25,6 @@
     "@vercel/build-utils": "^5.7.0",
     "@vercel/next": "^3.3.2",
     "esbuild": "^0.15.18",
-    "node-fetch": "^3.3.0",
     "serverless-http": "^3.1.0",
     "yargs": "^17.6.2"
   },
@@ -39,7 +38,6 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/serverless-stack/open-next.git",
-    "directory": "cli"
+    "url": "git+https://github.com/serverless-stack/open-next.git"
   }
 }