fix: handle node_modules in standalone's dist dir

src/build/content/server.ts

@@ -10,7 +10,7 @@ import {
   writeFile,
 } from 'node:fs/promises'
 import { createRequire } from 'node:module'
-import { dirname, join, resolve, sep } from 'node:path'
+import { dirname, join, relative, sep } from 'node:path'
 import { join as posixJoin, sep as posixSep } from 'node:path/posix'
 
 import { trace } from '@opentelemetry/api'
@@ -116,36 +116,53 @@ export const copyNextServerCode = async (ctx: PluginContext): Promise<void> => {
       },
     )
 
-    await Promise.all(
-      paths.map(async (path: string) => {
-        const srcPath = join(srcDir, path)
-        const destPath = join(destDir, path)
-
-        // If this is the middleware manifest file, replace it with an empty
-        // manifest to avoid running middleware again in the server handler.
-        if (path === 'server/middleware-manifest.json') {
-          try {
-            await replaceMiddlewareManifest(srcPath, destPath)
-          } catch (error) {
-            throw new Error('Could not patch middleware manifest file', { cause: error })
-          }
+    const promises = paths.map(async (path: string) => {
+      const srcPath = join(srcDir, path)
+      const destPath = join(destDir, path)
 
-          return
+      // If this is the middleware manifest file, replace it with an empty
+      // manifest to avoid running middleware again in the server handler.
+      if (path === 'server/middleware-manifest.json') {
+        try {
+          await replaceMiddlewareManifest(srcPath, destPath)
+        } catch (error) {
+          throw new Error('Could not patch middleware manifest file', { cause: error })
         }
 
-        if (path === 'server/functions-config-manifest.json') {
-          try {
-            await replaceFunctionsConfigManifest(srcPath, destPath)
-          } catch (error) {
-            throw new Error('Could not patch functions config manifest file', { cause: error })
-          }
+        return
+      }
 
-          return
+      if (path === 'server/functions-config-manifest.json') {
+        try {
+          await replaceFunctionsConfigManifest(srcPath, destPath)
+        } catch (error) {
+          throw new Error('Could not patch functions config manifest file', { cause: error })
         }
 
-        await cp(srcPath, destPath, { recursive: true, force: true })
-      }),
-    )
+        return
+      }
+
+      await cp(srcPath, destPath, { recursive: true, force: true })
+    })
+
+    // this is different node_modules than ones handled by `copyNextDependencies`
+    // this is under the standalone/.next folder (not standalone/node_modules or standalone/<some-workspace/node_modules)
+    // and started to be created by Next.js in some cases in next@16.1.0-canary.3
+    // this node_modules is artificially created and doesn't have equivalent in the repo
+    // so we only copy it, without additional symlinks handling
+    if (existsSync(join(srcDir, 'node_modules'))) {
+      const filter = ctx.constants.IS_LOCAL ? undefined : nodeModulesFilter
+      const src = join(srcDir, 'node_modules')
+      const dest = join(destDir, 'node_modules')
+      await cp(src, dest, {
+        recursive: true,
+        verbatimSymlinks: true,
+        force: true,
+        filter,
+      })
+    }
+
+    await Promise.all(promises)
   })
 }
 
