[Turbopack] fix root and project path usages in a monorepo

crates/napi/src/next_api/project.rs

@@ -28,7 +28,8 @@
     get_effects, Completion, Effects, ReadRef, ResolvedVc, TransientInstance, UpdateInfo, Vc,
 };
 use turbo_tasks_fs::{
-    util::uri_from_file, DiskFileSystem, FileContent, FileSystem, FileSystemPath,
+    get_relative_path_to, util::uri_from_file, DiskFileSystem, FileContent, FileSystem,
+    FileSystemPath,
 };
 use turbopack_core::{
     diagnostics::PlainDiagnostic,
@@ -950,7 +951,7 @@
     }
 }
 
 /// Subscribes to lifecycle events of the compilation.
 ///
 /// Emits an [UpdateMessage::Start] event when any computation starts.
 /// Emits an [UpdateMessage::End] event when there was no computation for the
@@ -1015,6 +1016,7 @@
 pub struct StackFrame {
     pub is_server: bool,
     pub is_internal: Option<bool>,
+    pub original_file: Option<String>,
     pub file: String,
     // 1-indexed, unlike source map tokens
     pub line: Option<u32>,
@@ -1084,6 +1086,7 @@
 pub async fn project_trace_source(
     #[napi(ts_arg_type = "{ __napiType: \"Project\" }")] project: External<ProjectInstance>,
     frame: StackFrame,
+    current_directory_file_url: String,
 ) -> napi::Result<Option<StackFrame>> {
     let turbo_tasks = project.turbo_tasks.clone();
     let container = project.container;
@@ -1120,27 +1123,50 @@
                 }
             };
 
