code · pull · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025
diff --git a/packages/next/src/server/app-render/entry-base.ts b/packages/next/src/server/app-render/entry-base.ts
@@ -58,6 +58,20 @@ if (process.env.NODE_ENV === 'development') {
   SegmentViewStateNode = mod.SegmentViewStateNode
 }
 
+// For hot-reloader
+declare global {
+  var __next__clear_chunk_cache__: (() => void) | null | undefined
+  var __turbopack_clear_chunk_cache__: () => void | null | undefined
+}
+// hot-reloader modules are not bundled so we need to inject `__next__clear_chunk_cache__`
+// into globalThis from this file which is bundled.
+if (process.env.TURBOPACK) {
+  globalThis.__next__clear_chunk_cache__ = __turbopack_clear_chunk_cache__
+} else {
+  // Webpack does not have chunks on the server
+  globalThis.__next__clear_chunk_cache__ = null
+}
+
 // patchFetch makes use of APIs such as `React.unstable_postpone` which are only available
 // in the experimental channel of React, so export it from here so that it comes from the bundled runtime
 export function patchFetch() {

diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
@@ -1463,7 +1463,7 @@ export const defaultConfig = Object.freeze({
     useCache: undefined,
     slowModuleDetection: undefined,
     globalNotFound: false,
-    devtoolSegmentExplorer: false,
+    devtoolSegmentExplorer: true,
     browserDebugInfoInTerminal: false,
     optimizeRouterScrolling: false,
     strictNextHead: true,

diff --git a/packages/next/src/server/dev/hot-reloader-turbopack.ts b/packages/next/src/server/dev/hot-reloader-turbopack.ts
@@ -109,6 +109,8 @@ const isTestMode = !!(
 
 const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random())
 
+declare const __next__clear_chunk_cache__: (() => void) | null | undefined
+
 /**
  * Replaces turbopack:///[project] with the specified project in the `source` field.
  */
@@ -342,10 +344,11 @@ export async function createHotReloaderTurbopack(
 
     resetFetch()
 
-    // Edge uses the browser runtime which already disposes chunks individually.
-    // TODO: process.env.NEXT_RUNTIME is 'nodejs' even though Node.js runtime is not used.
-    if ('__turbopack_clear_chunk_cache__' in globalThis) {
-      ;(globalThis as any).__turbopack_clear_chunk_cache__()
+    // Not available in:
+    // - Pages Router (no server-side HMR)
+    // - Edge Runtime (uses browser runtime which already disposes chunks individually)
+    if (typeof __next__clear_chunk_cache__ === 'function') {
+      __next__clear_chunk_cache__()
     }
 
     const serverPaths = writtenEndpoint.serverPaths.map(({ path: p }) =>

diff --git a/test/development/acceptance-app/hydration-error.test.ts b/test/development/acceptance-app/hydration-error.test.ts
diff --git a/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts b/test/development/app-dir/hydration-error-count/hydration-error-count.test.ts
@@ -21,11 +21,15 @@ describe('hydration-error-count', () => {
                      <RedirectBoundary>
                        <RedirectErrorBoundary router={{...}}>
                          <InnerLayoutRouter url="/bad-nesting" tree={[...]} cacheNode={{lazyData:null, ...}} ...>
-                           <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
-                             <Page params={Promise} searchParams={Promise}>
-     >                         <p>
+                           <SegmentViewNode type="page" pagePath="bad-nestin...">
+                             <SegmentTrieNode>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
      >                           <p>
-                           ...",
+     >                             <p>
+                           ...
+                         ...
+               ...",
          "description": "In HTML, <p> cannot be a descendant of <p>.
      This will cause a hydration error.",
          "environmentLabel": null,
@@ -69,12 +73,16 @@ describe('hydration-error-count', () => {
                      <RedirectBoundary>
                        <RedirectErrorBoundary router={{...}}>
                          <InnerLayoutRouter url="/html-diff" tree={[...]} cacheNode={{lazyData:null, ...}} segmentPath={[...]}>
-                           <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
-                             <Page params={Promise} searchParams={Promise}>
-                               <p>
-     +                           client
-     -                           server
-                           ...",
+                           <SegmentViewNode type="page" pagePath="html-diff/...">
+                             <SegmentTrieNode>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
+                                 <p>
+     +                             client
+     -                             server
+                           ...
+                         ...
+               ...",
        "description": "Hydration failed because the server rendered text didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:",
        "environmentLabel": null,
        "label": "Recoverable Error",
@@ -105,11 +113,15 @@ describe('hydration-error-count', () => {
                      <RedirectBoundary>
                        <RedirectErrorBoundary router={{...}}>
                          <InnerLayoutRouter url="/two-issues" tree={[...]} cacheNode={{lazyData:null, ...}} ...>
-                           <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
-                             <Page params={Promise} searchParams={Promise}>
-     >                         <p className="client">
-     >                           <p>
-                           ...",
+                           <SegmentViewNode type="page" pagePath="two-issues...">
+                             <SegmentTrieNode>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
+     >                           <p className="client">
+     >                             <p>
+                           ...
+                         ...
+               ...",
          "description": "In HTML, <p> cannot be a descendant of <p>.
      This will cause a hydration error.",
          "environmentLabel": null,
@@ -133,13 +145,17 @@ describe('hydration-error-count', () => {
                      <RedirectBoundary>
                        <RedirectErrorBoundary router={{...}}>
                          <InnerLayoutRouter url="/two-issues" tree={[...]} cacheNode={{lazyData:null, ...}} ...>
-                           <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
-                             <Page params={Promise} searchParams={Promise}>
-                               <p
-     +                           className="client"
-     -                           className="server"
-                               >
-                           ...",
+                           <SegmentViewNode type="page" pagePath="two-issues...">
+                             <SegmentTrieNode>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
+                                 <p
+     +                             className="client"
+     -                             className="server"
+                                 >
+                           ...
+                         ...
+               ...",
          "description": "Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:",
          "environmentLabel": null,
          "label": "Recoverable Error",
@@ -171,11 +187,15 @@ describe('hydration-error-count', () => {
                      <RedirectBoundary>
                        <RedirectErrorBoundary router={{...}}>
                          <InnerLayoutRouter url="/hydration..." tree={[...]} cacheNode={{lazyData:null, ...}} ...>
-                           <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
-                             <Page params={Promise} searchParams={Promise}>
-     >                         <p>
+                           <SegmentViewNode type="page" pagePath="hydration-...">
+                             <SegmentTrieNode>
+                             <ClientPageRoot Component={function Page} searchParams={{}} params={{}}>
+                               <Page params={Promise} searchParams={Promise}>
      >                           <p>
-                           ...",
+     >                             <p>
+                           ...
+                         ...
+               ...",
          "description": "In HTML, <p> cannot be a descendant of <p>.
      This will cause a hydration error.",
          "environmentLabel": null,

diff --git a/test/development/client-dev-overlay/index.test.ts b/test/development/client-dev-overlay/index.test.ts
@@ -142,6 +142,7 @@ describe('client-dev-overlay', () => {
        Static
        Turbopack
        Enabled
+       Route Info
        Preferences"
       `)
     } else {
@@ -151,6 +152,7 @@ describe('client-dev-overlay', () => {
        Route
        Static
        Try Turbopack
+       Route Info
        Preferences"
       `)
     }

diff --git a/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts b/test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts
@@ -13,7 +13,7 @@ const EXTERNAL = {
 const COLLECTOR_PORT = 9001
 
 describe('opentelemetry', () => {
-  const { next, skipped } = nextTestSetup({
+  const { next, skipped, isNextDev } = nextTestSetup({
     files: __dirname,
     skipDeployment: true,
     dependencies: require('./package.json').dependencies,
@@ -170,7 +170,7 @@ describe('opentelemetry', () => {
                       },
                       {
                         attributes: {
-                          'next.clientComponentLoadCount': 7,
+                          'next.clientComponentLoadCount': isNextDev ? 8 : 7,
                           'next.span_type':
                             'NextNodeServer.clientComponentLoading',
                         },

diff --git a/turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/base/dev-base.ts b/turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/base/dev-base.ts
@@ -212,6 +212,7 @@ function instantiateModule(moduleId: ModuleId, source: SourceInfo): Module {
           n: exportNamespace.bind(null, module, devModuleCache),
           m: module,
           c: devModuleCache,
+          C: null,
           M: moduleFactories,
           l: loadChunk.bind(null, sourceInfo),
           L: loadChunkByUrl.bind(null, sourceInfo),

diff --git a/turbopack/crates/turbopack-ecmascript-runtime/js/src/nodejs/runtime.ts b/turbopack/crates/turbopack-ecmascript-runtime/js/src/nodejs/runtime.ts
@@ -302,6 +302,7 @@ function instantiateModule(id: ModuleId, source: SourceInfo): Module {
         type: SourceType.Parent,
         parentId: id,
       }),
+      C: clearChunkCache,
       w: loadWebAssembly,
       u: loadWebAssemblyModule,
       P: resolveAbsolutePath,
@@ -381,9 +382,6 @@ function isJs(chunkUrlOrPath: ChunkUrl | ChunkPath): boolean {
   return regexJsUrl.test(chunkUrlOrPath)
 }
 
-// For hot-reloader
-;(globalThis as any).__turbopack_clear_chunk_cache__ = clearChunkCache
-
 module.exports = {
   getOrInstantiateRuntimeModule,
   loadChunk,

diff --git a/turbopack/crates/turbopack-ecmascript/src/runtime_functions.rs b/turbopack/crates/turbopack-ecmascript/src/runtime_functions.rs
@@ -56,6 +56,8 @@ pub const TURBOPACK_LOAD: &TurbopackRuntimeFunctionShortcut =
     &TurbopackRuntimeFunctionShortcut::new("__turbopack_context__.l", "l");
 pub const TURBOPACK_LOAD_BY_URL: &TurbopackRuntimeFunctionShortcut =
     &TurbopackRuntimeFunctionShortcut::new("__turbopack_context__.L", "L");
+pub const TURBOPACK_CLEAR_CHUNK_CACHE: &TurbopackRuntimeFunctionShortcut =
+    &TurbopackRuntimeFunctionShortcut::new("__turbopack_context__.C", "C");
 pub const TURBOPACK_DYNAMIC: &TurbopackRuntimeFunctionShortcut =
     &TurbopackRuntimeFunctionShortcut::new("__turbopack_context__.j", "j");
 pub const TURBOPACK_RESOLVE_ABSOLUTE_PATH: &TurbopackRuntimeFunctionShortcut =
@@ -81,7 +83,7 @@ pub const TURBOPACK_REQUIRE_REAL: &TurbopackRuntimeFunctionShortcut =
 
 /// Adding an entry to this list will automatically ensure that `__turbopack_XXX__` can be called
 /// from user code (by inserting a replacement into free_var_references)
-pub const TURBOPACK_RUNTIME_FUNCTION_SHORTCUTS: [(&str, &TurbopackRuntimeFunctionShortcut); 21] = [
+pub const TURBOPACK_RUNTIME_FUNCTION_SHORTCUTS: [(&str, &TurbopackRuntimeFunctionShortcut); 22] = [
     ("__turbopack_require__", TURBOPACK_REQUIRE),
     ("__turbopack_module_context__", TURBOPACK_MODULE_CONTEXT),
     ("__turbopack_import__", TURBOPACK_IMPORT),
@@ -109,4 +111,8 @@ pub const TURBOPACK_RUNTIME_FUNCTION_SHORTCUTS: [(&str, &TurbopackRuntimeFunctio
     ("__turbopack_refresh__", TURBOPACK_REFRESH),
     ("__turbopack_require_stub__", TURBOPACK_REQUIRE_STUB),
     ("__turbopack_require_real__", TURBOPACK_REQUIRE_REAL),
+    (
+        "__turbopack_clear_chunk_cache__",
+        TURBOPACK_CLEAR_CHUNK_CACHE,
+    ),
 ];
diff --git a/...urbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js b/...urbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js
diff --git a/...pack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js.map b/...pack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js.map
diff --git a/.../b1abf_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_73aab4ae.js b/.../b1abf_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_73aab4ae.js
diff --git a/...bf_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_73aab4ae.js.map b/...bf_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_73aab4ae.js.map