fix passing cacheHandler

vercel · Jan 17, 2024 · 4c6d4c5 · 4c6d4c5
1 parent 54741ff
commit 4c6d4c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -1260,9 +1260,9 @@ export default async function build(
                     compress: false,
                   }
                 : {}),
-              // cacheHandler: cacheHandler
-              //   ? path.relative(distDir, cacheHandler)
-              //   : undefined,
+              cacheHandler: cacheHandler
+                ? path.relative(distDir, cacheHandler)
+                : config.cacheHandler,
               experimental: {
                 ...config.experimental,
                 trustHostHeader: ciEnvironment.hasNextSupport,

diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
@@ -1304,8 +1304,8 @@ export async function buildAppStaticPaths({
   configFileName,
   generateParams,
   isrFlushToDisk,
-  requestHeaders,
   cacheHandler,
+  requestHeaders,
   maxMemoryCacheSize,
   fetchCacheKeyPrefix,
   ppr,

diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
@@ -260,12 +260,6 @@ function assignDefaults(
     )
   }
 
-  const distDir = config.distDir || defaultConfig.distDir
-  const userCacheHandler = config.cacheHandler
-  if (userCacheHandler) {
-    config.cacheHandler = relative(distDir, userCacheHandler)
-  }
-
   const result = { ...defaultConfig, ...config }
 
   if (