Unverified Commit 85b809ca authored by Josh Story's avatar Josh Story Committed by GitHub

Fix dynamic tracking in dev (#71867)

The second render should not use the first render's abort signal to
determine trackable nature of observed errors
parent 29038fc5
...@@ -2055,27 +2055,6 @@ async function spawnDynamicValidationInDev( ...@@ -2055,27 +2055,6 @@ async function spawnDynamicValidationInDev(
let clientDynamicTracking = createDynamicTrackingState(false) let clientDynamicTracking = createDynamicTrackingState(false)
let dynamicValidation = createDynamicValidationState() let dynamicValidation = createDynamicValidationState()
function SSROnError(err: unknown, errorInfo?: ErrorInfo) {
if (
isPrerenderInterruptedError(err) ||
firstAttemptServerController.signal.aborted
) {
const componentStack: string | undefined = (errorInfo as any)
.componentStack
if (typeof componentStack === 'string' && err instanceof Error) {
trackAllowedDynamicAccess(
route,
componentStack,
dynamicValidation,
serverDynamicTracking,
clientDynamicTracking
)
}
return undefined
}
return undefined
}
const firstAttemptClientController = new AbortController() const firstAttemptClientController = new AbortController()
const firstAttemptClientPrerenderStore: PrerenderStore = { const firstAttemptClientPrerenderStore: PrerenderStore = {
type: 'prerender', type: 'prerender',
...@@ -2116,7 +2095,27 @@ async function spawnDynamicValidationInDev( ...@@ -2116,7 +2095,27 @@ async function spawnDynamicValidationInDev(
/>, />,
{ {
signal: firstAttemptClientController.signal, signal: firstAttemptClientController.signal,
onError: SSROnError, onError: (err: unknown, errorInfo: ErrorInfo) => {
if (
isPrerenderInterruptedError(err) ||
firstAttemptServerController.signal.aborted
) {
const componentStack: string | undefined = (errorInfo as any)
.componentStack
if (
typeof componentStack === 'string' &&
err instanceof Error
) {
trackAllowedDynamicAccess(
route,
componentStack,
dynamicValidation,
serverDynamicTracking,
clientDynamicTracking
)
}
}
},
} }
) )
.catch(() => {}) .catch(() => {})
...@@ -2185,7 +2184,28 @@ async function spawnDynamicValidationInDev( ...@@ -2185,7 +2184,28 @@ async function spawnDynamicValidationInDev(
/>, />,
{ {
signal: secondAttemptClientController.signal, signal: secondAttemptClientController.signal,
onError: SSROnError, onError: (err: unknown, errorInfo: ErrorInfo) => {
if (
isPrerenderInterruptedError(err) ||
secondAttemptClientController.signal.aborted
) {
const componentStack: string | undefined = (
errorInfo as any
).componentStack
if (
typeof componentStack === 'string' &&
err instanceof Error
) {
trackAllowedDynamicAccess(
route,
componentStack,
dynamicValidation,
serverDynamicTracking,
clientDynamicTracking
)
}
}
},
} }
) )
.catch(() => {}) .catch(() => {})
......
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