From fa71e1ff479b7fe628d1297e3735323722ac4700 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 11 Sep 2024 11:52:00 -0700 Subject: [PATCH 1/4] Remove invalid fallback revalidate value --- packages/next/src/server/base-server.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index 1dba9ac4ca6f8..e14912f63767d 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -2732,7 +2732,7 @@ export default abstract class Server< headers, status: isAppPath ? res.statusCode : undefined, } satisfies CachedPageValue, - revalidate: metadata.revalidate ?? 1, + revalidate: metadata.revalidate, isFallback: query.__nextFallback === 'true', } } @@ -2975,7 +2975,7 @@ export default abstract class Server< return { ...result, - revalidate: result.revalidate ?? 1, + revalidate: result.revalidate, } } From e3af8a0e8fc6b8ebaf690285e7ed17addc0c730e Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 11 Sep 2024 13:14:38 -0700 Subject: [PATCH 2/4] set in render correctly --- packages/next/src/server/render.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx index 976e6469ad360..2d3433e2e9922 100644 --- a/packages/next/src/server/render.tsx +++ b/packages/next/src/server/render.tsx @@ -1081,6 +1081,7 @@ export async function renderToHTMLImpl( }) ) canAccessRes = false + metadata.revalidate = 0 } catch (serverSidePropsError: any) { // remove not found error code to prevent triggering legacy // 404 rendering From ca02c080bfd59c4b5534a420569e5704bd04d703 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 11 Sep 2024 13:33:57 -0700 Subject: [PATCH 3/4] fix tests --- .../required-server-files-i18n.test.ts | 17 +++++++++++------ .../required-server-files.test.ts | 16 ++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts b/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts index 22af48ce4b1f7..d5428b031726c 100644 --- a/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts +++ b/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts @@ -348,12 +348,17 @@ describe('required server files i18n', () => { expect(isNaN(data2.random)).toBe(false) expect(data2.random).not.toBe(data.random) - const html3 = await renderViaHTTP(appPort, '/some-other-path', undefined, { - headers: { - 'x-matched-path': '/dynamic/[slug]?slug=%5Bslug%5D.json', - 'x-now-route-matches': '1=second&nxtPslug=second', - }, - }) + const html3 = await renderViaHTTP( + appPort, + '/some-other-path?nxtPslug=second', + undefined, + { + headers: { + 'x-matched-path': '/dynamic/[slug]?slug=%5Bslug%5D.json', + }, + } + ) + require('console').error(html3) const $3 = cheerio.load(html3) const data3 = JSON.parse($3('#props').text()) diff --git a/test/production/standalone-mode/required-server-files/required-server-files.test.ts b/test/production/standalone-mode/required-server-files/required-server-files.test.ts index ef60f87d8912d..76954b5751ef6 100644 --- a/test/production/standalone-mode/required-server-files/required-server-files.test.ts +++ b/test/production/standalone-mode/required-server-files/required-server-files.test.ts @@ -634,12 +634,16 @@ describe('required server files', () => { expect(isNaN(data2.random)).toBe(false) expect(data2.random).not.toBe(data.random) - const html3 = await renderViaHTTP(appPort, '/some-other-path', undefined, { - headers: { - 'x-matched-path': '/dynamic/[slug]', - 'x-now-route-matches': '1=second&nxtPslug=second', - }, - }) + const html3 = await renderViaHTTP( + appPort, + '/some-other-path?nxtPslug=second', + undefined, + { + headers: { + 'x-matched-path': '/dynamic/[slug]', + }, + } + ) const $3 = cheerio.load(html3) const data3 = JSON.parse($3('#props').text()) From 027bbf1b64c4434054dcda182662094d5fc09329 Mon Sep 17 00:00:00 2001 From: JJ Kasper Date: Wed, 11 Sep 2024 14:05:33 -0700 Subject: [PATCH 4/4] remove debug --- .../required-server-files/required-server-files-i18n.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts b/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts index d5428b031726c..39ea7fec3ae72 100644 --- a/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts +++ b/test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts @@ -358,7 +358,6 @@ describe('required server files i18n', () => { }, } ) - require('console').error(html3) const $3 = cheerio.load(html3) const data3 = JSON.parse($3('#props').text())