Fix patterns in custom-route destination failing to compile

packages/next/next-server/server/lib/path-match.ts

@@ -18,30 +18,18 @@ export default (customRoute = false) => {
       matcherOptions
     )
 
-    return (pathname: string | null | undefined, params?: any) => {
+    const wrappedMatcher = (
+      pathname: string | null | undefined,
+      params?: any
+    ) => {
       const res = pathname == null ? false : matcher(pathname)
       if (!res) {
         return false
       }
 
-      if (customRoute) {
-        const newParams: { [k: string]: string } = {}
-        for (const key of keys) {
-          // unnamed matches should always be a number while named
-          // should be a string
-          if (typeof key.name === 'number') {
-            newParams[key.name + 1 + ''] = (res.params as any)[key.name + '']
-            delete (res.params as any)[key.name + '']
-          }
-        }
-        res.params = {
-          ...res.params,
-          ...newParams,
-        }
-      }
-
       return { ...params, ...res.params }
     }
+    return wrappedMatcher
   }
 }
 

packages/next/next-server/server/next-server.ts

@@ -454,9 +454,12 @@ export default class Server {
             fn: async (_req, res, params, _parsedUrl) => {
               const parsedDestination = parseUrl(route.destination, true)
               const destQuery = parsedDestination.query
-              let destinationCompiler = compilePathToRegex(
-                `${parsedDestination.pathname!}${parsedDestination.hash || ''}`
-              )
+              let destToCompile = `${parsedDestination.pathname!}${parsedDestination.hash ||
+                ''}`
+
+              let destinationCompiler = compilePathToRegex(destToCompile, {
+                validate: false,
+              })
               let newUrl
 
               Object.keys(destQuery).forEach(key => {

test/integration/custom-routes/next.config.js

@@ -61,7 +61,7 @@ module.exports = {
         },
         {
           source: '/api-hello-regex/(.*)',
-          destination: '/api/hello?name=:1',
+          destination: '/api/hello?name=:0',
         },
         {
           source: '/api-hello-param/:name',
@@ -138,14 +138,24 @@ module.exports = {
         },
         {
           source: '/unnamed/(first|second)/(.*)',
-          destination: '/:1/:2',
+          destination: '/:0/:1',
           permanent: false,
         },
         {
           source: '/named-like-unnamed/:0',
           destination: '/:0',
           permanent: false,
         },
+        {
+          source: '/unnamed-params/nested/(.*?)/:test/(.*)',
+          destination: '/another/:0/:test/:1',
+          permanent: false,
+        },
+        {
+          source: '/docs/:first(integrations|now-cli)/v2:second(.*)',
+          destination: '/:first/:second',
+          permanent: false,
+        },
       ]
     },
 

test/integration/custom-routes/test/index.test.js

@@ -267,7 +267,7 @@ const runTests = (isDev = false) => {
   it('should handle api rewrite with un-named param successfully', async () => {
     const data = await renderViaHTTP(appPort, '/api-hello-regex/hello/world')
     expect(JSON.parse(data)).toEqual({
-      query: { '1': 'hello/world', name: 'hello/world' },
+      query: { '0': 'hello/world', name: 'hello/world' },
     })
   })
 
@@ -276,6 +276,34 @@ const runTests = (isDev = false) => {
     expect(JSON.parse(data)).toEqual({ query: { name: 'hello' } })
   })
 
+  it('should handle unnamed parameters with multi-match successfully', async () => {
+    const res = await fetchViaHTTP(
+      appPort,
+      '/unnamed-params/nested/first/second/hello/world',
+      undefined,
+      {
+        redirect: 'manual',
+      }
+    )
+    const { pathname } = url.parse(res.headers.get('location') || '')
+    expect(res.status).toBe(307)
+    expect(pathname).toBe('/another/first/second/hello/world')
+  })
+
+  it('should handle named regex parameters with multi-match successfully', async () => {
+    const res = await fetchViaHTTP(
+      appPort,
+      '/docs/integrations/v2-some/thing',
+      undefined,
+      {
+        redirect: 'manual',
+      }
+    )
+    const { pathname } = url.parse(res.headers.get('location') || '')
+    expect(res.status).toBe(307)
+    expect(pathname).toBe('/integrations/-some/thing')
+  })
+
   if (!isDev) {
     it('should output routes-manifest successfully', async () => {
       const manifest = await fs.readJSON(
@@ -376,7 +404,7 @@ const runTests = (isDev = false) => {
             statusCode: 307,
           },
           {
-            destination: '/:1/:2',
+            destination: '/:0/:1',
             regex: normalizeRegEx(
               '^\\/unnamed(?:\\/(first|second))(?:\\/(.*))$'
             ),
@@ -389,6 +417,22 @@ const runTests = (isDev = false) => {
             source: '/named-like-unnamed/:0',
             statusCode: 307,
           },
+          {
+            destination: '/another/:0/:test/:1',
+            regex: normalizeRegEx(
+              '^\\/unnamed-params\\/nested(?:\\/(.*?))(?:\\/([^\\/]+?))(?:\\/(.*))$'
+            ),
+            source: '/unnamed-params/nested/(.*?)/:test/(.*)',
+            statusCode: 307,
+          },
+          {
+            destination: '/:first/:second',
+            regex: normalizeRegEx(
+              '^\\/docs(?:\\/(integrations|now-cli))\\/v2(.*)$'
+            ),
+            source: '/docs/:first(integrations|now-cli)/v2:second(.*)',
+            statusCode: 307,
+          },
         ],
         headers: [
           {
@@ -498,7 +542,7 @@ const runTests = (isDev = false) => {
             source: '/api-hello',
           },
           {
-            destination: '/api/hello?name=:1',
+            destination: '/api/hello?name=:0',
             regex: normalizeRegEx('^\\/api-hello-regex(?:\\/(.*))$'),
             source: '/api-hello-regex/(.*)',
           },