vercel · wyattjoh · Jun 19, 2025 · Jun 16, 2025 · Jun 17, 2025 · Jun 18, 2025
diff --git a/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts
@@ -37,7 +37,7 @@ const EdgeAppRouteLoader: webpack.LoaderDefinitionFunction<EdgeAppRouteLoaderQue
 
     if (!cacheHandlers.default) {
       cacheHandlers.default = require.resolve(
-        '../../../../server/lib/cache-handlers/default'
+        '../../../../server/lib/cache-handlers/default.external'
       )
     }
 

diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts
@@ -89,7 +89,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
 
     if (!cacheHandlers.default) {
       cacheHandlers.default = require.resolve(
-        '../../../../server/lib/cache-handlers/default'
+        '../../../../server/lib/cache-handlers/default.external'
       )
     }
 

diff --git a/.../src/server/lib/cache-handlers/default.ts → ...er/lib/cache-handlers/default.external.ts b/.../src/server/lib/cache-handlers/default.ts → ...er/lib/cache-handlers/default.external.ts
diff --git a/packages/next/src/server/lib/incremental-cache/index.ts b/packages/next/src/server/lib/incremental-cache/index.ts
@@ -24,7 +24,7 @@ import {
   PRERENDER_REVALIDATE_HEADER,
 } from '../../../lib/constants'
 import { toRoute } from '../to-route'
-import { SharedCacheControls } from './shared-cache-controls'
+import { SharedCacheControls } from './shared-cache-controls.external'
 import {
   getPrerenderResumeDataCache,
   getRenderResumeDataCache,

diff --git a/...ental-cache/shared-cache-controls.test.ts → ...he/shared-cache-controls.external.test.ts b/...ental-cache/shared-cache-controls.test.ts → ...he/shared-cache-controls.external.test.ts
@@ -3,7 +3,7 @@ import type {
   PrerenderManifestRoute,
 } from '../../../build'
 import { RenderingMode } from '../../../build/rendering-mode'
-import { SharedCacheControls } from './shared-cache-controls'
+import { SharedCacheControls } from './shared-cache-controls.external'
 
 describe('SharedCacheControls', () => {
   let sharedCacheControls: SharedCacheControls

diff --git a/...ncremental-cache/shared-cache-controls.ts → ...l-cache/shared-cache-controls.external.ts b/...ncremental-cache/shared-cache-controls.ts → ...l-cache/shared-cache-controls.external.ts
diff --git a/packages/next/src/server/use-cache/handlers.ts b/packages/next/src/server/use-cache/handlers.ts
@@ -1,4 +1,4 @@
-import DefaultCacheHandler from '../lib/cache-handlers/default'
+import DefaultCacheHandler from '../lib/cache-handlers/default.external'
 import type { CacheHandlerCompat } from '../lib/cache-handlers/types'
 
 const debug = process.env.NEXT_PRIVATE_DEBUG_CACHE

diff --git a/test/e2e/app-dir/use-cache-custom-handler/handler.js b/test/e2e/app-dir/use-cache-custom-handler/handler.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 const defaultCacheHandler =
-  require('next/dist/server/lib/cache-handlers/default').default
+  require('next/dist/server/lib/cache-handlers/default.external').default
 
 /**
  * @type {import('next/dist/server/lib/cache-handlers/types').CacheHandlerV2}

diff --git a/test/e2e/app-dir/use-cache-custom-handler/legacy-handler.js b/test/e2e/app-dir/use-cache-custom-handler/legacy-handler.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 const defaultCacheHandler =
-  require('next/dist/server/lib/cache-handlers/default').default
+  require('next/dist/server/lib/cache-handlers/default.external').default
 
 /**
  * @type {import('next/dist/server/lib/cache-handlers/types').CacheHandler}

diff --git a/test/e2e/app-dir/use-cache-unknown-cache-kind/instrumentation.ts b/test/e2e/app-dir/use-cache-unknown-cache-kind/instrumentation.ts
@@ -1,4 +1,4 @@
-import DefaultCacheHandler from 'next/dist/server/lib/cache-handlers/default'
+import DefaultCacheHandler from 'next/dist/server/lib/cache-handlers/default.external'
 
 export function register() {
   globalThis[Symbol.for('@next/cache-handlers')] = {

diff --git a/test/e2e/app-dir/use-cache-unknown-cache-kind/use-cache-unknown-cache-kind.test.ts b/test/e2e/app-dir/use-cache-unknown-cache-kind/use-cache-unknown-cache-kind.test.ts
@@ -16,7 +16,9 @@ const nextConfigWithCacheHandler: NextConfig = {
   experimental: {
     dynamicIO: true,
     cacheHandlers: {
-      custom: require.resolve('next/dist/server/lib/cache-handlers/default'),
+      custom: require.resolve(
+        'next/dist/server/lib/cache-handlers/default.external'
+      ),
     },
   },
 }

diff --git a/test/e2e/app-dir/use-cache/next.config.js b/test/e2e/app-dir/use-cache/next.config.js
@@ -13,7 +13,9 @@ const nextConfig = {
       },
     },
     cacheHandlers: {
-      custom: require.resolve('next/dist/server/lib/cache-handlers/default'),
+      custom: require.resolve(
+        'next/dist/server/lib/cache-handlers/default.external'
+      ),
     },
   },
   cacheHandler: require.resolve('./incremental-cache-handler'),

diff --git a/test/integration/telemetry/next.config.use-cache b/test/integration/telemetry/next.config.use-cache
@@ -2,7 +2,7 @@ module.exports = {
   experimental: {
     dynamicIO: true,
     cacheHandlers: {
-      custom: require.resolve('next/dist/server/lib/cache-handlers/default'),
+      custom: require.resolve('next/dist/server/lib/cache-handlers/default.external'),
     },
   },
 }
diff --git a/test/production/custom-server/cache-handler.js b/test/production/custom-server/cache-handler.js
@@ -3,7 +3,7 @@
 const { requestIdStorage } = require('./als')
 
 const defaultCacheHandler =
-  require('next/dist/server/lib/cache-handlers/default').default
+  require('next/dist/server/lib/cache-handlers/default.external').default
 
 /**
  * @type {import('next/dist/server/lib/cache-handlers/types').CacheHandlerV2}