Fix standalone not found (#51172)

Fixes #50232 Passing down the private env into `'render-server'` module to pick up the proper react with require-hook in standalone server fix NEXT-1260
vercel · Jun 12, 2023 · 9d0129c · 9d0129c
1 parent 8a11835
commit 9d0129c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
@@ -1922,20 +1922,21 @@ export async function copyTracedFiles(
     serverOutputPath,
     `${
       moduleType
-        ? `import http from 'http'
+        ? `\
+import http from 'http'
 import path from 'path'
 import { fileURLToPath } from 'url'
-const __dirname = fileURLToPath(new URL('.', import.meta.url))
 import { createServerHandler } from 'next/dist/server/lib/render-server-standalone.js'
+
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
 `
-        : `
+        : `\
 const http = require('http')
 const path = require('path')
 const { createServerHandler } = require('next/dist/server/lib/render-server-standalone')`
     }
 
 const dir = path.join(__dirname)
-
 process.env.NODE_ENV = 'production'
 process.chdir(__dirname)
 
@@ -1956,6 +1957,7 @@ const nextConfig = ${JSON.stringify({
 
 process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig)
 
+
 createServerHandler({
   port: currentPort,
   hostname,

diff --git a/packages/next/src/server/lib/render-server-standalone.ts b/packages/next/src/server/lib/render-server-standalone.ts
@@ -5,8 +5,6 @@ import httpProxy from 'next/dist/compiled/http-proxy'
 import { Worker } from 'next/dist/compiled/jest-worker'
 import { normalizeRepeatedSlashes } from '../../shared/lib/utils'
 
-const renderServerPath = require.resolve('./render-server')
-
 export const createServerHandler = async ({
   port,
   hostname,
@@ -20,13 +18,20 @@ export const createServerHandler = async ({
   dev?: boolean
   minimalMode: boolean
 }) => {
-  const routerWorker = new Worker(renderServerPath, {
+  const nextConfig = JSON.parse(
+    process.env.__NEXT_PRIVATE_STANDALONE_CONFIG || '{}'
+  )
+  const routerWorker = new Worker(require.resolve('./render-server'), {
     numWorkers: 1,
     maxRetries: 10,
     forkOptions: {
       env: {
         FORCE_COLOR: '1',
         ...process.env,
+        __NEXT_PRIVATE_PREBUNDLED_REACT: nextConfig?.experimental
+          ?.useServerActions
+          ? 'experimental'
+          : 'next',
       },
     },
     exposedMethods: ['initialize'],

diff --git a/test/e2e/app-dir/app/app/dashboard/not-found.js b/test/e2e/app-dir/app/app/dashboard/not-found.js
@@ -0,0 +1,3 @@
+export default function NotFound() {
+  return 'dashboard not found'
+}
diff --git a/test/production/standalone-mode/required-server-files/app/not-found.js b/test/production/standalone-mode/required-server-files/app/not-found.js
@@ -0,0 +1,3 @@
+export default function page() {
+  return 'not-found-page-404'
+}
diff --git a/test/production/standalone-mode/required-server-files/next.config.js b/test/production/standalone-mode/required-server-files/next.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  output: 'standalone',
+}
diff --git a/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts b/test/production/standalone-mode/required-server-files/required-server-files-app.test.ts
@@ -127,4 +127,12 @@ describe('should set-up next', () => {
       expect(res.headers.get('x-next-cache-tags')).toBeFalsy()
     }
   })
+
+  it('should handle correctly not-found.js', async () => {
+    const res = await fetchViaHTTP(appPort, '/not-found/does-not-exist')
+    expect(res.status).toBe(404)
+    const html = await res.text()
+    expect(html).toContain('not-found-page-404')
+    expect(html).not.toContain('not-found-page-200')
+  })
 })