fix intercepted segments basepath option

vercel · Jan 10, 2024 · c6b0ff8 · c6b0ff8
1 parent 60c0720
commit c6b0ff8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -1020,7 +1020,9 @@ export default async function build(
 
       const appPaths = Array.from(appPageKeys)
       // Interception routes are modelled as beforeFiles rewrites
-      rewrites.beforeFiles.push(...generateInterceptionRoutesRewrites(appPaths))
+      rewrites.beforeFiles.push(
+        ...generateInterceptionRoutesRewrites(appPaths, config.basePath)
+      )
 
       const totalAppPagesCount = appPaths.length
 

diff --git a/packages/next/src/lib/generate-interception-routes-rewrites.ts b/packages/next/src/lib/generate-interception-routes-rewrites.ts
@@ -44,7 +44,8 @@ function voidParamsBeforeInterceptionMarker(path: string): string {
 }
 
 export function generateInterceptionRoutesRewrites(
-  appPaths: string[]
+  appPaths: string[],
+  basePath = ''
 ): Rewrite[] {
   const rewrites: Rewrite[] = []
 
@@ -70,8 +71,8 @@ export function generateInterceptionRoutesRewrites(
         .slice(2, -3)
 
       rewrites.push({
-        source: normalizedInterceptedRoute,
-        destination: normalizedAppPath,
+        source: `${basePath}${normalizedInterceptedRoute}`,
+        destination: `${basePath}${normalizedAppPath}`,
         has: [
           {
             type: 'header',

diff --git a/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts b/packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
@@ -2270,13 +2270,15 @@ async function startWatcher(opts: SetupOpts) {
         : undefined
 
       opts.fsChecker.interceptionRoutes =
-        generateInterceptionRoutesRewrites(Object.keys(appPaths))?.map((item) =>
-          buildCustomRoute(
-            'before_files_rewrite',
-            item,
-            opts.nextConfig.basePath,
-            opts.nextConfig.experimental.caseSensitiveRoutes
-          )
+        generateInterceptionRoutesRewrites(Object.keys(appPaths))?.map(
+          (item) =>
+            buildCustomRoute(
+              'before_files_rewrite',
+              item,
+              opts.nextConfig.basePath,
+              opts.nextConfig.experimental.caseSensitiveRoutes
+            ),
+          opts.nextConfig.basePath
         ) || []
 
       const exportPathMap =