WIP

Author: mischnic

packages/next/src/build/webpack-config.ts

@@ -2544,9 +2544,9 @@ export default async function getBaseWebpackConfig(
     }
 
     if (dev && originalDevtool !== webpackConfig.devtool) {
-      webpackConfig.devtool = originalDevtool
       devtoolRevertWarning(originalDevtool)
     }
+    webpackConfig.devtool = 'source-map'
 
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const webpack5Config = webpackConfig as webpack.Configuration

packages/next/src/build/webpack/config/blocks/base.ts

@@ -39,7 +39,7 @@ export const base = curry(function base(
     // original source, including columns and original variable names.
     // This is desirable so the in-browser debugger can correctly pause
     // and show scoped variables with their original names.
-    config.devtool = 'eval-source-map'
+    config.devtool = 'source-map'
   } else {
     if (
       ctx.isEdgeRuntime ||

packages/next/src/server/patch-error-inspect.ts

@@ -476,6 +476,7 @@ function sourceMapError(
 export function patchErrorInspectNodeJS(
   errorConstructor: ErrorConstructor
 ): void {
+  return
   const inspectSymbol = Symbol.for('nodejs.util.inspect.custom')
 
   errorConstructor.prepareStackTrace = prepareUnsourcemappedStackTrace
@@ -516,6 +517,7 @@ export function patchErrorInspectNodeJS(
 export function patchErrorInspectEdgeLite(
   errorConstructor: ErrorConstructor
 ): void {
+  return
   const inspectSymbol = Symbol.for('edge-runtime.inspect.custom')
 
   errorConstructor.prepareStackTrace = prepareUnsourcemappedStackTrace

packages/next/src/server/route-modules/pages/module.ts

@@ -130,6 +130,11 @@ export class PagesRouteModule extends RouteModule<
   constructor(options: PagesRouteModuleOptions) {
     super(options)
 
+    console.trace('new PagesRouteModule', [
+      options.definition.page,
+      options.relativeProjectDir,
+    ])
+
     this.components = options.components
   }
 

packages/next/src/server/route-modules/route-module.ts

@@ -875,6 +875,17 @@ export abstract class RouteModule<
     const relativeProjectDir =
       getRequestMeta(req, 'relativeProjectDir') || this.relativeProjectDir
 
+    console.log('prepare relativeProjectDir', this.definition.page, [
+      routerServerGlobal[RouterServerContextSymbol] &&
+        Object.keys(routerServerGlobal[RouterServerContextSymbol]),
+      routerServerGlobal[RouterServerContextSymbol]?.[relativeProjectDir] &&
+        Object.keys(
+          routerServerGlobal[RouterServerContextSymbol]?.[relativeProjectDir]
+        ),
+      getRequestMeta(req, 'relativeProjectDir'),
+      this.relativeProjectDir,
+    ])
+
     const routerServerContext =
       routerServerGlobal[RouterServerContextSymbol]?.[relativeProjectDir]
     const nextConfig =
@@ -923,7 +934,6 @@ export abstract class RouteModule<
       isOnDemandRevalidate,
       revalidateOnlyGenerated,
       ...manifests,
-      clientReferenceManifest: manifests.clientReferenceManifest,
       nextConfig,
       routerServerContext,
     }