Fix default static /500 with i18n (#29250)

vercel · Sep 21, 2021 · b4d8aa8 · b4d8aa8
1 parent d5b1d59
commit b4d8aa8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/next/export/worker.ts b/packages/next/export/worker.ts
@@ -197,7 +197,7 @@ export default async function exportPage({
         ...headerMocks,
       } as unknown as ServerResponse
 
-      if (path === '/500' && page === '/_error') {
+      if (updatedPath === '/500' && page === '/_error') {
         res.statusCode = 500
       }
 

diff --git a/test/integration/i18n-support/test/index.test.js b/test/integration/i18n-support/test/index.test.js
@@ -76,6 +76,17 @@ describe('i18n Support', () => {
     })
 
     runTests(ctx)
+
+    it('should have pre-rendered /500 correctly', async () => {
+      for (const locale of locales) {
+        const content = await fs.readFile(
+          join(appDir, '.next/server/pages/', locale, '500.html'),
+          'utf8'
+        )
+        expect(content).toContain('500')
+        expect(content).toMatch(/internal server error/i)
+      }
+    })
   })
 
   describe('serverless mode', () => {