a comment

packages/build-utils/src/fs/glob.ts

@@ -39,9 +39,30 @@ export default async function glob(
 
   options.symlinks = {};
   options.statCache = {};
+  options.cache = {};
   options.stat = true;
   options.dot = true;
 
+  await vanillaGlob(pattern, options); // populates the caches
+
+  for (const [ abs, isSym ] of Object.entries(options.symlinks)) { // vercel/40180cd6-path0/node_modules/next-site is a symlink
+    if (isSym) {
+      const sc = options.statCache[abs]!;
+
+      if (sc && sc.isDirectory()) { // ... and also a directory
+        // console.log('dir+sym', abs);
+        const c = options.cache[abs];
+
+        if (Array.isArray(c)) {
+          for (const sub of c) {
+            // suppressing it's content entries prevents the second run of vanillaGlob from following it
+            options.cache[path.join(abs, sub)] = false;
+          }
+        }
+      }
+    }
+  }
+
   const files = await vanillaGlob(pattern, options);
 
   for (const relativePath of files) {

packages/build-utils/test/symlinks-node-modules/a.txt

@@ -0,0 +1 @@
+contents

packages/build-utils/test/symlinks-node-modules/dir/node-modules/b.txt

@@ -0,0 +1 @@
+contents

packages/build-utils/test/symlinks-node-modules/link.txt

@@ -0,0 +1 @@
+a.txt

packages/build-utils/test/symlinks-node-modules/node-modules/link-dir

@@ -0,0 +1 @@
+../dir

packages/build-utils/test/unit.test.ts

@@ -71,6 +71,28 @@ it('should re-create symlinks properly', async () => {
   assert(aStat.isFile());
 });
 
+it('should re-create symlinks properly (**/node_modules/**)', async () => {
+  if (process.platform === 'win32') {
+    console.log('Skipping test on windows');
+    return;
+  }
+  const files = await glob('**/node-modules/**', path.join(__dirname, 'symlinks-node-modules'));
+  assert.equal(Object.keys(files).length, 2);
+
+  const outDir = path.join(__dirname, 'symlinks-out');
+  await fs.remove(outDir);
+
+  const files2 = await download(files, outDir);
+  assert.equal(Object.keys(files2).length, 2);
+
+  const [linkDirStat, bStat] = await Promise.all([
+    fs.lstat(path.join(outDir, 'node-modules/link-dir')),
+    fs.lstat(path.join(outDir, 'dir/node-modules/b.txt')),
+  ]);
+  assert(linkDirStat.isSymbolicLink());
+  assert(bStat.isFile());
+});
+
 it('should create zip files with symlinks properly', async () => {
   if (process.platform === 'win32') {
     console.log('Skipping test on windows');