fix build id and ssr error

vercel · Jan 25, 2022 · e5658f2 · e5658f2
1 parent b5e7949
commit e5658f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts
@@ -4,6 +4,7 @@ export default async function middlewareSSRLoader(this: any) {
   const {
     dev,
     page,
+    buildId,
     absolutePagePath,
     absoluteAppPath,
     absoluteDocumentPath,
@@ -63,6 +64,7 @@ export default async function middlewareSSRLoader(this: any) {
       errorMod,
 
       // renderOpts
+      buildId: ${JSON.stringify(buildId)},
       dev: ${JSON.stringify(dev)},
       env: process.env,
       supportsDynamicHTML: true,

diff --git a/packages/next/server/web-server.ts b/packages/next/server/web-server.ts
@@ -41,8 +41,7 @@ export default class NextWebServer extends BaseServer {
     return ''
   }
   protected getBuildId() {
-    // @TODO
-    return ''
+    return (globalThis as any).__server_context.buildId
   }
   protected loadEnvConfig() {
     // @TODO

diff --git a/test/integration/react-streaming-and-server-components/test/index.test.js b/test/integration/react-streaming-and-server-components/test/index.test.js
@@ -350,10 +350,8 @@ async function runBasicTests(context, env) {
     const $404 = cheerio.load(path404HTML)
     expect($404('#__next').text()).toBe(page404Content)
 
-    // in dev mode: custom error page is still using default _error
-    expect(path500HTML).toContain(
-      isDev ? 'Internal Server Error' : 'custom-500-page'
-    )
+    // In dev mode: it should show the error popup.
+    expect(path500HTML).toContain(isDev ? 'Error: oops' : 'custom-500-page')
     expect(pathNotFoundHTML).toContain(page404Content)
   })