_redirects file: Remove path param from Netlify functions

In the past, there was a difference between how Netlify and netlify dev
handled redirects. Only on the Netlify platform would the original path
be available to the function (e.g. /mypage). Locally, only the function
path would be available (e.g. /.netlify/functions/nextRouter).

This caused a problem when we want to identify the page to render in
nextRouter. Locally, we did not know the original path as requested by
the user. To work around that, we passed the page's path as a parameter
to the function call.

This behavior of netlify dev was fixed in
netlify/cli#713

Author: FinnWoelm

lib/routerTemplate.js

@@ -25,34 +25,21 @@ const getRoute = path => {
 }
 
 exports.handler = (event, context, callback) => {
-  // The following lines set event.path in development environments.
-  // There is a difference in how Netlify handles redirects locally vs
-  // production. Locally, event.path is set to the target of the redirect:
-  // /.netlify/functions/nextRouter?_path=...
-  // Deployed on Netlify, event.path is the source of the redirect: /posts/3
-  const isProduction = context.hasOwnProperty('awsRequestId')
-  if(!isProduction) {
-    event.path = event.queryStringParameters._path
-  }
-
   // Get the request URL
   const { path } = event
   console.log("[request]", path)
 
-
   // Identify the file to render
   const { file } = getRoute(path)
   console.log("[render] ", file)
 
-
   // Load the page to render
   // Do not do this: const page = require(`./${file}`)
   // Otherwise, Netlify's zip-it-and-ship-it will attempt to bundle "./"
   // into the function's zip folder and the build will fail
   const pathToFile = `./${file}`
   const page = require(pathToFile)
 
-
   // Render the page
   compat(page)(
     {

next-on-netlify.js

@@ -124,7 +124,7 @@ const htmlRedirects = htmlPages.map(({ route, file }) => (
   `${route}  /_next/${file}  200`
 ))
 const ssrRedirects = ssrPages.map(({ route }) => (
-  `${route}  /.netlify/functions/${ROUTER_FUNCTION_NAME}?_path=${route}  200`
+  `${route}  /.netlify/functions/${ROUTER_FUNCTION_NAME}  200`
 ))
 const nextjsRedirects = [...htmlRedirects, ...ssrRedirects].join("\n")
 

tests/customNextDistDir.test.js

@@ -133,9 +133,9 @@ describe('Routing',() => {
     // Check that routes are present
     expect(redirects).toContain("/static  /_next/pages/static.html  200")
     expect(redirects).toContain("/static/:id  /_next/pages/static/[id].html  200")
-    expect(redirects).toContain("/  /.netlify/functions/nextRouter?_path=/  200")
-    expect(redirects).toContain("/index  /.netlify/functions/nextRouter?_path=/index  200")
-    expect(redirects).toContain("/shows/:id  /.netlify/functions/nextRouter?_path=/shows/:id  200")
-    expect(redirects).toContain("/shows/*  /.netlify/functions/nextRouter?_path=/shows/*  200")
+    expect(redirects).toContain("/  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/index  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/shows/:id  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/shows/*  /.netlify/functions/nextRouter  200")
   })
 })

tests/defaults.test.js

@@ -133,9 +133,9 @@ describe('Routing',() => {
     // Check that routes are present
     expect(redirects).toContain("/static  /_next/pages/static.html  200")
     expect(redirects).toContain("/static/:id  /_next/pages/static/[id].html  200")
-    expect(redirects).toContain("/  /.netlify/functions/nextRouter?_path=/  200")
-    expect(redirects).toContain("/index  /.netlify/functions/nextRouter?_path=/index  200")
-    expect(redirects).toContain("/shows/:id  /.netlify/functions/nextRouter?_path=/shows/:id  200")
-    expect(redirects).toContain("/shows/*  /.netlify/functions/nextRouter?_path=/shows/*  200")
+    expect(redirects).toContain("/  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/index  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/shows/:id  /.netlify/functions/nextRouter  200")
+    expect(redirects).toContain("/shows/*  /.netlify/functions/nextRouter  200")
   })
 })