Commit 3c985b02 authored by Janka Uryga's avatar Janka Uryga

[Cache Components] do not cache request API promises in dev/request

parent e0f676b6
...@@ -171,6 +171,11 @@ function makeHangingCookies( ...@@ -171,6 +171,11 @@ function makeHangingCookies(
function makeUntrackedCookies( function makeUntrackedCookies(
underlyingCookies: ReadonlyRequestCookies underlyingCookies: ReadonlyRequestCookies
): Promise<ReadonlyRequestCookies> { ): Promise<ReadonlyRequestCookies> {
// If CC is enabled, don't cache the promise.
if (process.env.__NEXT_CACHE_COMPONENTS) {
return Promise.resolve(underlyingCookies)
}
const cachedCookies = CachedCookies.get(underlyingCookies) const cachedCookies = CachedCookies.get(underlyingCookies)
if (cachedCookies) { if (cachedCookies) {
return cachedCookies return cachedCookies
...@@ -186,14 +191,29 @@ function makeUntrackedCookiesWithDevWarnings( ...@@ -186,14 +191,29 @@ function makeUntrackedCookiesWithDevWarnings(
underlyingCookies: ReadonlyRequestCookies, underlyingCookies: ReadonlyRequestCookies,
route?: string route?: string
): Promise<ReadonlyRequestCookies> { ): Promise<ReadonlyRequestCookies> {
const cachedCookies = CachedCookies.get(underlyingCookies) // If CC is enabled, don't cache the promise.
if (cachedCookies) { if (process.env.__NEXT_CACHE_COMPONENTS) {
return makeUntrackedCookiesWithDevWarningsImpl(underlyingCookies, route)
} else {
let cachedCookies = CachedCookies.get(underlyingCookies)
if (!cachedCookies) {
cachedCookies = makeUntrackedCookiesWithDevWarningsImpl(
underlyingCookies,
route
)
CachedCookies.set(underlyingCookies, cachedCookies)
}
return cachedCookies return cachedCookies
} }
}
function makeUntrackedCookiesWithDevWarningsImpl(
underlyingCookies: ReadonlyRequestCookies,
route?: string
): Promise<ReadonlyRequestCookies> {
const promise = makeDevtoolsIOAwarePromise(underlyingCookies) const promise = makeDevtoolsIOAwarePromise(underlyingCookies)
const proxiedPromise = new Proxy(promise, { return new Proxy(promise, {
get(target, prop, receiver) { get(target, prop, receiver) {
switch (prop) { switch (prop) {
case Symbol.iterator: { case Symbol.iterator: {
...@@ -219,10 +239,6 @@ function makeUntrackedCookiesWithDevWarnings( ...@@ -219,10 +239,6 @@ function makeUntrackedCookiesWithDevWarnings(
return ReflectAdapter.get(target, prop, receiver) return ReflectAdapter.get(target, prop, receiver)
}, },
}) })
CachedCookies.set(underlyingCookies, proxiedPromise)
return proxiedPromise
} }
const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev( const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev(
......
...@@ -180,6 +180,11 @@ function makeHangingHeaders( ...@@ -180,6 +180,11 @@ function makeHangingHeaders(
function makeUntrackedHeaders( function makeUntrackedHeaders(
underlyingHeaders: ReadonlyHeaders underlyingHeaders: ReadonlyHeaders
): Promise<ReadonlyHeaders> { ): Promise<ReadonlyHeaders> {
// If CC is enabled, don't cache the promise.
if (process.env.__NEXT_CACHE_COMPONENTS) {
return Promise.resolve(underlyingHeaders)
}
const cachedHeaders = CachedHeaders.get(underlyingHeaders) const cachedHeaders = CachedHeaders.get(underlyingHeaders)
if (cachedHeaders) { if (cachedHeaders) {
return cachedHeaders return cachedHeaders
...@@ -195,14 +200,29 @@ function makeUntrackedHeadersWithDevWarnings( ...@@ -195,14 +200,29 @@ function makeUntrackedHeadersWithDevWarnings(
underlyingHeaders: ReadonlyHeaders, underlyingHeaders: ReadonlyHeaders,
route?: string route?: string
): Promise<ReadonlyHeaders> { ): Promise<ReadonlyHeaders> {
const cachedHeaders = CachedHeaders.get(underlyingHeaders) // If CC is enabled, don't cache the promise.
if (cachedHeaders) { if (process.env.__NEXT_CACHE_COMPONENTS) {
return makeUntrackedHeadersWithDevWarningsImpl(underlyingHeaders, route)
} else {
let cachedHeaders = CachedHeaders.get(underlyingHeaders)
if (!cachedHeaders) {
cachedHeaders = makeUntrackedHeadersWithDevWarningsImpl(
underlyingHeaders,
route
)
CachedHeaders.set(underlyingHeaders, cachedHeaders)
}
return cachedHeaders return cachedHeaders
} }
}
function makeUntrackedHeadersWithDevWarningsImpl(
underlyingHeaders: ReadonlyHeaders,
route?: string
): Promise<ReadonlyHeaders> {
const promise = makeDevtoolsIOAwarePromise(underlyingHeaders) const promise = makeDevtoolsIOAwarePromise(underlyingHeaders)
const proxiedPromise = new Proxy(promise, { return new Proxy(promise, {
get(target, prop, receiver) { get(target, prop, receiver) {
switch (prop) { switch (prop) {
case Symbol.iterator: { case Symbol.iterator: {
...@@ -230,10 +250,6 @@ function makeUntrackedHeadersWithDevWarnings( ...@@ -230,10 +250,6 @@ function makeUntrackedHeadersWithDevWarnings(
return ReflectAdapter.get(target, prop, receiver) return ReflectAdapter.get(target, prop, receiver)
}, },
}) })
CachedHeaders.set(underlyingHeaders, proxiedPromise)
return proxiedPromise
} }
const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev( const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev(
......
...@@ -431,6 +431,11 @@ function makeErroringParams( ...@@ -431,6 +431,11 @@ function makeErroringParams(
} }
function makeUntrackedParams(underlyingParams: Params): Promise<Params> { function makeUntrackedParams(underlyingParams: Params): Promise<Params> {
// If CC is enabled, don't cache the promise.
if (process.env.__NEXT_CACHE_COMPONENTS) {
return Promise.resolve(underlyingParams)
}
const cachedParams = CachedParams.get(underlyingParams) const cachedParams = CachedParams.get(underlyingParams)
if (cachedParams) { if (cachedParams) {
return cachedParams return cachedParams
...@@ -447,11 +452,32 @@ function makeDynamicallyTrackedParamsWithDevWarnings( ...@@ -447,11 +452,32 @@ function makeDynamicallyTrackedParamsWithDevWarnings(
hasFallbackParams: boolean, hasFallbackParams: boolean,
store: WorkStore store: WorkStore
): Promise<Params> { ): Promise<Params> {
const cachedParams = CachedParams.get(underlyingParams) // If CC is enabled, don't cache the promise.
if (cachedParams) { if (process.env.__NEXT_CACHE_COMPONENTS) {
return makeDynamicallyTrackedParamsWithDevWarningsImpl(
underlyingParams,
hasFallbackParams,
store
)
} else {
let cachedParams = CachedParams.get(underlyingParams)
if (!cachedParams) {
cachedParams = makeDynamicallyTrackedParamsWithDevWarningsImpl(
underlyingParams,
hasFallbackParams,
store
)
CachedParams.set(underlyingParams, cachedParams)
}
return cachedParams return cachedParams
} }
}
function makeDynamicallyTrackedParamsWithDevWarningsImpl(
underlyingParams: Params,
hasFallbackParams: boolean,
store: WorkStore
): Promise<Params> {
// We don't use makeResolvedReactPromise here because params // We don't use makeResolvedReactPromise here because params
// supports copying with spread and we don't want to unnecessarily // supports copying with spread and we don't want to unnecessarily
// instrument the promise with spreadable properties of ReactPromise. // instrument the promise with spreadable properties of ReactPromise.
...@@ -472,7 +498,7 @@ function makeDynamicallyTrackedParamsWithDevWarnings( ...@@ -472,7 +498,7 @@ function makeDynamicallyTrackedParamsWithDevWarnings(
} }
}) })
const proxiedPromise = new Proxy(promise, { return new Proxy(promise, {
get(target, prop, receiver) { get(target, prop, receiver) {
if (typeof prop === 'string') { if (typeof prop === 'string') {
if ( if (
...@@ -497,9 +523,6 @@ function makeDynamicallyTrackedParamsWithDevWarnings( ...@@ -497,9 +523,6 @@ function makeDynamicallyTrackedParamsWithDevWarnings(
return Reflect.ownKeys(target) return Reflect.ownKeys(target)
}, },
}) })
CachedParams.set(underlyingParams, proxiedPromise)
return proxiedPromise
} }
const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev( const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev(
......
...@@ -358,6 +358,11 @@ export function makeErroringSearchParamsForUseCache( ...@@ -358,6 +358,11 @@ export function makeErroringSearchParamsForUseCache(
function makeUntrackedSearchParams( function makeUntrackedSearchParams(
underlyingSearchParams: SearchParams underlyingSearchParams: SearchParams
): Promise<SearchParams> { ): Promise<SearchParams> {
// If CC is enabled, don't cache the promise.
if (process.env.__NEXT_CACHE_COMPONENTS) {
return Promise.resolve(underlyingSearchParams)
}
const cachedSearchParams = CachedSearchParams.get(underlyingSearchParams) const cachedSearchParams = CachedSearchParams.get(underlyingSearchParams)
if (cachedSearchParams) { if (cachedSearchParams) {
return cachedSearchParams return cachedSearchParams
...@@ -373,11 +378,29 @@ function makeUntrackedSearchParamsWithDevWarnings( ...@@ -373,11 +378,29 @@ function makeUntrackedSearchParamsWithDevWarnings(
underlyingSearchParams: SearchParams, underlyingSearchParams: SearchParams,
store: WorkStore store: WorkStore
): Promise<SearchParams> { ): Promise<SearchParams> {
const cachedSearchParams = CachedSearchParams.get(underlyingSearchParams) // If CC is enabled, don't cache the promise.
if (cachedSearchParams) { if (process.env.__NEXT_CACHE_COMPONENTS) {
return makeUntrackedSearchParamsWithDevWarningsImpl(
underlyingSearchParams,
store
)
} else {
let cachedSearchParams = CachedSearchParams.get(underlyingSearchParams)
if (!cachedSearchParams) {
cachedSearchParams = makeUntrackedSearchParamsWithDevWarningsImpl(
underlyingSearchParams,
store
)
CachedSearchParams.set(underlyingSearchParams, cachedSearchParams)
}
return cachedSearchParams return cachedSearchParams
} }
}
function makeUntrackedSearchParamsWithDevWarningsImpl(
underlyingSearchParams: SearchParams,
store: WorkStore
): Promise<SearchParams> {
// Track which properties we should warn for. // Track which properties we should warn for.
const proxiedProperties = new Set<string>() const proxiedProperties = new Set<string>()
...@@ -446,7 +469,7 @@ function makeUntrackedSearchParamsWithDevWarnings( ...@@ -446,7 +469,7 @@ function makeUntrackedSearchParamsWithDevWarnings(
} }
}) })
const proxiedPromise = new Proxy(promise, { return new Proxy(promise, {
get(target, prop, receiver) { get(target, prop, receiver) {
if (prop === 'then' && store.dynamicShouldError) { if (prop === 'then' && store.dynamicShouldError) {
const expression = '`searchParams.then`' const expression = '`searchParams.then`'
...@@ -499,9 +522,6 @@ function makeUntrackedSearchParamsWithDevWarnings( ...@@ -499,9 +522,6 @@ function makeUntrackedSearchParamsWithDevWarnings(
return Reflect.ownKeys(target) return Reflect.ownKeys(target)
}, },
}) })
CachedSearchParams.set(underlyingSearchParams, proxiedPromise)
return proxiedPromise
} }
const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev( const warnForSyncAccess = createDedupedByCallsiteServerErrorLoggerDev(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment