Turbopack: symlinks and parent globs in outputFileTracingIncludes (vercel#82528)

1. Don't resolve symlinks in `outputFileTracingIncludes`. Otherwise if you specify `node_modules/foo/*` in there, it will resolve to `node_modules/.pnpm/foo/*` and `require("foo")` won't work anymore because there no symlink in `node_modules/foo` anymore. This is also what happens with Webpack
2. Align `read_glob` with `read_dir` in that the hashmap keys only contain the path segment, and not the full path.
3. Support globing parents of the start folder: if the glob can match `..`, then also try to match `directory.parent_folder().read_glob(glob)`

Closes PACK-5219

Author: mischnic

crates/next-api/src/nft_json.rs

@@ -104,6 +104,7 @@ async fn apply_includes(
 ) -> Result<BTreeSet<RcStr>> {
     debug_assert_eq!(project_root_path.fs, ident_folder.fs);
     // Read files matching the glob pattern from the project root
+    // This result itself has random order, but the BTreeSet will ensure a deterministic ordering.
     let glob_result = project_root_path.read_glob(glob).await?;
 
     // Walk the full glob_result using an explicit stack to avoid async recursion overheads.
@@ -113,15 +114,15 @@ async fn apply_includes(
     while let Some(glob_result) = stack.pop_back() {
         // Process direct results (files and directories at this level)
         for entry in glob_result.results.values() {
-            let DirectoryEntry::File(file_path) = entry else {
+            let (DirectoryEntry::File(file_path) | DirectoryEntry::Symlink(file_path)) = entry
+            else {
                 continue;
             };
 
-            let file_path_ref = file_path;
             // Convert to relative path from ident_folder to the file
             // unwrap is safe because project_root_path and ident_folder have the same filesystem
             // and paths produced by read_glob stay in the filesystem
-            let relative_path = ident_folder.get_relative_path_to(file_path_ref).unwrap();
+            let relative_path = ident_folder.get_relative_path_to(file_path).unwrap();
             result.insert(relative_path);
         }
 

test/integration/build-trace-extra-entries-monorepo/app/app/route1/route.js

@@ -0,0 +1,5 @@
+export const dynamic = 'force-dynamic'
+
+export async function GET() {
+  return new Response('foo')
+}

test/integration/build-trace-extra-entries-monorepo/app/next.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  outputFileTracingIncludes: {
+    '/route1': ['../other/included.txt'],
+  },
+}

test/integration/build-trace-extra-entries-monorepo/other/included.txt

@@ -0,0 +1 @@
+data

test/integration/build-trace-extra-entries-monorepo/test/index.test.ts

@@ -0,0 +1,33 @@
+/* eslint-env jest */
+
+import fs from 'fs-extra'
+import { join } from 'path'
+import { nextBuild } from 'next-test-utils'
+
+const appDir = join(__dirname, '../app')
+
+describe('build trace with extra entries in monorepo', () => {
+  ;(process.env.TURBOPACK_DEV ? describe.skip : describe)(
+    'production mode',
+    () => {
+      it('should build and trace correctly', async () => {
+        const result = await nextBuild(appDir, undefined, {
+          cwd: appDir,
+          stderr: true,
+          stdout: true,
+        })
+        expect(result.code).toBe(0)
+        console.log(result.stderr)
+        console.log(result.stdout)
+
+        const appDirRoute1Trace = await fs.readJSON(
+          join(appDir, '.next/server/app/route1/route.js.nft.json')
+        )
+
+        expect(appDirRoute1Trace.files).toContain(
+          '../../../../../other/included.txt'
+        )
+      })
+    }
+  )
+})

test/integration/build-trace-extra-entries/app/include-me-global.txt

@@ -2,7 +2,6 @@ const path = require('path')
 
 module.exports = {
   webpack(cfg, { isServer, nextRuntime }) {
-    console.log(cfg.entry)
     const origEntry = cfg.entry
     cfg.entry = async () => {
       const origEntries = await origEntry()
@@ -13,15 +12,15 @@ module.exports = {
           path.join(__dirname, 'lib/get-data.js'),
           ...curEntry,
         ]
-        console.log(origEntries)
       }
       return origEntries
     }
     return cfg
   },
   outputFileTracingIncludes: {
     '/index': ['include-me/**/*'],
-    '/route1': ['./include-me/**/*'],
+    '/route1': ['./include-me/**/*', 'node_modules/pkg-behind-symlink/*'],
+    '/*': ['include-me-global.txt'],
   },
   outputFileTracingExcludes: {
     '/index': ['public/exclude-me/**/*'],