File size: 4,610 Bytes
b2cad4f | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | diff --git a/packages/next/src/server/dynamic-rendering-utils.ts b/packages/next/src/server/dynamic-rendering-utils.ts
index abc5e7ae92a7752c9124896121450fb1a601b57b..f5b086cdeabecf1828d49a7812db93b76efce7bc 100644
--- a/packages/next/src/server/dynamic-rendering-utils.ts
+++ b/packages/next/src/server/dynamic-rendering-utils.ts
@@ -91,6 +91,17 @@ export function makeDynamicHangingPromise<T>(
)
}
+export function makeUntrackedHangingPromise<T>(
+ signal: AbortSignal,
+ route: string,
+ expression: string
+): Promise<T> {
+ return makeHangingPromiseWithError(
+ signal,
+ new HangingPromiseRejectionError(route, expression)
+ )
+}
+
/**
* Constructs a promise that never resolves, standing in for *runtime* data:
* data that hangs during a static prerender but is available during a runtime
diff --git a/packages/next/src/server/use-cache/use-cache-wrapper.ts b/packages/next/src/server/use-cache/use-cache-wrapper.ts
index 71935aab3d6e8272f90231e9153e5cc4caa2c7b1..7ee8be8c3babac0f50277f8ce790ab205566740e 100644
--- a/packages/next/src/server/use-cache/use-cache-wrapper.ts
+++ b/packages/next/src/server/use-cache/use-cache-wrapper.ts
@@ -42,6 +42,7 @@ import {
makeDynamicHangingPromise,
makeRuntimeHangingPromise,
makeStageHangingPromise,
+ makeUntrackedHangingPromise,
RENDER_STAGES_BY_DATA_KIND,
} from '../dynamic-rendering-utils'
@@ -1283,7 +1284,7 @@ async function generateCacheEntryImpl(
switch (outerWorkUnitStore.type) {
case 'prerender-runtime':
- case 'prerender':
+ case 'prerender': {
const timeoutAbortController = new AbortController()
const timer = setTimeout(
() => {
@@ -1299,7 +1300,6 @@ async function generateCacheEntryImpl(
const abortSignal = dynamicAccessAbortSignal
? AbortSignal.any([
dynamicAccessAbortSignal,
- outerWorkUnitStore.renderSignal,
timeoutAbortController.signal,
])
: timeoutAbortController.signal
@@ -1357,6 +1357,7 @@ async function generateCacheEntryImpl(
stream = prelude
}
break
+ }
case 'request':
// TODO: We should just check if the render is abandonable. This is
// relevant in restart-on-cache-miss in general, so when we implement that
@@ -1640,6 +1641,51 @@ export async function cache(
)
}
+ const workUnitStore = workUnitAsyncStorage.getStore()
+ if (workUnitStore === undefined) {
+ throw new InvariantError(
+ '"use cache" cannot be used outside of App Router. Expected a WorkUnitStore.'
+ )
+ }
+
+ // In a prerender, tasky IO may result in cache reads that start
+ // after the prerender has already been aborted:
+ //
+ // await setTimeout(100) // we can't abort this uncached IO...
+ // await cachedData() // ...so we'll still get here even though the prerender aborted
+ //
+ // The prerender is over, so we should just return an erroring promise.
+ // (NOTE: we also shouldn't fill this cache, because it's behind uncached IO,
+ // so semantically it is not part of the prerender)
+ switch (workUnitStore.type) {
+ case 'prerender':
+ case 'prerender-runtime': {
+ if (workUnitStore.renderSignal.aborted) {
+ // We don't know if the cache itself is dynamic or runtime data,
+ // but the prerender is over, so it doesn't need to participate
+ // in runtime data tracking at all.
+ return makeUntrackedHangingPromise<never>(
+ workUnitStore.renderSignal,
+ workStore.route,
+ '"use cache" called after prerender ended'
+ )
+ }
+ break
+ }
+ case 'prerender-ppr':
+ case 'prerender-legacy':
+ case 'prerender-client':
+ case 'validation-client':
+ case 'request':
+ case 'cache':
+ case 'private-cache':
+ case 'unstable-cache':
+ case 'generate-static-params':
+ break
+ default:
+ workUnitStore satisfies never
+ }
+
// Probe re-executions (the dev-server's hang-detection worker) short-circuit
// further down before any handler is consulted, so we skip handler selection
// entirely and the worker can boot without registering handlers at all.
@@ -1705,13 +1751,6 @@ export async function cache(
return error
}
- const workUnitStore = workUnitAsyncStorage.getStore()
- if (workUnitStore === undefined) {
- throw new InvariantError(
- '"use cache" cannot be used outside of App Router. Expected a WorkUnitStore.'
- )
- }
-
const outerOwnerStack =
process.env.NODE_ENV !== 'production'
? captureOuterOwnerStack(workUnitStore)
|