@@ -290,42 +307,41 @@ async function patchNextModules(
 
 export const copyNextDependencies = async (ctx: PluginContext): Promise<void> => {
   await tracer.withActiveSpan('copyNextDependencies', async () => {
-    const entries = await readdir(ctx.standaloneDir)
-    const filter = ctx.constants.IS_LOCAL ? undefined : nodeModulesFilter
+    const promises: Promise<void>[] = []
+
+    const nodeModulesLocationsInStandalone = new Set<string>()
+    const commonFilter = ctx.constants.IS_LOCAL ? undefined : nodeModulesFilter
+
+    const dotNextDir = join(ctx.standaloneDir, ctx.nextDistDir)
+
+    await cp(ctx.standaloneRootDir, ctx.serverHandlerRootDir, {
+      recursive: true,
+      verbatimSymlinks: true,
+      force: true,
+      filter: async (sourcePath: string) => {
+        if (sourcePath === dotNextDir) {
+          // copy all except the distDir (.next) folder as this is handled in a separate function
+          // this will include the node_modules folder as well
+          return false
+        }
 
-    const promises: Promise<void>[] = entries.map(async (entry) => {
-      // copy all except the distDir (.next) folder as this is handled in a separate function
-      // this will include the node_modules folder as well
-      if (entry === ctx.nextDistDir) {
-        return
-      }
-      const src = join(ctx.standaloneDir, entry)
-      const dest = join(ctx.serverHandlerDir, entry)
-      await cp(src, dest, {
-        recursive: true,
-        verbatimSymlinks: true,
-        force: true,
-        filter,
-      })
+        if (sourcePath.endsWith('node_modules')) {
+          // keep track of node_modules as we might need to recreate symlinks
+          // we are still copying them
+          nodeModulesLocationsInStandalone.add(sourcePath)
+        }
 
-      if (entry === 'node_modules') {
-        await recreateNodeModuleSymlinks(ctx.resolveFromSiteDir('node_modules'), dest)
-      }
+        // finally apply common filter if defined
+        return commonFilter?.(sourcePath) ?? true
+      },
     })
 
-    // inside a monorepo there is a root `node_modules` folder that contains all the dependencies
-    const rootSrcDir = join(ctx.standaloneRootDir, 'node_modules')
-    const rootDestDir = join(ctx.serverHandlerRootDir, 'node_modules')
-
-    // use the node_modules tree from the process.cwd() and not the one from the standalone output
-    // as the standalone node_modules are already wrongly assembled by Next.js.
-    // see: https://github.com/vercel/next.js/issues/50072
-    if (existsSync(rootSrcDir) && ctx.standaloneRootDir !== ctx.standaloneDir) {
-      promises.push(
-        cp(rootSrcDir, rootDestDir, { recursive: true, verbatimSymlinks: true, filter }).then(() =>
-          recreateNodeModuleSymlinks(resolve('node_modules'), rootDestDir),
-        ),
-      )
+    for (const nodeModulesLocationInStandalone of nodeModulesLocationsInStandalone) {
+      const relativeToRoot = relative(ctx.standaloneRootDir, nodeModulesLocationInStandalone)
+      const locationInProject = join(ctx.outputFileTracingRoot, relativeToRoot)
+      const locationInServerHandler = join(ctx.serverHandlerRootDir, relativeToRoot)
+
+      promises.push(recreateNodeModuleSymlinks(locationInProject, locationInServerHandler))
     }
 
     await Promise.all(promises)
@@ -451,7 +467,7 @@ export const verifyHandlerDirStructure = async (ctx: PluginContext) => {
 // https://github.com/pnpm/pnpm/issues/9654
 // https://github.com/pnpm/pnpm/issues/5928
 // https://github.com/pnpm/pnpm/issues/7362 (persisting even though ticket is closed)
-const nodeModulesFilter = async (sourcePath: string) => {
+const nodeModulesFilter = (sourcePath: string) => {
   // Filtering rule for the following packages:
   // - @rspack+binding-linux-x64-musl
   // - @swc+core-linux-x64-musl

src/build/plugin-context.ts

@@ -84,6 +84,17 @@ export class PluginContext {
     return this.requiredServerFiles.relativeAppDir ?? ''
   }
 
+  /**
+   * The root directory for output file tracing. Paths inside standalone directory preserve paths of project, relative to this directory.
+   */
+  get outputFileTracingRoot(): string {
+    return (
+      this.requiredServerFiles.config.outputFileTracingRoot ??
+      // fallback for older Next.js versions that don't have outputFileTracingRoot in the config, but had it in config.experimental
+      this.requiredServerFiles.config.experimental.outputFileTracingRoot
+    )
+  }
+
   /**
    * The working directory inside the lambda that is used for monorepos to execute the serverless function
    */

tests/e2e/turborepo.test.ts

@@ -107,6 +107,15 @@ test.describe('[PNPM] Package manager', () => {
     const date3 = await page.getByTestId('date-now').textContent()
     expect(date3).not.toBe(date2)
   })
+
+  test('transitive external dependencies are supported', async ({ page, turborepo }) => {
+    const pageResponse = await page.goto(new URL('/transitive-external-deps', turborepo.url).href)
+
+    expect(pageResponse?.status()).toBe(200)
+
+    await expect(page.getByTestId('dep-a-version')).toHaveText('3.10.1')
+    await expect(page.getByTestId('dep-b-version')).toHaveText('4.17.21')
+  })
 })
 
 test.describe('[NPM] Package manager', () => {
@@ -228,4 +237,15 @@ test.describe('[NPM] Package manager', () => {
       '.env.production.local': 'defined in .env.production.local',
     })
   })
+
+  test('transitive external dependencies are supported', async ({ page, turborepoNPM }) => {
+    const pageResponse = await page.goto(
+      new URL('/transitive-external-deps', turborepoNPM.url).href,
+    )
+
+    expect(pageResponse?.status()).toBe(200)
+
+    await expect(page.getByTestId('dep-a-version')).toHaveText('3.10.1')
+    await expect(page.getByTestId('dep-b-version')).toHaveText('4.17.21')
+  })
 })

tests/fixtures/turborepo-npm/apps/page-router/next.config.js

@@ -8,6 +8,7 @@ const nextConfig = {
   },
   transpilePackages: ['@repo/ui'],
   outputFileTracingRoot: join(__dirname, '..', '..'),
+  serverExternalPackages: ['lodash'],
 }
 
 module.exports = nextConfig

tests/fixtures/turborepo-npm/apps/page-router/package.json

@@ -8,6 +8,8 @@
   },
   "dependencies": {
     "@netlify/functions": "^2.7.0",
+    "@repo/dep-a": "*",
+    "@repo/dep-b": "*",
     "@repo/ui": "*",
     "next": "latest",
     "react": "^18.2.0",

tests/fixtures/turborepo-npm/apps/page-router/pages/transitive-external-deps.js

@@ -0,0 +1,26 @@
+import depA from '@repo/dep-a'
+import depB from '@repo/dep-b'
+
+export default function TransitiveDeps() {
+  return (
+    <body>
+      <ul>
+        <li>
+          dep-a uses lodash version 3.10.1 and we should see this version here:{' '}
+          <span data-testId="dep-a-version">{depA}</span>
+        </li>
+        <li>
+          dep-b uses lodash version 4.17.21 and we should see this version here:{' '}
+          <span data-testId="dep-b-version">{depB}</span>
+        </li>
+      </ul>
+    </body>
+  )
+}
+
+// just to ensure this is rendered in runtime and not prerendered
+export async function getServerSideProps() {
+  return {
+    props: {},
+  }
+}

tests/fixtures/turborepo-npm/packages/dep-a/index.js

@@ -0,0 +1,3 @@
+import lodash from 'lodash'
+
+export default lodash.VERSION

tests/fixtures/turborepo-npm/packages/dep-a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@repo/dep-a",
+  "version": "1.0.0",
+  "dependencies": {
+    "lodash": "3.10.1"
+  }
+}

tests/fixtures/turborepo-npm/packages/dep-b/index.js

@@ -0,0 +1,3 @@
+import lodash from 'lodash'
+
+export default lodash.VERSION

tests/fixtures/turborepo-npm/packages/dep-b/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@repo/dep-b",
+  "version": "1.0.0",
+  "dependencies": {
+    "lodash": "4.17.21"
+  }
+}

tests/fixtures/turborepo/apps/page-router/next.config.js

@@ -8,6 +8,7 @@ const nextConfig = {
   },
   transpilePackages: ['@repo/ui'],
   outputFileTracingRoot: join(__dirname, '..', '..'),
+  serverExternalPackages: ['lodash'],
 }
 
 module.exports = nextConfig

tests/fixtures/turborepo/apps/page-router/package.json

@@ -8,6 +8,8 @@
   },
   "dependencies": {
     "@netlify/functions": "^2.7.0",
+    "@repo/dep-a": "workspace:*",
+    "@repo/dep-b": "workspace:*",
     "@repo/ui": "workspace:*",
     "next": "latest",
     "react": "^18.2.0",

tests/fixtures/turborepo/apps/page-router/src/pages/transitive-external-deps.js

@@ -0,0 +1,26 @@
+import depA from '@repo/dep-a'
+import depB from '@repo/dep-b'
+
+export default function TransitiveDeps() {
+  return (
+    <body>
+      <ul>
+        <li>
+          dep-a uses lodash version 3.10.1 and we should see this version here:{' '}
+          <span data-testId="dep-a-version">{depA}</span>
+        </li>
+        <li>
+          dep-b uses lodash version 4.17.21 and we should see this version here:{' '}
+          <span data-testId="dep-b-version">{depB}</span>
+        </li>
+      </ul>
+    </body>
+  )
+}
+
+// just to ensure this is rendered in runtime and not prerendered
+export async function getServerSideProps() {
+  return {
+    props: {},
+  }
+}

tests/fixtures/turborepo/packages/dep-a/index.js

@@ -0,0 +1,3 @@
+import lodash from 'lodash'
+
+export default lodash.VERSION

tests/fixtures/turborepo/packages/dep-a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@repo/dep-a",
+  "version": "1.0.0",
+  "dependencies": {
+    "lodash": "3.10.1"
+  }
+}

tests/fixtures/turborepo/packages/dep-b/index.js

@@ -0,0 +1,3 @@
+import lodash from 'lodash'
+
+export default lodash.VERSION

tests/fixtures/turborepo/packages/dep-b/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@repo/dep-b",
+  "version": "1.0.0",
+  "dependencies": {
+    "lodash": "4.17.21"
+  }
+}