Ensure custom relative distDir resolves properly

packages/next/src/server/base-server.ts

@@ -2642,6 +2642,7 @@ export default abstract class Server<
             // propagate the request context for dev
             setRequestMeta(request, getRequestMeta(req))
             addRequestMeta(request, 'projectDir', this.dir)
+            addRequestMeta(request, 'distDir', this.distDir)
             addRequestMeta(request, 'isIsrFallback', pagesFallback)
             addRequestMeta(request, 'query', query)
             addRequestMeta(request, 'params', opts.params)

packages/next/src/server/next-server.ts

@@ -667,6 +667,7 @@ export default class NextNodeServer extends BaseServer<
       ) => Promise<void>
     }
     addRequestMeta(req.originalRequest, 'projectDir', this.dir)
+    addRequestMeta(req.originalRequest, 'distDir', this.distDir)
     await module.handler(req.originalRequest, res.originalResponse, {
       waitUntil: this.getWaitUntil(),
     })

packages/next/src/server/request-meta.ts

@@ -201,6 +201,11 @@ export interface RequestMeta {
    */
   projectDir?: string
 
+  /**
+   * The dist directory the server is currently using
+   */
+  distDir?: string
+
   /**
    * Whether we are generating the fallback version of the page in dev mode
    */

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

@@ -425,11 +425,17 @@ export abstract class RouteModule<
     // if we want to share the normalizing logic here
     // we will need to allow passing in the i18n and similar info
     if (process.env.NEXT_RUNTIME !== 'edge') {
-      const { join } = require('node:path') as typeof import('node:path')
+      const { join, relative } =
+        require('node:path') as typeof import('node:path')
       const projectDir =
         getRequestMeta(req, 'projectDir') ||
         join(process.cwd(), this.projectDir)
 
+      const absoluteDistDir = getRequestMeta(req, 'distDir')
+
+      if (absoluteDistDir) {
+        this.distDir = relative(projectDir, absoluteDistDir)
+      }
       const { ensureInstrumentationRegistered } = await import(
         '../lib/router-utils/instrumentation-globals.external'
       )

test/e2e/app-dir/nx-handling/.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

test/e2e/app-dir/nx-handling/.gitignore

@@ -0,0 +1,50 @@
+# See https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
+
+# compiled output
+dist
+tmp
+out-tsc
+
+# dependencies
+node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.nx/cache
+.nx/workspace-data
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md
+
+# Next.js
+.next
+out
+.nx
+.vscode

test/e2e/app-dir/nx-handling/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

test/e2e/app-dir/nx-handling/apps/next-nx-test/.swcrc

@@ -0,0 +1,30 @@
+{
+  "jsc": {
+    "target": "es2017",
+    "parser": {
+      "syntax": "typescript",
+      "decorators": true,
+      "dynamicImport": true
+    },
+    "transform": {
+      "decoratorMetadata": true,
+      "legacyDecorator": true
+    },
+    "keepClassNames": true,
+    "externalHelpers": true,
+    "loose": true
+  },
+  "module": {
+    "type": "commonjs"
+  },
+  "sourceMaps": true,
+  "exclude": [
+    "jest.config.ts",
+    ".*\\.spec.tsx?$",
+    ".*\\.test.tsx?$",
+    "./src/jest-setup.ts$",
+    "./**/jest-setup.ts$",
+    ".*.js$",
+    ".*.d.ts$"
+  ]
+}

test/e2e/app-dir/nx-handling/apps/next-nx-test/app/api/hello/route.ts

@@ -0,0 +1,3 @@
+export async function GET(request: Request) {
+  return new Response('Hello, from API!')
+}