Fix: respond 405 status code on OPTIONS request to SSG page

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

@@ -2247,7 +2247,7 @@ export default abstract class Server<
     ) {
       res.statusCode = 405
       res.setHeader('Allow', ['GET', 'HEAD'])
-      await this.renderError(null, req, res, pathname)
+      res.body('Method Not Allowed').send()
       return null
     }
 

test/production/options-request/app/app-page/dynamic/page.tsx

@@ -0,0 +1,5 @@
+export default function Page() {
+  return <div>foo page</div>
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/app-dir/options-request/options-request.test.ts → test/production/options-request/options-request.test.ts

@@ -5,8 +5,8 @@ describe('options-request', () => {
     files: __dirname,
   })
 
-  it.each(['/app-page', '/pages-page'])(
-    'should return a 400 status code when invoking %s with an OPTIONS request',
+  it.each(['/app-page/dynamic', '/pages-page/dynamic'])(
+    'should return a 400 status code when invoking %s with an OPTIONS request (dynamic rendering)',
     async (path) => {
       const res = await next.fetch(path, { method: 'OPTIONS' })
       expect(res.status).toBe(400)
@@ -15,6 +15,15 @@ describe('options-request', () => {
     }
   )
 
+  it.each(['/app-page/static', '/pages-page/static'])(
+    'should return a 405 status code when invoking %s with an OPTIONS request (static rendering)',
+    async (path) => {
+      const res = await next.fetch(path, { method: 'OPTIONS' })
+      expect(res.status).toBe(405)
+      expect(await res.text()).toBe('Method Not Allowed')
+    }
+  )
+
   // In app router, OPTIONS is auto-implemented if not provided
   it('should respond with a 204 No Content when invoking an app route handler with an OPTIONS request', async () => {
     const res = await next.fetch('/app-route', { method: 'OPTIONS' })

test/production/options-request/pages/pages-page/dynamic.tsx

@@ -0,0 +1,11 @@
+export default function Page() {
+  return <div>bar</div>
+}
+
+export async function getServerSideProps() {
+  return {
+    props: {
+      data: {},
+    },
+  }
+}