Same problem with other approach

vercel · Jul 2, 2020 · b8db626 · b8db626
1 parent 657ea99
commit b8db626
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/next/lib/load-custom-routes.ts b/packages/next/lib/load-custom-routes.ts
@@ -350,19 +350,19 @@ export default async function loadCustomRoutes(
       ? [
           {
             source: '/:path*/:file.:ext/',
-            destination: config.basePath + '/:path*/:file.:ext',
+            destination: '/:path*/:file.:ext',
             permanent: true,
           },
           {
             source: '/:path*/:notfile([^/.]+)',
-            destination: config.basePath + '/:path*/:notfile/',
+            destination: '/:path*/:notfile/',
             permanent: true,
           },
         ]
       : [
           {
             source: '/:path+/',
-            destination: config.basePath + '/:path+',
+            destination: '/:path+',
             permanent: true,
           },
         ])

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -280,6 +280,11 @@ export default class Server {
     this.renderOpts.assetPrefix = prefix ? prefix.replace(/\/$/, '') : ''
   }
 
+  private addBasePath(path: string): string {
+    const { basePath } = this.nextConfig
+    return basePath ? (path === '/' ? basePath : basePath + path) : path
+  }
+
   // Backwards compatibility
   public async prepare(): Promise<void> {}
 
@@ -509,7 +514,9 @@ export default class Server {
             params,
             parsedUrl.query
           )
-          const updatedDestination = formatUrl(parsedDestination)
+          const updatedDestination = this.addBasePath(
+            formatUrl(parsedDestination)
+          )
 
           res.setHeader('Location', updatedDestination)
           res.statusCode = getRedirectStatus(redirectRoute as Redirect)