-            let project_path_uri =
-                uri_from_file(project.container.project().project_path(), None).await? + "/";
-            let (source_file, is_internal) =
-                if let Some(source_file) = original_file.strip_prefix(&project_path_uri) {
-                    // Client code uses file://
-                    (source_file, false)
-                } else if let Some(source_file) =
-                    original_file.strip_prefix(&*SOURCE_MAP_PREFIX_PROJECT)
-                {
-                    // Server code uses turbopack://[project]
-                    // TODO should this also be file://?
-                    (source_file, false)
-                } else if let Some(source_file) = original_file.strip_prefix(SOURCE_MAP_PREFIX) {
-                    // All other code like turbopack://[turbopack] is internal code
-                    (source_file, true)
-                } else {
-                    bail!("Original file ({}) outside project", original_file)
-                };
+            let project_root_uri =
+                uri_from_file(project.container.project().project_root_path(), None).await? + "/";
+            let (file, original_file, is_internal) = if let Some(source_file) =
+                original_file.strip_prefix(&project_root_uri)
+            {
+                // Client code uses file://
+                (
+                    get_relative_path_to(&current_directory_file_url, &original_file)
+                        // TODO(sokra) remove this to include a ./ here to make it a relative path
+                        .trim_start_matches("./")
+                        .to_string(),
+                    Some(source_file.to_string()),
+                    false,
+                )
+            } else if let Some(source_file) =
+                original_file.strip_prefix(&*SOURCE_MAP_PREFIX_PROJECT)
+            {
+                // Server code uses turbopack://[project]
+                // TODO should this also be file://?
+                (
+                    get_relative_path_to(
+                        &current_directory_file_url,
+                        &format!("{}{}", project_root_uri, source_file),
+                    )
+                    // TODO(sokra) remove this to include a ./ here to make it a relative path
+                    .trim_start_matches("./")
+                    .to_string(),
+                    Some(source_file.to_string()),
+                    false,
+                )
+            } else if let Some(source_file) = original_file.strip_prefix(SOURCE_MAP_PREFIX) {
+                // All other code like turbopack://[turbopack] is internal code
+                (source_file.to_string(), None, true)
+            } else {
+                bail!(
+                    "Original file ({}) outside project ({})",
+                    original_file,
+                    project_root_uri
+                )
+            };
 
             Ok(Some(StackFrame {
-                file: source_file.to_string(),
+                file,
+                original_file,
                 method_name: name.as_ref().map(ToString::to_string),
                 line,
                 column,

crates/next-api/src/project.rs

@@ -631,7 +631,7 @@ impl Project {
     }
 
     #[turbo_tasks::function]
-    fn project_root_path(self: Vc<Self>) -> Vc<FileSystemPath> {
+    pub fn project_root_path(self: Vc<Self>) -> Vc<FileSystemPath> {
         self.project_fs().root()
     }
 
@@ -693,7 +693,7 @@ impl Project {
 
         let node_execution_chunking_context = Vc::upcast(
             NodeJsChunkingContext::builder(
-                self.project_path().to_resolved().await?,
+                self.project_root_path().to_resolved().await?,
                 node_root,
                 node_root,
                 node_root.join("build/chunks".into()).to_resolved().await?,
@@ -820,7 +820,7 @@ impl Project {
     #[turbo_tasks::function]
     pub(super) fn client_chunking_context(self: Vc<Self>) -> Vc<Box<dyn ChunkingContext>> {
         get_client_chunking_context(
-            self.project_path(),
+            self.project_root_path(),
             self.client_relative_path(),
             self.next_config().computed_asset_prefix(),
             self.client_compile_time_info().environment(),
@@ -838,7 +838,7 @@ impl Project {
         if client_assets {
             get_server_chunking_context_with_client_assets(
                 self.next_mode(),
-                self.project_path(),
+                self.project_root_path(),
                 self.node_root(),
                 self.client_relative_path(),
                 self.next_config().computed_asset_prefix(),
@@ -849,7 +849,7 @@ impl Project {
         } else {
             get_server_chunking_context(
                 self.next_mode(),
-                self.project_path(),
+                self.project_root_path(),
                 self.node_root(),
                 self.server_compile_time_info().environment(),
                 self.module_id_strategy(),
@@ -866,7 +866,7 @@ impl Project {
         if client_assets {
             get_edge_chunking_context_with_client_assets(
                 self.next_mode(),
-                self.project_path(),
+                self.project_root_path(),
                 self.node_root(),
                 self.client_relative_path(),
                 self.next_config().computed_asset_prefix(),
@@ -877,7 +877,7 @@ impl Project {
         } else {
             get_edge_chunking_context(
                 self.next_mode(),
-                self.project_path(),
+                self.project_root_path(),
                 self.node_root(),
                 self.edge_compile_time_info().environment(),
                 self.module_id_strategy(),

crates/next-core/src/next_server/context.rs

@@ -974,7 +974,7 @@ pub fn get_server_runtime_entries(
 #[turbo_tasks::function]
 pub async fn get_server_chunking_context_with_client_assets(
     mode: Vc<NextMode>,
-    project_path: ResolvedVc<FileSystemPath>,
+    root_path: ResolvedVc<FileSystemPath>,
     node_root: ResolvedVc<FileSystemPath>,
     client_root: ResolvedVc<FileSystemPath>,
     asset_prefix: ResolvedVc<Option<RcStr>>,
@@ -987,7 +987,7 @@ pub async fn get_server_chunking_context_with_client_assets(
     // different server chunking contexts. OR the build chunking context should
     // support both production and development modes.
     let mut builder = NodeJsChunkingContext::builder(
-        project_path,
+        root_path,
         node_root,
         client_root,
         node_root
@@ -1019,7 +1019,7 @@ pub async fn get_server_chunking_context_with_client_assets(
 #[turbo_tasks::function]
 pub async fn get_server_chunking_context(
     mode: Vc<NextMode>,
-    project_path: ResolvedVc<FileSystemPath>,
+    root_path: ResolvedVc<FileSystemPath>,
     node_root: ResolvedVc<FileSystemPath>,
     environment: ResolvedVc<Environment>,
     module_id_strategy: ResolvedVc<Box<dyn ModuleIdStrategy>>,
@@ -1030,7 +1030,7 @@ pub async fn get_server_chunking_context(
     // different server chunking contexts. OR the build chunking context should
     // support both production and development modes.
     let mut builder = NodeJsChunkingContext::builder(
-        project_path,
+        root_path,
         node_root,
         node_root,
         node_root.join("server/chunks".into()).to_resolved().await?,

packages/next/src/build/swc/generated-native.d.ts

@@ -275,7 +275,8 @@ export interface StackFrame {
 }
 export declare function projectTraceSource(
   project: { __napiType: 'Project' },
-  frame: StackFrame
+  frame: StackFrame,
+  currentDirectoryFileUrl: string
 ): Promise<StackFrame | null>
 export declare function projectGetSourceForAsset(
   project: { __napiType: 'Project' },

packages/next/src/build/swc/index.ts

@@ -746,9 +746,14 @@ function bindingToApi(
     }
 
     traceSource(
-      stackFrame: TurbopackStackFrame
+      stackFrame: TurbopackStackFrame,
+      currentDirectoryFileUrl: string
     ): Promise<TurbopackStackFrame | null> {
-      return binding.projectTraceSource(this._nativeProject, stackFrame)
+      return binding.projectTraceSource(
+        this._nativeProject,
+        stackFrame,
+        currentDirectoryFileUrl
+      )
     }
 
     getSourceForAsset(filePath: string): Promise<string | null> {

packages/next/src/build/swc/types.ts

@@ -169,6 +169,7 @@ export interface TurbopackStackFrame {
   isServer: boolean
   isInternal?: boolean
   file: string
+  originalFile?: string
   /** 1-indexed, unlike source map tokens */
   line?: number
   /** 1-indexed, unlike source map tokens */
@@ -207,7 +208,8 @@ export interface Project {
   getSourceMapSync(filePath: string): string | null
 
   traceSource(
-    stackFrame: TurbopackStackFrame
+    stackFrame: TurbopackStackFrame,
+    currentDirectoryFileUrl: string
   ): Promise<TurbopackStackFrame | null>
 
   updateInfoSubscribe(

packages/next/src/client/components/react-dev-overlay/server/middleware-turbopack.ts

@@ -18,6 +18,7 @@ import { SourceMapConsumer } from 'next/dist/compiled/source-map08'
 import type { Project, TurbopackStackFrame } from '../../../../build/swc/types'
 import { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-file'
 import { findSourceMap, type SourceMapPayload } from 'node:module'
+import { pathToFileURL } from 'node:url'
 
 function shouldIgnorePath(modulePath: string): boolean {
   return (
@@ -40,7 +41,9 @@ export async function batchedTraceSource(
     : undefined
   if (!file) return
 
-  const sourceFrame = await project.traceSource(frame)
+  const currentDirectoryFileUrl = pathToFileURL(process.cwd()).href
+
+  const sourceFrame = await project.traceSource(frame, currentDirectoryFileUrl)
   if (!sourceFrame) {
     return {
       frame: {
@@ -56,20 +59,21 @@ export async function batchedTraceSource(
   }
 
   let source = null
+  const originalFile = sourceFrame.originalFile
   // Don't look up source for node_modules or internals. These can often be large bundled files.
   const ignored =
-    shouldIgnorePath(sourceFrame.file) ||
+    shouldIgnorePath(originalFile ?? sourceFrame.file) ||
     // isInternal means resource starts with turbopack://[turbopack]
     !!sourceFrame.isInternal
-  if (sourceFrame && sourceFrame.file && !ignored) {
-    let sourcePromise = currentSourcesByFile.get(sourceFrame.file)
+  if (originalFile && !ignored) {
+    let sourcePromise = currentSourcesByFile.get(originalFile)
     if (!sourcePromise) {
-      sourcePromise = project.getSourceForAsset(sourceFrame.file)
-      currentSourcesByFile.set(sourceFrame.file, sourcePromise)
+      sourcePromise = project.getSourceForAsset(originalFile)
+      currentSourcesByFile.set(originalFile, sourcePromise)
       setTimeout(() => {
         // Cache file reads for 100ms, as frames will often reference the same
         // files and can be large.
-        currentSourcesByFile.delete(sourceFrame.file!)
+        currentSourcesByFile.delete(originalFile!)
       }, 100)
     }
     source = await sourcePromise
@@ -231,10 +235,7 @@ async function nativeTraceSource(
           '<unknown>',
         column: (originalPosition.column ?? 0) + 1,
         file: originalPosition.source?.startsWith('file://')
-          ? path.relative(
-              process.cwd(),
-              url.fileURLToPath(originalPosition.source)
-            )
+          ? relativeToCwd(originalPosition.source)
           : originalPosition.source,
         lineNumber: originalPosition.line ?? 0,
         // TODO: c&p from async createOriginalStackFrame but why not frame.arguments?
@@ -252,6 +253,12 @@ async function nativeTraceSource(
   return undefined
 }
 
+function relativeToCwd(file: string): string {
+  const relPath = path.relative(process.cwd(), url.fileURLToPath(file))
+  // TODO(sokra) include a ./ here to make it a relative path
+  return relPath
+}
+
 async function createOriginalStackFrame(
   project: Project,
   frame: TurbopackStackFrame
@@ -288,7 +295,7 @@ export function getOverlayMiddleware(project: Project) {
       try {
         originalStackFrame = await createOriginalStackFrame(project, frame)
       } catch (e: any) {
-        return internalServerError(res, e.message)
+        return internalServerError(res, e.stack)
       }
 
       if (!originalStackFrame) {

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/layout.tsx

@@ -0,0 +1,8 @@
+import { ReactNode } from 'react'
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/monorepo-package-rsc/page.tsx

@@ -0,0 +1,5 @@
+import { text } from 'my-package/typescript'
+
+export default function Page() {
+  return <p>{text}</p>
+}

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/monorepo-package-ssr/page.tsx

@@ -0,0 +1,7 @@
+'use client'
+
+import { text } from 'my-package/typescript'
+
+export default function Page() {
+  return <p>{text}</p>
+}

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/page.tsx

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/separate-file.ts

@@ -0,0 +1 @@
+throw new Error('Expected error')

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/source-maps-client/page.tsx

@@ -0,0 +1,18 @@
+'use client'
+
+import { useEffect } from 'react'
+
+export default function Page() {
+  useEffect(function effectCallback() {
+    innerFunction()
+  })
+  return <p>Hello Source Maps</p>
+}
+
+function innerFunction() {
+  innerArrowFunction()
+}
+
+const innerArrowFunction = () => {
+  require('../separate-file')
+}

test/e2e/app-dir/non-root-project-monorepo/apps/web/app/source-maps-rsc/page.tsx

@@ -0,0 +1,15 @@
+export default async function Page({ searchParams }) {
+  // We don't want the build to fail in production
+  if (process.env.NODE_ENV === 'development') {
+    innerFunction()
+  }
+  return <p>Hello Source Maps</p>
+}
+
+function innerFunction() {
+  innerArrowFunction()
+}
+
+const innerArrowFunction = () => {
+  require('../separate-file')
+}