Skip to content

Commit 35ad37e

Browse files
lubieowoceeps1lon
authored andcommitted
go back to ignoring revalidates from render (#71088)
Reverts most of #70446. We're going to ban calling revalidateTag/revalidatePath during render in #71030, so this is no longer needed (also, this usage of `ctx.renderOpts.waitUntil` was never correct anyway)
1 parent a4fdf29 commit 35ad37e

File tree

3 files changed

+0
-59
lines changed

3 files changed

+0
-59
lines changed

packages/next/src/server/app-render/app-render.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -517,22 +517,6 @@ async function generateDynamicFlightRenderResult(
517517
onError,
518518
}
519519
)
520-
await waitAtLeastOneReactRenderTask()
521-
522-
if (
523-
ctx.workStore.pendingRevalidates ||
524-
ctx.workStore.revalidatedTags ||
525-
ctx.workStore.pendingRevalidateWrites
526-
) {
527-
const promises = Promise.all([
528-
ctx.workStore.incrementalCache?.revalidateTag(
529-
ctx.workStore.revalidatedTags || []
530-
),
531-
...Object.values(ctx.workStore.pendingRevalidates || {}),
532-
...(ctx.workStore.pendingRevalidateWrites || []),
533-
])
534-
ctx.renderOpts.waitUntil = (p) => promises.then(() => p)
535-
}
536520

537521
return new FlightRenderResult(flightReadableStream, {
538522
fetchMetrics: ctx.workStore.fetchMetrics,

test/e2e/app-dir/revalidatetag-rsc/app/revalidate_via_page/page.tsx

Lines changed: 0 additions & 24 deletions
This file was deleted.

test/e2e/app-dir/revalidatetag-rsc/revalidatetag-rsc.test.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,4 @@ describe('revalidateTag-rsc', () => {
2020
expect(randomNumber3).not.toEqual(randomNumber)
2121
})
2222
})
23-
24-
it('should revalidate fetch cache if revalidateTag invoked via server component', async () => {
25-
const browser = await next.browser('/')
26-
const randomNumber = await browser.elementById('data').text()
27-
await browser.refresh()
28-
const randomNumber2 = await browser.elementById('data').text()
29-
expect(randomNumber).toEqual(randomNumber2)
30-
await browser.elementByCss('#revalidate-via-page').click()
31-
await browser.waitForElementByCss('#home')
32-
await browser.elementByCss('#home').click()
33-
await browser.waitForElementByCss('#data')
34-
await retry(async () => {
35-
// need to refresh to evict client router cache
36-
await browser.refresh()
37-
await browser.waitForElementByCss('#data')
38-
const randomNumber3 = await browser.elementById('data').text()
39-
expect(randomNumber3).not.toEqual(randomNumber)
40-
})
41-
})
4223
})

0 commit comments

Comments
 (0)