diff --git a/package.json b/package.json index 1da7aefba36ad..5f6e4ae69bf7f 100644 --- a/package.json +++ b/package.json @@ -227,16 +227,16 @@ "pretty-ms": "7.0.0", "random-seed": "0.3.0", "react": "19.0.0", - "react-builtin": "npm:react@19.2.0-canary-197d6a04-20250424", + "react-builtin": "npm:react@19.2.0-canary-c129c242-20250505", "react-dom": "19.0.0", - "react-dom-builtin": "npm:react-dom@19.2.0-canary-197d6a04-20250424", - "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-197d6a04-20250424", - "react-experimental-builtin": "npm:react@0.0.0-experimental-197d6a04-20250424", - "react-is-builtin": "npm:react-is@19.2.0-canary-197d6a04-20250424", - "react-server-dom-turbopack": "19.2.0-canary-197d6a04-20250424", - "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-197d6a04-20250424", - "react-server-dom-webpack": "19.2.0-canary-197d6a04-20250424", - "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-197d6a04-20250424", + "react-dom-builtin": "npm:react-dom@19.2.0-canary-c129c242-20250505", + "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-c129c242-20250505", + "react-experimental-builtin": "npm:react@0.0.0-experimental-c129c242-20250505", + "react-is-builtin": "npm:react-is@19.2.0-canary-c129c242-20250505", + "react-server-dom-turbopack": "19.2.0-canary-c129c242-20250505", + "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-c129c242-20250505", + "react-server-dom-webpack": "19.2.0-canary-c129c242-20250505", + "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-c129c242-20250505", "react-ssr-prepass": "1.0.8", "react-virtualized": "9.22.3", "relay-compiler": "13.0.2", @@ -246,8 +246,8 @@ "resolve-from": "5.0.0", "sass": "1.54.0", "satori": "0.12.2", - "scheduler-builtin": "npm:scheduler@0.27.0-canary-197d6a04-20250424", - "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-197d6a04-20250424", + "scheduler-builtin": "npm:scheduler@0.27.0-canary-c129c242-20250505", + "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-c129c242-20250505", "seedrandom": "3.0.5", "semver": "7.3.7", "shell-quote": "1.7.3", @@ -290,10 +290,10 @@ "@types/react-dom": "19.1.2", "@types/retry": "0.12.0", "jest-snapshot": "30.0.0-alpha.6", - "react": "19.2.0-canary-197d6a04-20250424", - "react-dom": "19.2.0-canary-197d6a04-20250424", - "react-is": "19.2.0-canary-197d6a04-20250424", - "scheduler": "0.27.0-canary-197d6a04-20250424" + "react": "19.2.0-canary-c129c242-20250505", + "react-dom": "19.2.0-canary-c129c242-20250505", + "react-is": "19.2.0-canary-c129c242-20250505", + "scheduler": "0.27.0-canary-c129c242-20250505" }, "patchedDependencies": { "webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch", diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js index a45e90a546dcd..67aed03e2add1 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js @@ -4734,7 +4734,7 @@ : eventClass; } function setCurrentTrackFromLanes(lanes) { - reusableLaneDevToolDetails.track = + currentTrack = lanes & 127 ? "Blocking" : lanes & 4194176 @@ -4747,10 +4747,26 @@ } function logComponentTrigger(fiber, startTime, endTime, trigger) { supportsUserTiming && - ((reusableComponentDevToolDetails.color = "warning"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(trigger, reusableComponentOptions)); + ((fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + trigger, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "warning" + ) + ) + : console.timeStamp( + trigger, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "warning" + )); } function logComponentReappeared(fiber, startTime, endTime) { logComponentTrigger(fiber, startTime, endTime, "Reconnect"); @@ -4760,9 +4776,9 @@ if (null !== name && supportsUserTiming) { var selfTime = fiber.actualDuration; if (null === fiber.alternate || fiber.alternate.child !== fiber.child) - for (fiber = fiber.child; null !== fiber; fiber = fiber.sibling) - selfTime -= fiber.actualDuration; - reusableComponentDevToolDetails.color = + for (var child = fiber.child; null !== child; child = child.sibling) + selfTime -= child.actualDuration; + wasHydrated = 0.5 > selfTime ? wasHydrated ? "tertiary-light" @@ -4776,80 +4792,140 @@ ? "tertiary-dark" : "primary-dark" : "error"; - reusableComponentOptions.start = startTime; - reusableComponentOptions.end = endTime; - performance.measure(name, reusableComponentOptions); + (fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + wasHydrated + ) + ) + : console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + wasHydrated + ); } } function logComponentErrored(fiber, startTime, endTime, errors) { if (supportsUserTiming) { var name = getComponentNameFromFiber(fiber); - if (null !== name) { - for (var properties = [], i = 0; i < errors.length; i++) { - var error = errors[i].value; - properties.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure(name, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: COMPONENTS_TRACK, - tooltipText: - 13 === fiber.tag - ? "Hydration failed" - : "Error boundary caught an error", - properties: properties - } + if (null !== name) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + for ( + var debugTask = null, properties = [], i = 0; + i < errors.length; + i++ + ) { + var capturedValue = errors[i]; + null == debugTask && + null !== capturedValue.source && + (debugTask = capturedValue.source._debugTask); + capturedValue = capturedValue.value; + properties.push([ + "Error", + "object" === typeof capturedValue && + null !== capturedValue && + "string" === typeof capturedValue.message + ? String(capturedValue.message) + : String(capturedValue) + ]); } - }); - } + null == debugTask && (debugTask = fiber._debugTask); + fiber = { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: COMPONENTS_TRACK, + tooltipText: + 13 === fiber.tag + ? "Hydration failed" + : "Error boundary caught an error", + properties: properties + } + } + }; + debugTask + ? debugTask.run( + performance.measure.bind(performance, name, fiber) + ) + : performance.measure(name, fiber); + } else + console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "error" + ); } } function logComponentEffect(fiber, startTime, endTime, selfTime, errors) { if (null !== errors) { - if ( - supportsUserTiming && - ((selfTime = getComponentNameFromFiber(fiber)), null !== selfTime) - ) { - fiber = []; - for (var i = 0; i < errors.length; i++) { - var error = errors[i].value; - fiber.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure(selfTime, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: COMPONENTS_TRACK, - tooltipText: "A lifecycle or effect errored", - properties: fiber + if (supportsUserTiming) { + var name = getComponentNameFromFiber(fiber); + if (null !== name) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + selfTime = []; + for (var i = 0; i < errors.length; i++) { + var error = errors[i].value; + selfTime.push([ + "Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - } - }); + startTime = { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: COMPONENTS_TRACK, + tooltipText: "A lifecycle or effect errored", + properties: selfTime + } + } + }; + (fiber = fiber._debugTask) + ? fiber.run( + performance.measure.bind(performance, name, startTime) + ) + : performance.measure(name, startTime); + } else + console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "error" + ); } } else - (errors = getComponentNameFromFiber(fiber)), - null !== errors && + (name = getComponentNameFromFiber(fiber)), + null !== name && supportsUserTiming && - ((reusableComponentDevToolDetails.color = + ((errors = 1 > selfTime ? "secondary-light" : 100 > selfTime @@ -4857,40 +4933,48 @@ : 500 > selfTime ? "secondary-dark" : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(errors, reusableComponentOptions)); - } - function logRenderPhase(startTime, endTime, lanes) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( - (lanes & 536870912) === lanes - ? "Prepared" - : (lanes & 201326741) === lanes - ? "Hydrated" - : "Render", - reusableLaneOptions - )); + (fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + errors + ) + ) + : console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + errors + )); } function logSuspendedRenderPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Prewarm", reusableLaneOptions)); + console.timeStamp( + "Prewarm", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logSuspendedWithDelayPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended", reusableLaneOptions)); + console.timeStamp( + "Suspended", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logRecoveredRenderPhase( startTime, @@ -4899,86 +4983,100 @@ recoverableErrors, hydrationFailed ) { - if (supportsUserTiming) { - lanes = []; - for (var i = 0; i < recoverableErrors.length; i++) { - var error = recoverableErrors[i].value; - lanes.push([ - "Recoverable Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure("Recovered", { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "primary-dark", - track: reusableLaneDevToolDetails.track, - trackGroup: LANES_TRACK_GROUP, - tooltipText: hydrationFailed - ? "Hydration Failed" - : "Recovered after Error", - properties: lanes - } + if (supportsUserTiming) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + lanes = []; + for (var i = 0; i < recoverableErrors.length; i++) { + var error = recoverableErrors[i].value; + lanes.push([ + "Recoverable Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - }); - } + performance.measure("Recovered", { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "primary-dark", + track: currentTrack, + trackGroup: LANES_TRACK_GROUP, + tooltipText: hydrationFailed + ? "Hydration Failed" + : "Recovered after Error", + properties: lanes + } + } + }); + } else + console.timeStamp( + "Recovered", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function logErroredRenderPhase(startTime, endTime) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Errored", reusableLaneOptions)); - } - function logSuspenseThrottlePhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Throttled", reusableLaneOptions)); - } - function logSuspendedCommitPhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended on CSS or Images", reusableLaneOptions)); + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function logCommitErrored(startTime, endTime, errors, passive) { - if (supportsUserTiming) { - for (var properties = [], i = 0; i < errors.length; i++) { - var error = errors[i].value; - properties.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure("Errored", { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: reusableLaneDevToolDetails.track, - trackGroup: LANES_TRACK_GROUP, - tooltipText: passive - ? "Remaining Effects Errored" - : "Commit Errored", - properties: properties - } + if (supportsUserTiming) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + for (var properties = [], i = 0; i < errors.length; i++) { + var error = errors[i].value; + properties.push([ + "Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - }); - } + performance.measure("Errored", { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: currentTrack, + trackGroup: LANES_TRACK_GROUP, + tooltipText: passive + ? "Remaining Effects Errored" + : "Commit Errored", + properties: properties + } + } + }); + } else + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function resetContextDependencies() { lastContextDependency = currentlyRenderingFiber$1 = null; @@ -5229,36 +5327,36 @@ root.transitionTypes = null; return claimed; } - function startUpdateTimerByLane(lane) { + function startUpdateTimerByLane(lane, method) { var JSCompiler_temp; (JSCompiler_temp = 0 !== (lane & 3)) || (JSCompiler_temp = 0 !== (lane & 60)); if (JSCompiler_temp) 0 > blockingUpdateTime && ((blockingUpdateTime = now()), + (blockingUpdateTask = createTask(method)), (executionContext & (RenderContext | CommitContext)) !== NoContext && (blockingSpawnedUpdate = !0), (lane = resolveEventTimeStamp()), - (JSCompiler_temp = resolveEventType()), - lane !== blockingEventTime || JSCompiler_temp !== blockingEventType + (method = resolveEventType()), + lane !== blockingEventTime || method !== blockingEventType ? (blockingEventIsRepeat = !1) - : null !== JSCompiler_temp && (blockingSpawnedUpdate = !0), + : null !== method && (blockingSpawnedUpdate = !0), (blockingEventTime = lane), - (blockingEventType = JSCompiler_temp)); + (blockingEventType = method)); else if ( 0 !== (lane & 4194048) && 0 > transitionUpdateTime && - ((transitionUpdateTime = now()), 0 > transitionStartTime) + ((transitionUpdateTime = now()), + (transitionUpdateTask = createTask(method)), + 0 > transitionStartTime) ) { lane = resolveEventTimeStamp(); - JSCompiler_temp = resolveEventType(); - if ( - lane !== transitionEventTime || - JSCompiler_temp !== transitionEventType - ) + method = resolveEventType(); + if (lane !== transitionEventTime || method !== transitionEventType) transitionEventIsRepeat = !1; transitionEventTime = lane; - transitionEventType = JSCompiler_temp; + transitionEventType = method; } } function pushNestedEffectDurations() { @@ -7089,7 +7187,7 @@ null !== state && ((state = state.dehydrated), null === state || - state.data === SUSPENSE_PENDING_START_DATA || + isSuspenseInstancePending(state) || isSuspenseInstanceFallback(state)) ) return node; @@ -7839,7 +7937,9 @@ } function subscribeToStore(fiber, inst, subscribe) { return subscribe(function () { - checkIfSnapshotChanged(inst) && forceStoreRerender(fiber); + checkIfSnapshotChanged(inst) && + (startUpdateTimerByLane(2, "updateSyncExternalStore()"), + forceStoreRerender(fiber)); }); } function checkIfSnapshotChanged(inst) { @@ -8595,10 +8695,12 @@ throw Error( "Cannot requestFormReset() inside a startGestureTransition. There should be no side-effects associated with starting a Gesture until its Action is invoked. Move side-effects to the Action instead." ); - transition = ensureFormComponentIsStateful(formFiber).next.queue; + transition = ensureFormComponentIsStateful(formFiber); + null === transition.next && + (transition = formFiber.alternate.memoizedState); dispatchSetStateInternal( formFiber, - transition, + transition.next.queue, {}, requestUpdateLane(formFiber) ); @@ -8668,7 +8770,7 @@ fiber = createUpdate(lane); var root = enqueueUpdate(provider, fiber, lane); null !== root && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "refresh()"), scheduleUpdateOnFiber(root, provider, lane), entangleTransitions(root, provider, lane)); provider = createCache(); @@ -8702,7 +8804,7 @@ ? enqueueRenderPhaseUpdate(queue, update) : ((update = enqueueConcurrentHookUpdate(fiber, queue, update, args)), null !== update && - (startUpdateTimerByLane(args), + (startUpdateTimerByLane(args, "dispatch()"), scheduleUpdateOnFiber(update, fiber, args), entangleTransitionUpdate(update, queue, args))); } @@ -8714,7 +8816,7 @@ ); args = requestUpdateLane(fiber); dispatchSetStateInternal(fiber, queue, action, args) && - startUpdateTimerByLane(args); + startUpdateTimerByLane(args, "setState()"); } function dispatchSetStateInternal(fiber, queue, action, lane) { var update = { @@ -8797,7 +8899,7 @@ lane )), null !== throwIfDuringRender && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "setOptimistic()"), scheduleUpdateOnFiber(throwIfDuringRender, fiber, lane), null !== transition && ((transition = transition.gesture), null !== transition))) @@ -10308,25 +10410,25 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2983; - var JSCompiler_object_inline_stack_2982 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_3007; + var JSCompiler_object_inline_stack_3006 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_digest_2981 = !1; + var JSCompiler_object_inline_digest_3005 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2983 = didSuspend) || - (JSCompiler_object_inline_componentStack_2983 = + (JSCompiler_object_inline_componentStack_3007 = didSuspend) || + (JSCompiler_object_inline_componentStack_3007 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2983 && - ((JSCompiler_object_inline_digest_2981 = !0), + JSCompiler_object_inline_componentStack_3007 && + ((JSCompiler_object_inline_digest_3005 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2983 = + JSCompiler_object_inline_componentStack_3007 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_digest_2981 + JSCompiler_object_inline_digest_3005 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); (current = nextHydratableInstance) @@ -10339,20 +10441,20 @@ ? renderLanes : null), null !== renderLanes && - ((JSCompiler_object_inline_componentStack_2983 = { + ((JSCompiler_object_inline_componentStack_3007 = { dehydrated: renderLanes, treeContext: getSuspendedTreeContext(), retryLane: 536870912, hydrationErrors: null }), (workInProgress.memoizedState = - JSCompiler_object_inline_componentStack_2983), - (JSCompiler_object_inline_componentStack_2983 = + JSCompiler_object_inline_componentStack_3007), + (JSCompiler_object_inline_componentStack_3007 = createFiberFromDehydratedFragment(renderLanes)), - (JSCompiler_object_inline_componentStack_2983.return = + (JSCompiler_object_inline_componentStack_3007.return = workInProgress), (workInProgress.child = - JSCompiler_object_inline_componentStack_2983), + JSCompiler_object_inline_componentStack_3007), (hydrationParentFiber = workInProgress), (nextHydratableInstance = null))) : (renderLanes = null); @@ -10366,12 +10468,12 @@ : (workInProgress.lanes = 536870912); return null; } - var nextPrimaryChildren = JSCompiler_object_inline_stack_2982.children, - nextFallbackChildren = JSCompiler_object_inline_stack_2982.fallback; - if (JSCompiler_object_inline_digest_2981) + var nextPrimaryChildren = JSCompiler_object_inline_stack_3006.children, + nextFallbackChildren = JSCompiler_object_inline_stack_3006.fallback; + if (JSCompiler_object_inline_digest_3005) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2982 = + (JSCompiler_object_inline_stack_3006 = mountSuspenseFallbackChildren( workInProgress, nextPrimaryChildren, @@ -10383,19 +10485,19 @@ mountSuspenseOffscreenState(renderLanes)), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2982 + JSCompiler_object_inline_stack_3006 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2982.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_3006.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2982 = + (JSCompiler_object_inline_stack_3006 = mountSuspenseFallbackChildren( workInProgress, nextPrimaryChildren, @@ -10407,12 +10509,12 @@ mountSuspenseOffscreenState(renderLanes)), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2982 + JSCompiler_object_inline_stack_3006 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( @@ -10422,8 +10524,8 @@ } var prevState = current.memoizedState; if (null !== prevState) { - var JSCompiler_object_inline_message_2980 = prevState.dehydrated; - if (null !== JSCompiler_object_inline_message_2980) { + var JSCompiler_object_inline_message_3004 = prevState.dehydrated; + if (null !== JSCompiler_object_inline_message_3004) { if (didSuspend) workInProgress.flags & 256 ? (pushPrimaryTreeSuspenseHandler(workInProgress), @@ -10440,13 +10542,13 @@ (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), (nextPrimaryChildren = - JSCompiler_object_inline_stack_2982.fallback), + JSCompiler_object_inline_stack_3006.fallback), (nextFallbackChildren = workInProgress.mode), - (JSCompiler_object_inline_stack_2982 = + (JSCompiler_object_inline_stack_3006 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2982.children + children: JSCompiler_object_inline_stack_3006.children }, nextFallbackChildren )), @@ -10457,24 +10559,24 @@ null )), (nextPrimaryChildren.flags |= 2), - (JSCompiler_object_inline_stack_2982.return = workInProgress), + (JSCompiler_object_inline_stack_3006.return = workInProgress), (nextPrimaryChildren.return = workInProgress), - (JSCompiler_object_inline_stack_2982.sibling = + (JSCompiler_object_inline_stack_3006.sibling = nextPrimaryChildren), - (workInProgress.child = JSCompiler_object_inline_stack_2982), + (workInProgress.child = JSCompiler_object_inline_stack_3006), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2982 = workInProgress.child), - (JSCompiler_object_inline_stack_2982.memoizedState = + (JSCompiler_object_inline_stack_3006 = workInProgress.child), + (JSCompiler_object_inline_stack_3006.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2982.childLanes = + (JSCompiler_object_inline_stack_3006.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), @@ -10482,48 +10584,48 @@ else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), warnIfHydrating(), - isSuspenseInstanceFallback(JSCompiler_object_inline_message_2980)) + isSuspenseInstanceFallback(JSCompiler_object_inline_message_3004)) ) { - JSCompiler_object_inline_componentStack_2983 = - JSCompiler_object_inline_message_2980.nextSibling && - JSCompiler_object_inline_message_2980.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2983) { + JSCompiler_object_inline_componentStack_3007 = + JSCompiler_object_inline_message_3004.nextSibling && + JSCompiler_object_inline_message_3004.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_3007) { nextPrimaryChildren = - JSCompiler_object_inline_componentStack_2983.dgst; - var message = JSCompiler_object_inline_componentStack_2983.msg; + JSCompiler_object_inline_componentStack_3007.dgst; + var message = JSCompiler_object_inline_componentStack_3007.msg; nextFallbackChildren = - JSCompiler_object_inline_componentStack_2983.stck; + JSCompiler_object_inline_componentStack_3007.stck; var componentStack = - JSCompiler_object_inline_componentStack_2983.cstck; + JSCompiler_object_inline_componentStack_3007.cstck; } - JSCompiler_object_inline_message_2980 = message; - JSCompiler_object_inline_digest_2981 = nextPrimaryChildren; - JSCompiler_object_inline_stack_2982 = nextFallbackChildren; - JSCompiler_object_inline_componentStack_2983 = componentStack; - nextPrimaryChildren = JSCompiler_object_inline_digest_2981; - nextFallbackChildren = JSCompiler_object_inline_message_2980; - componentStack = JSCompiler_object_inline_componentStack_2983; + JSCompiler_object_inline_message_3004 = message; + JSCompiler_object_inline_digest_3005 = nextPrimaryChildren; + JSCompiler_object_inline_stack_3006 = nextFallbackChildren; + JSCompiler_object_inline_componentStack_3007 = componentStack; + nextPrimaryChildren = JSCompiler_object_inline_digest_3005; + nextFallbackChildren = JSCompiler_object_inline_message_3004; + componentStack = JSCompiler_object_inline_componentStack_3007; "POSTPONE" !== nextPrimaryChildren && - ((JSCompiler_object_inline_componentStack_2983 = + ((JSCompiler_object_inline_componentStack_3007 = nextFallbackChildren ? Error(nextFallbackChildren) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_componentStack_2983.stack = - JSCompiler_object_inline_stack_2982 || ""), - (JSCompiler_object_inline_componentStack_2983.digest = + (JSCompiler_object_inline_componentStack_3007.stack = + JSCompiler_object_inline_stack_3006 || ""), + (JSCompiler_object_inline_componentStack_3007.digest = nextPrimaryChildren), - (JSCompiler_object_inline_stack_2982 = + (JSCompiler_object_inline_stack_3006 = void 0 === componentStack ? null : componentStack), (nextPrimaryChildren = { - value: JSCompiler_object_inline_componentStack_2983, + value: JSCompiler_object_inline_componentStack_3007, source: null, - stack: JSCompiler_object_inline_stack_2982 + stack: JSCompiler_object_inline_stack_3006 }), - "string" === typeof JSCompiler_object_inline_stack_2982 && + "string" === typeof JSCompiler_object_inline_stack_3006 && CapturedStacks.set( - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, nextPrimaryChildren ), queueHydrationError(nextPrimaryChildren)); @@ -10540,49 +10642,48 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2983 = + (JSCompiler_object_inline_componentStack_3007 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2983) + didReceiveUpdate || JSCompiler_object_inline_componentStack_3007) ) { - JSCompiler_object_inline_componentStack_2983 = workInProgressRoot; + JSCompiler_object_inline_componentStack_3007 = workInProgressRoot; if ( - null !== JSCompiler_object_inline_componentStack_2983 && - ((JSCompiler_object_inline_stack_2982 = getBumpedLaneForHydration( - JSCompiler_object_inline_componentStack_2983, + null !== JSCompiler_object_inline_componentStack_3007 && + ((JSCompiler_object_inline_stack_3006 = getBumpedLaneForHydration( + JSCompiler_object_inline_componentStack_3007, renderLanes )), - 0 !== JSCompiler_object_inline_stack_2982 && - JSCompiler_object_inline_stack_2982 !== prevState.retryLane) + 0 !== JSCompiler_object_inline_stack_3006 && + JSCompiler_object_inline_stack_3006 !== prevState.retryLane) ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2982), + ((prevState.retryLane = JSCompiler_object_inline_stack_3006), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2982 + JSCompiler_object_inline_stack_3006 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, current, - JSCompiler_object_inline_stack_2982 + JSCompiler_object_inline_stack_3006 ), SelectiveHydrationException) ); - JSCompiler_object_inline_message_2980.data === - SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); + isSuspenseInstancePending(JSCompiler_object_inline_message_3004) || + renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, renderLanes ); } else - JSCompiler_object_inline_message_2980.data === - SUSPENSE_PENDING_START_DATA + isSuspenseInstancePending(JSCompiler_object_inline_message_3004) ? ((workInProgress.flags |= 192), (workInProgress.child = current.child), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2980.nextSibling + JSCompiler_object_inline_message_3004.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -10594,31 +10695,31 @@ restoreSuspendedTreeContext(workInProgress, current), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2982.children + JSCompiler_object_inline_stack_3006.children )), (workInProgress.flags |= 4096)); return workInProgress; } } - if (JSCompiler_object_inline_digest_2981) + if (JSCompiler_object_inline_digest_3005) return ( reuseSuspenseHandlerOnStack(workInProgress), - (nextPrimaryChildren = JSCompiler_object_inline_stack_2982.fallback), + (nextPrimaryChildren = JSCompiler_object_inline_stack_3006.fallback), (nextFallbackChildren = workInProgress.mode), (componentStack = current.child), - (JSCompiler_object_inline_message_2980 = componentStack.sibling), - (JSCompiler_object_inline_stack_2982 = createWorkInProgress( + (JSCompiler_object_inline_message_3004 = componentStack.sibling), + (JSCompiler_object_inline_stack_3006 = createWorkInProgress( componentStack, { mode: "hidden", - children: JSCompiler_object_inline_stack_2982.children + children: JSCompiler_object_inline_stack_3006.children } )), - (JSCompiler_object_inline_stack_2982.subtreeFlags = + (JSCompiler_object_inline_stack_3006.subtreeFlags = componentStack.subtreeFlags & 65011712), - null !== JSCompiler_object_inline_message_2980 + null !== JSCompiler_object_inline_message_3004 ? (nextPrimaryChildren = createWorkInProgress( - JSCompiler_object_inline_message_2980, + JSCompiler_object_inline_message_3004, nextPrimaryChildren )) : ((nextPrimaryChildren = createFiberFromFragment( @@ -10629,24 +10730,24 @@ )), (nextPrimaryChildren.flags |= 2)), (nextPrimaryChildren.return = workInProgress), - (JSCompiler_object_inline_stack_2982.return = workInProgress), - (JSCompiler_object_inline_stack_2982.sibling = nextPrimaryChildren), - (workInProgress.child = JSCompiler_object_inline_stack_2982), - (JSCompiler_object_inline_stack_2982 = nextPrimaryChildren), + (JSCompiler_object_inline_stack_3006.return = workInProgress), + (JSCompiler_object_inline_stack_3006.sibling = nextPrimaryChildren), + (workInProgress.child = JSCompiler_object_inline_stack_3006), + (JSCompiler_object_inline_stack_3006 = nextPrimaryChildren), (nextPrimaryChildren = workInProgress.child), (nextFallbackChildren = current.child.memoizedState), null === nextFallbackChildren ? (nextFallbackChildren = mountSuspenseOffscreenState(renderLanes)) : ((componentStack = nextFallbackChildren.cachePool), null !== componentStack - ? ((JSCompiler_object_inline_message_2980 = + ? ((JSCompiler_object_inline_message_3004 = CacheContext._currentValue), (componentStack = componentStack.parent !== - JSCompiler_object_inline_message_2980 + JSCompiler_object_inline_message_3004 ? { - parent: JSCompiler_object_inline_message_2980, - pool: JSCompiler_object_inline_message_2980 + parent: JSCompiler_object_inline_message_3004, + pool: JSCompiler_object_inline_message_3004 } : componentStack)) : (componentStack = getSuspendedCache()), @@ -10657,28 +10758,28 @@ (nextPrimaryChildren.memoizedState = nextFallbackChildren), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2983, + JSCompiler_object_inline_componentStack_3007, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2982 + JSCompiler_object_inline_stack_3006 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2982.children + children: JSCompiler_object_inline_stack_3006.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2983 = + ((JSCompiler_object_inline_componentStack_3007 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2983 + null === JSCompiler_object_inline_componentStack_3007 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2983.push(current)); + : JSCompiler_object_inline_componentStack_3007.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -17484,81 +17585,118 @@ if ((executionContext & (RenderContext | CommitContext)) !== NoContext) throw Error("Should not already be working."); if (0 !== workInProgressRootRenderLanes && null !== workInProgress) { - var yieldEndTime = now$1(); + var yieldedFiber = workInProgress, + yieldEndTime = now$1(); switch (yieldReason) { case SuspendedOnImmediate: case SuspendedOnData: var startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Suspended", reusableComponentOptions)); + ((yieldedFiber = yieldedFiber._debugTask) + ? yieldedFiber.run( + console.timeStamp.bind( + console, + "Suspended", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + ) + ) + : console.timeStamp( + "Suspended", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + )); break; case SuspendedOnAction: startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Action", reusableComponentOptions)); + ((yieldedFiber = yieldedFiber._debugTask) + ? yieldedFiber.run( + console.timeStamp.bind( + console, + "Action", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + ) + ) + : console.timeStamp( + "Action", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + )); break; default: - if (((startTime = yieldStartTime), supportsUserTiming)) { - var yieldDuration = yieldEndTime - startTime; - 3 > yieldDuration || - ((reusableComponentDevToolDetails.color = - 5 > yieldDuration + supportsUserTiming && + ((yieldedFiber = yieldEndTime - yieldStartTime), + 3 > yieldedFiber || + console.timeStamp( + "Blocked", + yieldStartTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + 5 > yieldedFiber ? "primary-light" - : 10 > yieldDuration + : 10 > yieldedFiber ? "primary" - : 100 > yieldDuration + : 100 > yieldedFiber ? "primary-dark" - : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Blocked", reusableComponentOptions)); - } + : "error" + )); } } - yieldDuration = (forceSync = + startTime = (yieldEndTime = (!forceSync && 0 === (lanes & 124) && 0 === (lanes & root.expiredLanes)) || checkIfRootIsPrerendering(root, lanes)) ? renderRootConcurrent(root, lanes) : renderRootSync(root, lanes, !0); - var renderWasConcurrent = forceSync; + var renderWasConcurrent = yieldEndTime; do { - if (yieldDuration === RootInProgress) { + if (startTime === RootInProgress) { workInProgressRootIsPrerendering && - !forceSync && + !yieldEndTime && markRootSuspended(root, lanes, 0, !1); lanes = workInProgressSuspendedReason; yieldStartTime = now(); yieldReason = lanes; break; } else { - startTime = now$1(); - yieldEndTime = root.current.alternate; + yieldedFiber = now$1(); + forceSync = root.current.alternate; if ( renderWasConcurrent && - !isRenderConsistentWithExternalStores(yieldEndTime) + !isRenderConsistentWithExternalStores(forceSync) ) { setCurrentTrackFromLanes(lanes); - yieldEndTime = renderStartTime; - yieldDuration = startTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = yieldEndTime), - (reusableLaneOptions.end = yieldDuration), - performance.measure("Teared Render", reusableLaneOptions)); - finalizeRender(lanes, startTime); - yieldDuration = renderRootSync(root, lanes, !1); + console.timeStamp( + "Teared Render", + renderStartTime, + yieldedFiber, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); + finalizeRender(lanes, yieldedFiber); + startTime = renderRootSync(root, lanes, !1); renderWasConcurrent = !1; continue; } - if (yieldDuration === RootErrored) { + if (startTime === RootErrored) { renderWasConcurrent = lanes; if (root.errorRecoveryDisabledLanes & renderWasConcurrent) var errorRetryLanes = 0; @@ -17572,19 +17710,20 @@ : 0); if (0 !== errorRetryLanes) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldedFiber); + finalizeRender(lanes, yieldedFiber); lanes = errorRetryLanes; a: { - startTime = root; - yieldDuration = renderWasConcurrent; + yieldedFiber = root; + startTime = renderWasConcurrent; renderWasConcurrent = workInProgressRootConcurrentErrors; var wasRootDehydrated = - startTime.current.memoizedState.isDehydrated; + yieldedFiber.current.memoizedState.isDehydrated; wasRootDehydrated && - (prepareFreshStack(startTime, errorRetryLanes).flags |= 256); + (prepareFreshStack(yieldedFiber, errorRetryLanes).flags |= + 256); errorRetryLanes = renderRootSync( - startTime, + yieldedFiber, errorRetryLanes, !1 ); @@ -17593,39 +17732,39 @@ workInProgressRootDidAttachPingListener && !wasRootDehydrated ) { - startTime.errorRecoveryDisabledLanes |= yieldDuration; - workInProgressRootInterleavedUpdatedLanes |= yieldDuration; - yieldDuration = RootSuspendedWithDelay; + yieldedFiber.errorRecoveryDisabledLanes |= startTime; + workInProgressRootInterleavedUpdatedLanes |= startTime; + startTime = RootSuspendedWithDelay; break a; } - startTime = workInProgressRootRecoverableErrors; + yieldedFiber = workInProgressRootRecoverableErrors; workInProgressRootRecoverableErrors = renderWasConcurrent; - null !== startTime && + null !== yieldedFiber && (null === workInProgressRootRecoverableErrors - ? (workInProgressRootRecoverableErrors = startTime) + ? (workInProgressRootRecoverableErrors = yieldedFiber) : workInProgressRootRecoverableErrors.push.apply( workInProgressRootRecoverableErrors, - startTime + yieldedFiber )); } - yieldDuration = errorRetryLanes; + startTime = errorRetryLanes; } renderWasConcurrent = !1; - if (yieldDuration !== RootErrored) continue; - else startTime = now$1(); + if (startTime !== RootErrored) continue; + else yieldedFiber = now$1(); } } - if (yieldDuration === RootFatalErrored) { + if (startTime === RootFatalErrored) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldedFiber); + finalizeRender(lanes, yieldedFiber); prepareFreshStack(root, 0); markRootSuspended(root, lanes, 0, !0); break; } a: { - forceSync = root; - switch (yieldDuration) { + yieldEndTime = root; + switch (startTime) { case RootInProgress: case RootFatalErrored: throw Error("Root did not complete. This is a bug in React."); @@ -17633,15 +17772,15 @@ if ((lanes & 4194048) !== lanes) break; case RootSuspendedAtTheShell: setCurrentTrackFromLanes(lanes); - logSuspendedRenderPhase(renderStartTime, startTime, lanes); - finalizeRender(lanes, startTime); - yieldEndTime = lanes; - 0 !== (yieldEndTime & 3) || 0 !== (yieldEndTime & 124) - ? (blockingSuspendedTime = startTime) - : 0 !== (yieldEndTime & 4194048) && - (transitionSuspendedTime = startTime); + logSuspendedRenderPhase(renderStartTime, yieldedFiber, lanes); + finalizeRender(lanes, yieldedFiber); + forceSync = lanes; + 0 !== (forceSync & 3) || 0 !== (forceSync & 124) + ? (blockingSuspendedTime = yieldedFiber) + : 0 !== (forceSync & 4194048) && + (transitionSuspendedTime = yieldedFiber); markRootSuspended( - forceSync, + yieldEndTime, lanes, workInProgressDeferredLane, !workInProgressRootDidSkipSuspendedSiblings @@ -17658,8 +17797,8 @@ } if (null !== ReactSharedInternals.actQueue) commitRoot( - forceSync, yieldEndTime, + forceSync, lanes, workInProgressRootRecoverableErrors, workInProgressTransitions, @@ -17667,10 +17806,10 @@ workInProgressDeferredLane, workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, - yieldDuration, + startTime, IMMEDIATE_COMMIT, renderStartTime, - startTime + yieldedFiber ); else { if ( @@ -17682,17 +17821,17 @@ 10 < renderWasConcurrent) ) { markRootSuspended( - forceSync, + yieldEndTime, lanes, workInProgressDeferredLane, !workInProgressRootDidSkipSuspendedSiblings ); - if (0 !== getNextLanes(forceSync, 0, !0)) break a; - forceSync.timeoutHandle = scheduleTimeout( + if (0 !== getNextLanes(yieldEndTime, 0, !0)) break a; + yieldEndTime.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, - forceSync, yieldEndTime, + forceSync, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -17701,18 +17840,18 @@ workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + startTime, THROTTLED_COMMIT, renderStartTime, - startTime + yieldedFiber ), renderWasConcurrent ); break a; } commitRootWhenReady( - forceSync, yieldEndTime, + forceSync, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -17721,10 +17860,10 @@ workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + startTime, IMMEDIATE_COMMIT, renderStartTime, - startTime + yieldedFiber ); } } @@ -17911,10 +18050,38 @@ } function prepareFreshStack(root, lanes) { supportsUserTiming && - (performance.mark("Blocking Track", blockingLaneMarker), - performance.mark("Transition Track", transitionLaneMarker), - performance.mark("Suspense Track", suspenseLaneMarker), - performance.mark("Idle Track", idleLaneMarker)); + (console.timeStamp( + "Blocking Track", + 0.003, + 0.003, + "Blocking", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Transition Track", + 0.003, + 0.003, + "Transition", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Suspense Track", + 0.003, + 0.003, + "Suspense", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Idle Track", + 0.003, + 0.003, + "Idle", + LANES_TRACK_GROUP, + "primary-light" + )); var previousRenderStartTime = renderStartTime; renderStartTime = now(); if (0 !== workInProgressRootRenderLanes && 0 < previousRenderStartTime) { @@ -17931,18 +18098,18 @@ else { var endTime = renderStartTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( (lanes & 536870912) === lanes ? "Prewarm" : (lanes & 201326741) === lanes ? "Interrupted Hydration" : "Interrupted Render", - reusableLaneOptions - )); + previousRenderStartTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } finalizeRender(workInProgressRootRenderLanes, renderStartTime); } @@ -17951,7 +18118,7 @@ 0 <= blockingUpdateTime && blockingUpdateTime < blockingClampTime ? blockingClampTime : blockingUpdateTime; - endTime = + var clampedEventTime = 0 <= blockingEventTime && blockingEventTime < blockingClampTime ? blockingClampTime : blockingEventTime; @@ -17959,120 +18126,196 @@ (setCurrentTrackFromLanes(lanes), logSuspendedWithDelayPhase( blockingSuspendedTime, - 0 <= endTime - ? endTime + 0 <= clampedEventTime + ? clampedEventTime : 0 <= previousRenderStartTime ? previousRenderStartTime : renderStartTime, lanes )); var eventType = blockingEventType, - eventIsRepeat = blockingEventIsRepeat, - isSpawnedUpdate = blockingSpawnedUpdate, - renderStartTime$jscomp$0 = renderStartTime; - supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Blocking"), - 0 < endTime && - null !== eventType && - ((reusableLaneDevToolDetails.color = eventIsRepeat - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = - 0 < previousRenderStartTime - ? previousRenderStartTime - : renderStartTime$jscomp$0), - performance.measure( - eventIsRepeat ? "" : "Event: " + eventType, - reusableLaneOptions - )), + eventIsRepeat = blockingEventIsRepeat; + endTime = blockingSpawnedUpdate; + var renderStartTime$jscomp$0 = renderStartTime, + debugTask = blockingUpdateTask; + if (supportsUserTiming) { + currentTrack = "Blocking"; + if (0 < clampedEventTime && null !== eventType) { + var color = eventIsRepeat ? "secondary-light" : "warning"; + debugTask + ? debugTask.run( + console.timeStamp.bind( + console, + eventIsRepeat ? "" : "Event: " + eventType, + clampedEventTime, + 0 < previousRenderStartTime + ? previousRenderStartTime + : renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ) + ) + : console.timeStamp( + eventIsRepeat ? "" : "Event: " + eventType, + clampedEventTime, + 0 < previousRenderStartTime + ? previousRenderStartTime + : renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ); + } 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate + ((clampedEventTime = endTime ? "error" : (lanes & 738197653) === lanes ? "tertiary-light" : "primary-light"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( - isSpawnedUpdate - ? "Cascading Update" - : 5 < renderStartTime$jscomp$0 - previousRenderStartTime - ? "Update Blocked" - : "Update", - reusableLaneOptions - ))); - blockingSuspendedTime = blockingUpdateTime = -1.1; + debugTask + ? debugTask.run( + console.timeStamp.bind( + console, + endTime + ? "Cascading Update" + : 5 < renderStartTime$jscomp$0 - previousRenderStartTime + ? "Update Blocked" + : "Update", + previousRenderStartTime, + renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + clampedEventTime + ) + ) + : console.timeStamp( + endTime + ? "Cascading Update" + : 5 < renderStartTime$jscomp$0 - previousRenderStartTime + ? "Update Blocked" + : "Update", + previousRenderStartTime, + renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + clampedEventTime + )); + } + blockingUpdateTime = -1.1; + blockingUpdateTask = null; + blockingSuspendedTime = -1.1; blockingEventIsRepeat = !0; blockingSpawnedUpdate = !1; } - 0 !== (lanes & 4194048) && - ((previousRenderStartTime = + if (0 !== (lanes & 4194048)) { + previousRenderStartTime = 0 <= transitionStartTime && transitionStartTime < transitionClampTime ? transitionClampTime - : transitionStartTime), - (endTime = + : transitionStartTime; + endTime = 0 <= transitionUpdateTime && transitionUpdateTime < transitionClampTime ? transitionClampTime - : transitionUpdateTime), - (eventType = + : transitionUpdateTime; + renderStartTime$jscomp$0 = 0 <= transitionEventTime && transitionEventTime < transitionClampTime ? transitionClampTime - : transitionEventTime), + : transitionEventTime; 0 <= transitionSuspendedTime && (setCurrentTrackFromLanes(lanes), logSuspendedWithDelayPhase( transitionSuspendedTime, - 0 <= eventType - ? eventType + 0 <= renderStartTime$jscomp$0 + ? renderStartTime$jscomp$0 : 0 <= endTime ? endTime : renderStartTime, lanes - )), - (eventIsRepeat = transitionEventType), - (isSpawnedUpdate = transitionEventIsRepeat), - (renderStartTime$jscomp$0 = renderStartTime), - supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Transition"), - 0 < eventType && - null !== eventIsRepeat && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = eventType), - (reusableLaneOptions.end = + )); + debugTask = transitionEventType; + clampedEventTime = transitionEventIsRepeat; + eventType = renderStartTime; + eventIsRepeat = transitionUpdateTask; + if (supportsUserTiming) { + currentTrack = "Transition"; + if (0 < renderStartTime$jscomp$0 && null !== debugTask) { + color = clampedEventTime ? "secondary-light" : "warning"; + var endTime$jscomp$0 = 0 < previousRenderStartTime ? previousRenderStartTime : 0 < endTime ? endTime - : renderStartTime$jscomp$0), - performance.measure( - isSpawnedUpdate ? "" : "Event: " + eventIsRepeat, - reusableLaneOptions - )), + : eventType; + eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + clampedEventTime ? "" : "Event: " + debugTask, + renderStartTime$jscomp$0, + endTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ) + ) + : console.timeStamp( + clampedEventTime ? "" : "Event: " + debugTask, + renderStartTime$jscomp$0, + endTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ); + } 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = - 0 < endTime ? endTime : renderStartTime$jscomp$0), - performance.measure("Action", reusableLaneOptions)), + (eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + "Action", + previousRenderStartTime, + 0 < endTime ? endTime : eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-dark" + ) + ) + : console.timeStamp( + "Action", + previousRenderStartTime, + 0 < endTime ? endTime : eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-dark" + )); 0 < endTime && - ((reusableLaneDevToolDetails.color = "primary-light"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( - 5 < renderStartTime$jscomp$0 - endTime - ? "Update Blocked" - : "Update", - reusableLaneOptions - ))), - (transitionSuspendedTime = - transitionUpdateTime = - transitionStartTime = - -1.1), - (transitionEventIsRepeat = !0)); + (eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + 5 < eventType - endTime ? "Update Blocked" : "Update", + endTime, + eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-light" + ) + ) + : console.timeStamp( + 5 < eventType - endTime ? "Update Blocked" : "Update", + endTime, + eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-light" + )); + } + transitionUpdateTime = transitionStartTime = -1.1; + transitionUpdateTask = null; + transitionSuspendedTime = -1.1; + transitionEventIsRepeat = !0; + } previousRenderStartTime = root.timeoutHandle; previousRenderStartTime !== noTimeout && ((root.timeoutHandle = noTimeout), @@ -18106,10 +18349,10 @@ endTime = root.entangledLanes; if (0 !== endTime) for (root = root.entanglements, endTime &= lanes; 0 < endTime; ) - (eventType = 31 - clz32(endTime)), - (eventIsRepeat = 1 << eventType), - (lanes |= root[eventType]), - (endTime &= ~eventIsRepeat); + (renderStartTime$jscomp$0 = 31 - clz32(endTime)), + (debugTask = 1 << renderStartTime$jscomp$0), + (lanes |= root[renderStartTime$jscomp$0]), + (endTime &= ~debugTask); entangledRenderLanes = lanes; finishQueueingConcurrentUpdates(); root = getCurrentTime(); @@ -18677,10 +18920,18 @@ finishedWork.alternate.memoizedState.isDehydrated && 0 !== (finishedWork.flags & 256) ) - : logRenderPhase( + : supportsUserTiming && + console.timeStamp( + (lanes & 536870912) === lanes + ? "Prepared" + : (lanes & 201326741) === lanes + ? "Hydrated" + : "Render", completedRenderStartTime, completedRenderEndTime, - lanes + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" ); if (null === finishedWork) null !== root.stoppingGestures && stopCompletedGestures(root); @@ -18737,9 +18988,25 @@ commitErrors = null; commitStartTime = now(); suspendedCommitReason === SUSPENDED_COMMIT - ? logSuspendedCommitPhase(completedRenderEndTime, commitStartTime) + ? supportsUserTiming && + console.timeStamp( + "Suspended on CSS or Images", + completedRenderEndTime, + commitStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ) : suspendedCommitReason === THROTTLED_COMMIT && - logSuspenseThrottlePhase(completedRenderEndTime, commitStartTime); + supportsUserTiming && + console.timeStamp( + "Throttled", + completedRenderEndTime, + commitStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ); shouldStartViewTransition = !1; suspendedCommitReason = 0 !== (finishedWork.flags & 13878); if ( @@ -18991,10 +19258,14 @@ !1 ) : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = completedRenderEndTime), - (reusableLaneOptions.end = suspendedCommitReason), - performance.measure("Commit", reusableLaneOptions)); + console.timeStamp( + "Commit", + completedRenderEndTime, + suspendedCommitReason, + currentTrack, + LANES_TRACK_GROUP, + "secondary-dark" + ); completedRenderEndTime = (lanes & 335544064) === lanes ? 10262 : 10256; (completedRenderEndTime = 0 !== finishedWork.actualDuration || @@ -19405,17 +19676,15 @@ var passiveEffectStartTime = 0; commitErrors = null; passiveEffectStartTime = now$1(); - var startTime = commitEndTime, - endTime = passiveEffectStartTime; - wasDelayedCommit = !!wasDelayedCommit; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( wasDelayedCommit ? "Waiting for Paint" : "", - reusableLaneOptions - )); + commitEndTime, + passiveEffectStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ); wasDelayedCommit = executionContext; executionContext |= CommitContext; var finishedWork = priority.current; @@ -19443,10 +19712,14 @@ !0 ) : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = finishedWork$jscomp$0), - (reusableLaneOptions.end = passiveEffectsEndTime), - performance.measure("Remaining Effects", reusableLaneOptions)); + console.timeStamp( + "Remaining Effects", + finishedWork$jscomp$0, + passiveEffectsEndTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-dark" + ); finalizeRender(lanes, passiveEffectsEndTime); flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects @@ -23338,6 +23611,7 @@ } else if ( node === SUSPENSE_START_DATA || node === SUSPENSE_PENDING_START_DATA || + node === SUSPENSE_QUEUED_START_DATA || node === SUSPENSE_FALLBACK_START_DATA || node === ACTIVITY_START_DATA ) @@ -23390,6 +23664,7 @@ else (node !== SUSPENSE_START_DATA && node !== SUSPENSE_PENDING_START_DATA && + node !== SUSPENSE_QUEUED_START_DATA && node !== SUSPENSE_FALLBACK_START_DATA) || suspenseInstance++; node = nextNode; @@ -24170,18 +24445,26 @@ } return instance; } + function isSuspenseInstancePending(instance) { + return ( + instance.data === SUSPENSE_PENDING_START_DATA || + instance.data === SUSPENSE_QUEUED_START_DATA + ); + } function isSuspenseInstanceFallback(instance) { return ( instance.data === SUSPENSE_FALLBACK_START_DATA || (instance.data === SUSPENSE_PENDING_START_DATA && - instance.ownerDocument.readyState === DOCUMENT_READY_STATE_COMPLETE) + instance.ownerDocument.readyState !== DOCUMENT_READY_STATE_LOADING) ); } function registerSuspenseInstanceRetry(instance, callback) { var ownerDocument = instance.ownerDocument; - if ( + if (instance.data === SUSPENSE_QUEUED_START_DATA) + instance._reactRetry = callback; + else if ( instance.data !== SUSPENSE_PENDING_START_DATA || - ownerDocument.readyState === DOCUMENT_READY_STATE_COMPLETE + ownerDocument.readyState !== DOCUMENT_READY_STATE_LOADING ) callback(); else { @@ -24203,6 +24486,7 @@ nodeType === SUSPENSE_START_DATA || nodeType === SUSPENSE_FALLBACK_START_DATA || nodeType === SUSPENSE_PENDING_START_DATA || + nodeType === SUSPENSE_QUEUED_START_DATA || nodeType === ACTIVITY_START_DATA || nodeType === FORM_STATE_IS_MATCHING || nodeType === FORM_STATE_IS_NOT_MATCHING @@ -24267,6 +24551,7 @@ (data !== SUSPENSE_START_DATA && data !== SUSPENSE_FALLBACK_START_DATA && data !== SUSPENSE_PENDING_START_DATA && + data !== SUSPENSE_QUEUED_START_DATA && data !== ACTIVITY_START_DATA) || depth++; } @@ -24283,6 +24568,7 @@ data === SUSPENSE_START_DATA || data === SUSPENSE_FALLBACK_START_DATA || data === SUSPENSE_PENDING_START_DATA || + data === SUSPENSE_QUEUED_START_DATA || data === ACTIVITY_START_DATA ) { if (0 === depth) return targetInstance; @@ -25252,7 +25538,7 @@ (container.callback = callback)); element = enqueueUpdate(rootFiber, container, lane); null !== element && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "root.render()"), scheduleUpdateOnFiber(element, rootFiber, lane), entangleTransitions(element, rootFiber, lane)); } @@ -27222,69 +27508,11 @@ }; } var supportsUserTiming = - "undefined" !== typeof performance && - "function" === typeof performance.measure, + "undefined" !== typeof console && + "function" === typeof console.timeStamp, COMPONENTS_TRACK = "Components \u269b", - reusableComponentDevToolDetails = { - color: "primary", - track: COMPONENTS_TRACK - }, - reusableComponentOptions = { - start: -0, - end: -0, - detail: { devtools: reusableComponentDevToolDetails } - }, LANES_TRACK_GROUP = "Scheduler \u269b", - reusableLaneDevToolDetails = { - color: "primary", - track: "Blocking", - trackGroup: LANES_TRACK_GROUP - }, - reusableLaneOptions = { - start: -0, - end: -0, - detail: { devtools: reusableLaneDevToolDetails } - }, - blockingLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Blocking", - trackGroup: LANES_TRACK_GROUP - } - } - }, - transitionLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Transition", - trackGroup: LANES_TRACK_GROUP - } - } - }, - suspenseLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Suspense", - trackGroup: LANES_TRACK_GROUP - } - } - }, - idleLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Idle", - trackGroup: LANES_TRACK_GROUP - } - } - }, + currentTrack = "Blocking", valueCursor = createCursor(null); var rendererCursorDEV = createCursor(null); var rendererSigil = {}; @@ -27323,6 +27551,11 @@ }, entangledTransitionTypes = null, now = Scheduler.unstable_now, + createTask = console.createTask + ? console.createTask + : function () { + return null; + }, renderStartTime = -0, commitStartTime = -0, commitEndTime = -0, @@ -27335,6 +27568,7 @@ componentEffectErrors = null, blockingClampTime = -0, blockingUpdateTime = -1.1, + blockingUpdateTask = null, blockingEventTime = -1.1, blockingEventType = null, blockingEventIsRepeat = !1, @@ -27343,6 +27577,7 @@ transitionClampTime = -0, transitionStartTime = -1.1, transitionUpdateTime = -1.1, + transitionUpdateTask = null, transitionEventTime = -1.1, transitionEventType = null, transitionEventIsRepeat = !1, @@ -28925,7 +29160,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); payload = enqueueUpdate(inst, update, lane); null !== payload && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.setState()"), scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); }, @@ -28940,7 +29175,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); payload = enqueueUpdate(inst, update, lane); null !== payload && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.replaceState()"), scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); }, @@ -28954,7 +29189,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); callback = enqueueUpdate(inst, update, lane); null !== callback && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.forceUpdate()"), scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); } @@ -29246,13 +29481,14 @@ SUSPENSE_START_DATA = "$", SUSPENSE_END_DATA = "/$", SUSPENSE_PENDING_START_DATA = "$?", + SUSPENSE_QUEUED_START_DATA = "$~", SUSPENSE_FALLBACK_START_DATA = "$!", PREAMBLE_CONTRIBUTION_HTML = "html", PREAMBLE_CONTRIBUTION_BODY = "body", PREAMBLE_CONTRIBUTION_HEAD = "head", FORM_STATE_IS_MATCHING = "F!", FORM_STATE_IS_NOT_MATCHING = "F", - DOCUMENT_READY_STATE_COMPLETE = "complete", + DOCUMENT_READY_STATE_LOADING = "loading", STYLE = "style", HostContextNamespaceNone = 0, HostContextNamespaceSvg = 1, @@ -29871,11 +30107,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.2.0-experimental-197d6a04-20250424" !== isomorphicReactPackageVersion) + if ("19.2.0-experimental-c129c242-20250505" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.2.0-experimental-197d6a04-20250424\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.2.0-experimental-c129c242-20250505\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -29912,10 +30148,10 @@ !(function () { var internals = { bundleType: 1, - version: "19.2.0-experimental-197d6a04-20250424", + version: "19.2.0-experimental-c129c242-20250505", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.2.0-experimental-197d6a04-20250424" + reconcilerVersion: "19.2.0-experimental-c129c242-20250505" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -30057,7 +30293,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.2.0-experimental-197d6a04-20250424"; + exports.version = "19.2.0-experimental-c129c242-20250505"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js index c98371596c7d2..1574d4a1efda5 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js @@ -4524,7 +4524,7 @@ function findFirstSuspended(row) { null !== state && ((state = state.dehydrated), null === state || - "$?" === state.data || + isSuspenseInstancePending(state) || isSuspenseInstanceFallback(state)) ) return node; @@ -5564,8 +5564,14 @@ function requestFormReset$1(formFiber) { var transition = ReactSharedInternals.T; if (null !== transition && transition.gesture) throw Error(formatProdErrorMessage(555)); - transition = ensureFormComponentIsStateful(formFiber).next.queue; - dispatchSetStateInternal(formFiber, transition, {}, requestUpdateLane()); + transition = ensureFormComponentIsStateful(formFiber); + null === transition.next && (transition = formFiber.alternate.memoizedState); + dispatchSetStateInternal( + formFiber, + transition.next.queue, + {}, + requestUpdateLane() + ); } function useHostTransitionStatus() { return readContext(HostTransitionContext); @@ -7219,14 +7225,15 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), SelectiveHydrationException) ); - "$?" === nextPrimaryChildren.data || renderDidSuspendDelayIfPossible(); + isSuspenseInstancePending(nextPrimaryChildren) || + renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, renderLanes ); } else - "$?" === nextPrimaryChildren.data + isSuspenseInstancePending(nextPrimaryChildren) ? ((workInProgress.flags |= 192), (workInProgress.child = current.child), (workInProgress = null)) @@ -16099,7 +16106,13 @@ function clearHydrationBoundary(parentInstance, hydrationInstance) { return; } depth--; - } else if ("$" === node || "$?" === node || "$!" === node || "&" === node) + } else if ( + "$" === node || + "$?" === node || + "$~" === node || + "$!" === node || + "&" === node + ) depth++; else if ("html" === node) releaseSingletonInstance(parentInstance.ownerDocument.documentElement); @@ -16144,7 +16157,8 @@ function hideOrUnhideDehydratedBoundary(suspenseInstance, isHidden) { if (0 === suspenseInstance) break; else suspenseInstance--; else - ("$" !== node && "$?" !== node && "$!" !== node) || suspenseInstance++; + ("$" !== node && "$?" !== node && "$~" !== node && "$!" !== node) || + suspenseInstance++; node = nextNode; } while (node); } @@ -16998,15 +17012,19 @@ function canHydrateHydrationBoundary(instance, inRootOrSingleton) { } return instance; } +function isSuspenseInstancePending(instance) { + return "$?" === instance.data || "$~" === instance.data; +} function isSuspenseInstanceFallback(instance) { return ( "$!" === instance.data || - ("$?" === instance.data && "complete" === instance.ownerDocument.readyState) + ("$?" === instance.data && "loading" !== instance.ownerDocument.readyState) ); } function registerSuspenseInstanceRetry(instance, callback) { var ownerDocument = instance.ownerDocument; - if ("$?" !== instance.data || "complete" === ownerDocument.readyState) + if ("$~" === instance.data) instance._reactRetry = callback; + else if ("$?" !== instance.data || "loading" !== ownerDocument.readyState) callback(); else { var listener = function () { @@ -17027,6 +17045,7 @@ function getNextHydratable(node) { "$" === nodeType || "$!" === nodeType || "$?" === nodeType || + "$~" === nodeType || "&" === nodeType || "F!" === nodeType || "F" === nodeType @@ -17048,7 +17067,11 @@ function getNextHydratableInstanceAfterHydrationBoundary(hydrationInstance) { return getNextHydratable(hydrationInstance.nextSibling); depth--; } else - ("$" !== data && "$!" !== data && "$?" !== data && "&" !== data) || + ("$" !== data && + "$!" !== data && + "$?" !== data && + "$~" !== data && + "&" !== data) || depth++; } hydrationInstance = hydrationInstance.nextSibling; @@ -17060,7 +17083,13 @@ function getParentHydrationBoundary(targetInstance) { for (var depth = 0; targetInstance; ) { if (8 === targetInstance.nodeType) { var data = targetInstance.data; - if ("$" === data || "$!" === data || "$?" === data || "&" === data) { + if ( + "$" === data || + "$!" === data || + "$?" === data || + "$~" === data || + "&" === data + ) { if (0 === depth) return targetInstance; depth--; } else ("/$" !== data && "/&" !== data) || depth++; @@ -18651,14 +18680,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_2045 = React.version; if ( - "19.2.0-experimental-197d6a04-20250424" !== + "19.2.0-experimental-c129c242-20250505" !== isomorphicReactPackageVersion$jscomp$inline_2045 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_2045, - "19.2.0-experimental-197d6a04-20250424" + "19.2.0-experimental-c129c242-20250505" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -18680,10 +18709,10 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_2681 = { bundleType: 0, - version: "19.2.0-experimental-197d6a04-20250424", + version: "19.2.0-experimental-c129c242-20250505", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.2.0-experimental-197d6a04-20250424" + reconcilerVersion: "19.2.0-experimental-c129c242-20250505" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2682 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -18787,4 +18816,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.2.0-experimental-197d6a04-20250424"; +exports.version = "19.2.0-experimental-c129c242-20250505"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js index c72bccc5547f2..9972beda2c0a6 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js @@ -4742,7 +4742,7 @@ : eventClass; } function setCurrentTrackFromLanes(lanes) { - reusableLaneDevToolDetails.track = + currentTrack = lanes & 127 ? "Blocking" : lanes & 4194176 @@ -4755,10 +4755,26 @@ } function logComponentTrigger(fiber, startTime, endTime, trigger) { supportsUserTiming && - ((reusableComponentDevToolDetails.color = "warning"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(trigger, reusableComponentOptions)); + ((fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + trigger, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "warning" + ) + ) + : console.timeStamp( + trigger, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "warning" + )); } function logComponentReappeared(fiber, startTime, endTime) { logComponentTrigger(fiber, startTime, endTime, "Reconnect"); @@ -4768,9 +4784,9 @@ if (null !== name && supportsUserTiming) { var selfTime = fiber.actualDuration; if (null === fiber.alternate || fiber.alternate.child !== fiber.child) - for (fiber = fiber.child; null !== fiber; fiber = fiber.sibling) - selfTime -= fiber.actualDuration; - reusableComponentDevToolDetails.color = + for (var child = fiber.child; null !== child; child = child.sibling) + selfTime -= child.actualDuration; + wasHydrated = 0.5 > selfTime ? wasHydrated ? "tertiary-light" @@ -4784,80 +4800,140 @@ ? "tertiary-dark" : "primary-dark" : "error"; - reusableComponentOptions.start = startTime; - reusableComponentOptions.end = endTime; - performance.measure(name, reusableComponentOptions); + (fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + wasHydrated + ) + ) + : console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + wasHydrated + ); } } function logComponentErrored(fiber, startTime, endTime, errors) { if (supportsUserTiming) { var name = getComponentNameFromFiber(fiber); - if (null !== name) { - for (var properties = [], i = 0; i < errors.length; i++) { - var error = errors[i].value; - properties.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure(name, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: COMPONENTS_TRACK, - tooltipText: - 13 === fiber.tag - ? "Hydration failed" - : "Error boundary caught an error", - properties: properties - } + if (null !== name) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + for ( + var debugTask = null, properties = [], i = 0; + i < errors.length; + i++ + ) { + var capturedValue = errors[i]; + null == debugTask && + null !== capturedValue.source && + (debugTask = capturedValue.source._debugTask); + capturedValue = capturedValue.value; + properties.push([ + "Error", + "object" === typeof capturedValue && + null !== capturedValue && + "string" === typeof capturedValue.message + ? String(capturedValue.message) + : String(capturedValue) + ]); } - }); - } + null == debugTask && (debugTask = fiber._debugTask); + fiber = { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: COMPONENTS_TRACK, + tooltipText: + 13 === fiber.tag + ? "Hydration failed" + : "Error boundary caught an error", + properties: properties + } + } + }; + debugTask + ? debugTask.run( + performance.measure.bind(performance, name, fiber) + ) + : performance.measure(name, fiber); + } else + console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "error" + ); } } function logComponentEffect(fiber, startTime, endTime, selfTime, errors) { if (null !== errors) { - if ( - supportsUserTiming && - ((selfTime = getComponentNameFromFiber(fiber)), null !== selfTime) - ) { - fiber = []; - for (var i = 0; i < errors.length; i++) { - var error = errors[i].value; - fiber.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure(selfTime, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: COMPONENTS_TRACK, - tooltipText: "A lifecycle or effect errored", - properties: fiber + if (supportsUserTiming) { + var name = getComponentNameFromFiber(fiber); + if (null !== name) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + selfTime = []; + for (var i = 0; i < errors.length; i++) { + var error = errors[i].value; + selfTime.push([ + "Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - } - }); + startTime = { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: COMPONENTS_TRACK, + tooltipText: "A lifecycle or effect errored", + properties: selfTime + } + } + }; + (fiber = fiber._debugTask) + ? fiber.run( + performance.measure.bind(performance, name, startTime) + ) + : performance.measure(name, startTime); + } else + console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + "error" + ); } } else - (errors = getComponentNameFromFiber(fiber)), - null !== errors && + (name = getComponentNameFromFiber(fiber)), + null !== name && supportsUserTiming && - ((reusableComponentDevToolDetails.color = + ((errors = 1 > selfTime ? "secondary-light" : 100 > selfTime @@ -4865,40 +4941,48 @@ : 500 > selfTime ? "secondary-dark" : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(errors, reusableComponentOptions)); - } - function logRenderPhase(startTime, endTime, lanes) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( - (lanes & 536870912) === lanes - ? "Prepared" - : (lanes & 201326741) === lanes - ? "Hydrated" - : "Render", - reusableLaneOptions - )); + (fiber = fiber._debugTask) + ? fiber.run( + console.timeStamp.bind( + console, + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + errors + ) + ) + : console.timeStamp( + name, + startTime, + endTime, + COMPONENTS_TRACK, + void 0, + errors + )); } function logSuspendedRenderPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Prewarm", reusableLaneOptions)); + console.timeStamp( + "Prewarm", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logSuspendedWithDelayPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended", reusableLaneOptions)); + console.timeStamp( + "Suspended", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logRecoveredRenderPhase( startTime, @@ -4907,86 +4991,100 @@ recoverableErrors, hydrationFailed ) { - if (supportsUserTiming) { - lanes = []; - for (var i = 0; i < recoverableErrors.length; i++) { - var error = recoverableErrors[i].value; - lanes.push([ - "Recoverable Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure("Recovered", { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "primary-dark", - track: reusableLaneDevToolDetails.track, - trackGroup: LANES_TRACK_GROUP, - tooltipText: hydrationFailed - ? "Hydration Failed" - : "Recovered after Error", - properties: lanes - } + if (supportsUserTiming) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + lanes = []; + for (var i = 0; i < recoverableErrors.length; i++) { + var error = recoverableErrors[i].value; + lanes.push([ + "Recoverable Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - }); - } + performance.measure("Recovered", { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "primary-dark", + track: currentTrack, + trackGroup: LANES_TRACK_GROUP, + tooltipText: hydrationFailed + ? "Hydration Failed" + : "Recovered after Error", + properties: lanes + } + } + }); + } else + console.timeStamp( + "Recovered", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function logErroredRenderPhase(startTime, endTime) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Errored", reusableLaneOptions)); - } - function logSuspenseThrottlePhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Throttled", reusableLaneOptions)); - } - function logSuspendedCommitPhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended on CSS or Images", reusableLaneOptions)); + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function logCommitErrored(startTime, endTime, errors, passive) { - if (supportsUserTiming) { - for (var properties = [], i = 0; i < errors.length; i++) { - var error = errors[i].value; - properties.push([ - "Error", - "object" === typeof error && - null !== error && - "string" === typeof error.message - ? String(error.message) - : String(error) - ]); - } - performance.measure("Errored", { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: reusableLaneDevToolDetails.track, - trackGroup: LANES_TRACK_GROUP, - tooltipText: passive - ? "Remaining Effects Errored" - : "Commit Errored", - properties: properties - } + if (supportsUserTiming) + if ( + "undefined" !== typeof performance && + "function" === typeof performance.measure + ) { + for (var properties = [], i = 0; i < errors.length; i++) { + var error = errors[i].value; + properties.push([ + "Error", + "object" === typeof error && + null !== error && + "string" === typeof error.message + ? String(error.message) + : String(error) + ]); } - }); - } + performance.measure("Errored", { + start: startTime, + end: endTime, + detail: { + devtools: { + color: "error", + track: currentTrack, + trackGroup: LANES_TRACK_GROUP, + tooltipText: passive + ? "Remaining Effects Errored" + : "Commit Errored", + properties: properties + } + } + }); + } else + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); } function resetContextDependencies() { lastContextDependency = currentlyRenderingFiber$1 = null; @@ -5237,36 +5335,36 @@ root.transitionTypes = null; return claimed; } - function startUpdateTimerByLane(lane) { + function startUpdateTimerByLane(lane, method) { var JSCompiler_temp; (JSCompiler_temp = 0 !== (lane & 3)) || (JSCompiler_temp = 0 !== (lane & 60)); if (JSCompiler_temp) 0 > blockingUpdateTime && ((blockingUpdateTime = now()), + (blockingUpdateTask = createTask(method)), (executionContext & (RenderContext | CommitContext)) !== NoContext && (blockingSpawnedUpdate = !0), (lane = resolveEventTimeStamp()), - (JSCompiler_temp = resolveEventType()), - lane !== blockingEventTime || JSCompiler_temp !== blockingEventType + (method = resolveEventType()), + lane !== blockingEventTime || method !== blockingEventType ? (blockingEventIsRepeat = !1) - : null !== JSCompiler_temp && (blockingSpawnedUpdate = !0), + : null !== method && (blockingSpawnedUpdate = !0), (blockingEventTime = lane), - (blockingEventType = JSCompiler_temp)); + (blockingEventType = method)); else if ( 0 !== (lane & 4194048) && 0 > transitionUpdateTime && - ((transitionUpdateTime = now()), 0 > transitionStartTime) + ((transitionUpdateTime = now()), + (transitionUpdateTask = createTask(method)), + 0 > transitionStartTime) ) { lane = resolveEventTimeStamp(); - JSCompiler_temp = resolveEventType(); - if ( - lane !== transitionEventTime || - JSCompiler_temp !== transitionEventType - ) + method = resolveEventType(); + if (lane !== transitionEventTime || method !== transitionEventType) transitionEventIsRepeat = !1; transitionEventTime = lane; - transitionEventType = JSCompiler_temp; + transitionEventType = method; } } function pushNestedEffectDurations() { @@ -7097,7 +7195,7 @@ null !== state && ((state = state.dehydrated), null === state || - state.data === SUSPENSE_PENDING_START_DATA || + isSuspenseInstancePending(state) || isSuspenseInstanceFallback(state)) ) return node; @@ -7847,7 +7945,9 @@ } function subscribeToStore(fiber, inst, subscribe) { return subscribe(function () { - checkIfSnapshotChanged(inst) && forceStoreRerender(fiber); + checkIfSnapshotChanged(inst) && + (startUpdateTimerByLane(2, "updateSyncExternalStore()"), + forceStoreRerender(fiber)); }); } function checkIfSnapshotChanged(inst) { @@ -8603,10 +8703,12 @@ throw Error( "Cannot requestFormReset() inside a startGestureTransition. There should be no side-effects associated with starting a Gesture until its Action is invoked. Move side-effects to the Action instead." ); - transition = ensureFormComponentIsStateful(formFiber).next.queue; + transition = ensureFormComponentIsStateful(formFiber); + null === transition.next && + (transition = formFiber.alternate.memoizedState); dispatchSetStateInternal( formFiber, - transition, + transition.next.queue, {}, requestUpdateLane(formFiber) ); @@ -8676,7 +8778,7 @@ fiber = createUpdate(lane); var root = enqueueUpdate(provider, fiber, lane); null !== root && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "refresh()"), scheduleUpdateOnFiber(root, provider, lane), entangleTransitions(root, provider, lane)); provider = createCache(); @@ -8710,7 +8812,7 @@ ? enqueueRenderPhaseUpdate(queue, update) : ((update = enqueueConcurrentHookUpdate(fiber, queue, update, args)), null !== update && - (startUpdateTimerByLane(args), + (startUpdateTimerByLane(args, "dispatch()"), scheduleUpdateOnFiber(update, fiber, args), entangleTransitionUpdate(update, queue, args))); } @@ -8722,7 +8824,7 @@ ); args = requestUpdateLane(fiber); dispatchSetStateInternal(fiber, queue, action, args) && - startUpdateTimerByLane(args); + startUpdateTimerByLane(args, "setState()"); } function dispatchSetStateInternal(fiber, queue, action, lane) { var update = { @@ -8805,7 +8907,7 @@ lane )), null !== throwIfDuringRender && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "setOptimistic()"), scheduleUpdateOnFiber(throwIfDuringRender, fiber, lane), null !== transition && ((transition = transition.gesture), null !== transition))) @@ -10316,25 +10418,25 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2988; - var JSCompiler_object_inline_stack_2987 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_3012; + var JSCompiler_object_inline_stack_3011 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_digest_2986 = !1; + var JSCompiler_object_inline_digest_3010 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2988 = didSuspend) || - (JSCompiler_object_inline_componentStack_2988 = + (JSCompiler_object_inline_componentStack_3012 = didSuspend) || + (JSCompiler_object_inline_componentStack_3012 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2988 && - ((JSCompiler_object_inline_digest_2986 = !0), + JSCompiler_object_inline_componentStack_3012 && + ((JSCompiler_object_inline_digest_3010 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2988 = + JSCompiler_object_inline_componentStack_3012 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_digest_2986 + JSCompiler_object_inline_digest_3010 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); (current = nextHydratableInstance) @@ -10347,20 +10449,20 @@ ? renderLanes : null), null !== renderLanes && - ((JSCompiler_object_inline_componentStack_2988 = { + ((JSCompiler_object_inline_componentStack_3012 = { dehydrated: renderLanes, treeContext: getSuspendedTreeContext(), retryLane: 536870912, hydrationErrors: null }), (workInProgress.memoizedState = - JSCompiler_object_inline_componentStack_2988), - (JSCompiler_object_inline_componentStack_2988 = + JSCompiler_object_inline_componentStack_3012), + (JSCompiler_object_inline_componentStack_3012 = createFiberFromDehydratedFragment(renderLanes)), - (JSCompiler_object_inline_componentStack_2988.return = + (JSCompiler_object_inline_componentStack_3012.return = workInProgress), (workInProgress.child = - JSCompiler_object_inline_componentStack_2988), + JSCompiler_object_inline_componentStack_3012), (hydrationParentFiber = workInProgress), (nextHydratableInstance = null))) : (renderLanes = null); @@ -10374,12 +10476,12 @@ : (workInProgress.lanes = 536870912); return null; } - var nextPrimaryChildren = JSCompiler_object_inline_stack_2987.children, - nextFallbackChildren = JSCompiler_object_inline_stack_2987.fallback; - if (JSCompiler_object_inline_digest_2986) + var nextPrimaryChildren = JSCompiler_object_inline_stack_3011.children, + nextFallbackChildren = JSCompiler_object_inline_stack_3011.fallback; + if (JSCompiler_object_inline_digest_3010) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2987 = + (JSCompiler_object_inline_stack_3011 = mountSuspenseFallbackChildren( workInProgress, nextPrimaryChildren, @@ -10391,19 +10493,19 @@ mountSuspenseOffscreenState(renderLanes)), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2987 + JSCompiler_object_inline_stack_3011 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2987.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_3011.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2987 = + (JSCompiler_object_inline_stack_3011 = mountSuspenseFallbackChildren( workInProgress, nextPrimaryChildren, @@ -10415,12 +10517,12 @@ mountSuspenseOffscreenState(renderLanes)), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2987 + JSCompiler_object_inline_stack_3011 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( @@ -10430,8 +10532,8 @@ } var prevState = current.memoizedState; if (null !== prevState) { - var JSCompiler_object_inline_message_2985 = prevState.dehydrated; - if (null !== JSCompiler_object_inline_message_2985) { + var JSCompiler_object_inline_message_3009 = prevState.dehydrated; + if (null !== JSCompiler_object_inline_message_3009) { if (didSuspend) workInProgress.flags & 256 ? (pushPrimaryTreeSuspenseHandler(workInProgress), @@ -10448,13 +10550,13 @@ (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), (nextPrimaryChildren = - JSCompiler_object_inline_stack_2987.fallback), + JSCompiler_object_inline_stack_3011.fallback), (nextFallbackChildren = workInProgress.mode), - (JSCompiler_object_inline_stack_2987 = + (JSCompiler_object_inline_stack_3011 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2987.children + children: JSCompiler_object_inline_stack_3011.children }, nextFallbackChildren )), @@ -10465,24 +10567,24 @@ null )), (nextPrimaryChildren.flags |= 2), - (JSCompiler_object_inline_stack_2987.return = workInProgress), + (JSCompiler_object_inline_stack_3011.return = workInProgress), (nextPrimaryChildren.return = workInProgress), - (JSCompiler_object_inline_stack_2987.sibling = + (JSCompiler_object_inline_stack_3011.sibling = nextPrimaryChildren), - (workInProgress.child = JSCompiler_object_inline_stack_2987), + (workInProgress.child = JSCompiler_object_inline_stack_3011), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2987 = workInProgress.child), - (JSCompiler_object_inline_stack_2987.memoizedState = + (JSCompiler_object_inline_stack_3011 = workInProgress.child), + (JSCompiler_object_inline_stack_3011.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2987.childLanes = + (JSCompiler_object_inline_stack_3011.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), @@ -10490,48 +10592,48 @@ else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), warnIfHydrating(), - isSuspenseInstanceFallback(JSCompiler_object_inline_message_2985)) + isSuspenseInstanceFallback(JSCompiler_object_inline_message_3009)) ) { - JSCompiler_object_inline_componentStack_2988 = - JSCompiler_object_inline_message_2985.nextSibling && - JSCompiler_object_inline_message_2985.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2988) { + JSCompiler_object_inline_componentStack_3012 = + JSCompiler_object_inline_message_3009.nextSibling && + JSCompiler_object_inline_message_3009.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_3012) { nextPrimaryChildren = - JSCompiler_object_inline_componentStack_2988.dgst; - var message = JSCompiler_object_inline_componentStack_2988.msg; + JSCompiler_object_inline_componentStack_3012.dgst; + var message = JSCompiler_object_inline_componentStack_3012.msg; nextFallbackChildren = - JSCompiler_object_inline_componentStack_2988.stck; + JSCompiler_object_inline_componentStack_3012.stck; var componentStack = - JSCompiler_object_inline_componentStack_2988.cstck; + JSCompiler_object_inline_componentStack_3012.cstck; } - JSCompiler_object_inline_message_2985 = message; - JSCompiler_object_inline_digest_2986 = nextPrimaryChildren; - JSCompiler_object_inline_stack_2987 = nextFallbackChildren; - JSCompiler_object_inline_componentStack_2988 = componentStack; - nextPrimaryChildren = JSCompiler_object_inline_digest_2986; - nextFallbackChildren = JSCompiler_object_inline_message_2985; - componentStack = JSCompiler_object_inline_componentStack_2988; + JSCompiler_object_inline_message_3009 = message; + JSCompiler_object_inline_digest_3010 = nextPrimaryChildren; + JSCompiler_object_inline_stack_3011 = nextFallbackChildren; + JSCompiler_object_inline_componentStack_3012 = componentStack; + nextPrimaryChildren = JSCompiler_object_inline_digest_3010; + nextFallbackChildren = JSCompiler_object_inline_message_3009; + componentStack = JSCompiler_object_inline_componentStack_3012; "POSTPONE" !== nextPrimaryChildren && - ((JSCompiler_object_inline_componentStack_2988 = + ((JSCompiler_object_inline_componentStack_3012 = nextFallbackChildren ? Error(nextFallbackChildren) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_componentStack_2988.stack = - JSCompiler_object_inline_stack_2987 || ""), - (JSCompiler_object_inline_componentStack_2988.digest = + (JSCompiler_object_inline_componentStack_3012.stack = + JSCompiler_object_inline_stack_3011 || ""), + (JSCompiler_object_inline_componentStack_3012.digest = nextPrimaryChildren), - (JSCompiler_object_inline_stack_2987 = + (JSCompiler_object_inline_stack_3011 = void 0 === componentStack ? null : componentStack), (nextPrimaryChildren = { - value: JSCompiler_object_inline_componentStack_2988, + value: JSCompiler_object_inline_componentStack_3012, source: null, - stack: JSCompiler_object_inline_stack_2987 + stack: JSCompiler_object_inline_stack_3011 }), - "string" === typeof JSCompiler_object_inline_stack_2987 && + "string" === typeof JSCompiler_object_inline_stack_3011 && CapturedStacks.set( - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, nextPrimaryChildren ), queueHydrationError(nextPrimaryChildren)); @@ -10548,49 +10650,48 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2988 = + (JSCompiler_object_inline_componentStack_3012 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2988) + didReceiveUpdate || JSCompiler_object_inline_componentStack_3012) ) { - JSCompiler_object_inline_componentStack_2988 = workInProgressRoot; + JSCompiler_object_inline_componentStack_3012 = workInProgressRoot; if ( - null !== JSCompiler_object_inline_componentStack_2988 && - ((JSCompiler_object_inline_stack_2987 = getBumpedLaneForHydration( - JSCompiler_object_inline_componentStack_2988, + null !== JSCompiler_object_inline_componentStack_3012 && + ((JSCompiler_object_inline_stack_3011 = getBumpedLaneForHydration( + JSCompiler_object_inline_componentStack_3012, renderLanes )), - 0 !== JSCompiler_object_inline_stack_2987 && - JSCompiler_object_inline_stack_2987 !== prevState.retryLane) + 0 !== JSCompiler_object_inline_stack_3011 && + JSCompiler_object_inline_stack_3011 !== prevState.retryLane) ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2987), + ((prevState.retryLane = JSCompiler_object_inline_stack_3011), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2987 + JSCompiler_object_inline_stack_3011 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, current, - JSCompiler_object_inline_stack_2987 + JSCompiler_object_inline_stack_3011 ), SelectiveHydrationException) ); - JSCompiler_object_inline_message_2985.data === - SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); + isSuspenseInstancePending(JSCompiler_object_inline_message_3009) || + renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, renderLanes ); } else - JSCompiler_object_inline_message_2985.data === - SUSPENSE_PENDING_START_DATA + isSuspenseInstancePending(JSCompiler_object_inline_message_3009) ? ((workInProgress.flags |= 192), (workInProgress.child = current.child), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2985.nextSibling + JSCompiler_object_inline_message_3009.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -10602,31 +10703,31 @@ restoreSuspendedTreeContext(workInProgress, current), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2987.children + JSCompiler_object_inline_stack_3011.children )), (workInProgress.flags |= 4096)); return workInProgress; } } - if (JSCompiler_object_inline_digest_2986) + if (JSCompiler_object_inline_digest_3010) return ( reuseSuspenseHandlerOnStack(workInProgress), - (nextPrimaryChildren = JSCompiler_object_inline_stack_2987.fallback), + (nextPrimaryChildren = JSCompiler_object_inline_stack_3011.fallback), (nextFallbackChildren = workInProgress.mode), (componentStack = current.child), - (JSCompiler_object_inline_message_2985 = componentStack.sibling), - (JSCompiler_object_inline_stack_2987 = createWorkInProgress( + (JSCompiler_object_inline_message_3009 = componentStack.sibling), + (JSCompiler_object_inline_stack_3011 = createWorkInProgress( componentStack, { mode: "hidden", - children: JSCompiler_object_inline_stack_2987.children + children: JSCompiler_object_inline_stack_3011.children } )), - (JSCompiler_object_inline_stack_2987.subtreeFlags = + (JSCompiler_object_inline_stack_3011.subtreeFlags = componentStack.subtreeFlags & 65011712), - null !== JSCompiler_object_inline_message_2985 + null !== JSCompiler_object_inline_message_3009 ? (nextPrimaryChildren = createWorkInProgress( - JSCompiler_object_inline_message_2985, + JSCompiler_object_inline_message_3009, nextPrimaryChildren )) : ((nextPrimaryChildren = createFiberFromFragment( @@ -10637,24 +10738,24 @@ )), (nextPrimaryChildren.flags |= 2)), (nextPrimaryChildren.return = workInProgress), - (JSCompiler_object_inline_stack_2987.return = workInProgress), - (JSCompiler_object_inline_stack_2987.sibling = nextPrimaryChildren), - (workInProgress.child = JSCompiler_object_inline_stack_2987), - (JSCompiler_object_inline_stack_2987 = nextPrimaryChildren), + (JSCompiler_object_inline_stack_3011.return = workInProgress), + (JSCompiler_object_inline_stack_3011.sibling = nextPrimaryChildren), + (workInProgress.child = JSCompiler_object_inline_stack_3011), + (JSCompiler_object_inline_stack_3011 = nextPrimaryChildren), (nextPrimaryChildren = workInProgress.child), (nextFallbackChildren = current.child.memoizedState), null === nextFallbackChildren ? (nextFallbackChildren = mountSuspenseOffscreenState(renderLanes)) : ((componentStack = nextFallbackChildren.cachePool), null !== componentStack - ? ((JSCompiler_object_inline_message_2985 = + ? ((JSCompiler_object_inline_message_3009 = CacheContext._currentValue), (componentStack = componentStack.parent !== - JSCompiler_object_inline_message_2985 + JSCompiler_object_inline_message_3009 ? { - parent: JSCompiler_object_inline_message_2985, - pool: JSCompiler_object_inline_message_2985 + parent: JSCompiler_object_inline_message_3009, + pool: JSCompiler_object_inline_message_3009 } : componentStack)) : (componentStack = getSuspendedCache()), @@ -10665,28 +10766,28 @@ (nextPrimaryChildren.memoizedState = nextFallbackChildren), (nextPrimaryChildren.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2988, + JSCompiler_object_inline_componentStack_3012, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2987 + JSCompiler_object_inline_stack_3011 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2987.children + children: JSCompiler_object_inline_stack_3011.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2988 = + ((JSCompiler_object_inline_componentStack_3012 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2988 + null === JSCompiler_object_inline_componentStack_3012 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2988.push(current)); + : JSCompiler_object_inline_componentStack_3012.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -17492,81 +17593,118 @@ if ((executionContext & (RenderContext | CommitContext)) !== NoContext) throw Error("Should not already be working."); if (0 !== workInProgressRootRenderLanes && null !== workInProgress) { - var yieldEndTime = now$1(); + var yieldedFiber = workInProgress, + yieldEndTime = now$1(); switch (yieldReason) { case SuspendedOnImmediate: case SuspendedOnData: var startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Suspended", reusableComponentOptions)); + ((yieldedFiber = yieldedFiber._debugTask) + ? yieldedFiber.run( + console.timeStamp.bind( + console, + "Suspended", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + ) + ) + : console.timeStamp( + "Suspended", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + )); break; case SuspendedOnAction: startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Action", reusableComponentOptions)); + ((yieldedFiber = yieldedFiber._debugTask) + ? yieldedFiber.run( + console.timeStamp.bind( + console, + "Action", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + ) + ) + : console.timeStamp( + "Action", + startTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + "primary-light" + )); break; default: - if (((startTime = yieldStartTime), supportsUserTiming)) { - var yieldDuration = yieldEndTime - startTime; - 3 > yieldDuration || - ((reusableComponentDevToolDetails.color = - 5 > yieldDuration + supportsUserTiming && + ((yieldedFiber = yieldEndTime - yieldStartTime), + 3 > yieldedFiber || + console.timeStamp( + "Blocked", + yieldStartTime, + yieldEndTime, + COMPONENTS_TRACK, + void 0, + 5 > yieldedFiber ? "primary-light" - : 10 > yieldDuration + : 10 > yieldedFiber ? "primary" - : 100 > yieldDuration + : 100 > yieldedFiber ? "primary-dark" - : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Blocked", reusableComponentOptions)); - } + : "error" + )); } } - yieldDuration = (forceSync = + startTime = (yieldEndTime = (!forceSync && 0 === (lanes & 124) && 0 === (lanes & root.expiredLanes)) || checkIfRootIsPrerendering(root, lanes)) ? renderRootConcurrent(root, lanes) : renderRootSync(root, lanes, !0); - var renderWasConcurrent = forceSync; + var renderWasConcurrent = yieldEndTime; do { - if (yieldDuration === RootInProgress) { + if (startTime === RootInProgress) { workInProgressRootIsPrerendering && - !forceSync && + !yieldEndTime && markRootSuspended(root, lanes, 0, !1); lanes = workInProgressSuspendedReason; yieldStartTime = now(); yieldReason = lanes; break; } else { - startTime = now$1(); - yieldEndTime = root.current.alternate; + yieldedFiber = now$1(); + forceSync = root.current.alternate; if ( renderWasConcurrent && - !isRenderConsistentWithExternalStores(yieldEndTime) + !isRenderConsistentWithExternalStores(forceSync) ) { setCurrentTrackFromLanes(lanes); - yieldEndTime = renderStartTime; - yieldDuration = startTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = yieldEndTime), - (reusableLaneOptions.end = yieldDuration), - performance.measure("Teared Render", reusableLaneOptions)); - finalizeRender(lanes, startTime); - yieldDuration = renderRootSync(root, lanes, !1); + console.timeStamp( + "Teared Render", + renderStartTime, + yieldedFiber, + currentTrack, + LANES_TRACK_GROUP, + "error" + ); + finalizeRender(lanes, yieldedFiber); + startTime = renderRootSync(root, lanes, !1); renderWasConcurrent = !1; continue; } - if (yieldDuration === RootErrored) { + if (startTime === RootErrored) { renderWasConcurrent = lanes; if (root.errorRecoveryDisabledLanes & renderWasConcurrent) var errorRetryLanes = 0; @@ -17580,19 +17718,20 @@ : 0); if (0 !== errorRetryLanes) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldedFiber); + finalizeRender(lanes, yieldedFiber); lanes = errorRetryLanes; a: { - startTime = root; - yieldDuration = renderWasConcurrent; + yieldedFiber = root; + startTime = renderWasConcurrent; renderWasConcurrent = workInProgressRootConcurrentErrors; var wasRootDehydrated = - startTime.current.memoizedState.isDehydrated; + yieldedFiber.current.memoizedState.isDehydrated; wasRootDehydrated && - (prepareFreshStack(startTime, errorRetryLanes).flags |= 256); + (prepareFreshStack(yieldedFiber, errorRetryLanes).flags |= + 256); errorRetryLanes = renderRootSync( - startTime, + yieldedFiber, errorRetryLanes, !1 ); @@ -17601,39 +17740,39 @@ workInProgressRootDidAttachPingListener && !wasRootDehydrated ) { - startTime.errorRecoveryDisabledLanes |= yieldDuration; - workInProgressRootInterleavedUpdatedLanes |= yieldDuration; - yieldDuration = RootSuspendedWithDelay; + yieldedFiber.errorRecoveryDisabledLanes |= startTime; + workInProgressRootInterleavedUpdatedLanes |= startTime; + startTime = RootSuspendedWithDelay; break a; } - startTime = workInProgressRootRecoverableErrors; + yieldedFiber = workInProgressRootRecoverableErrors; workInProgressRootRecoverableErrors = renderWasConcurrent; - null !== startTime && + null !== yieldedFiber && (null === workInProgressRootRecoverableErrors - ? (workInProgressRootRecoverableErrors = startTime) + ? (workInProgressRootRecoverableErrors = yieldedFiber) : workInProgressRootRecoverableErrors.push.apply( workInProgressRootRecoverableErrors, - startTime + yieldedFiber )); } - yieldDuration = errorRetryLanes; + startTime = errorRetryLanes; } renderWasConcurrent = !1; - if (yieldDuration !== RootErrored) continue; - else startTime = now$1(); + if (startTime !== RootErrored) continue; + else yieldedFiber = now$1(); } } - if (yieldDuration === RootFatalErrored) { + if (startTime === RootFatalErrored) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldedFiber); + finalizeRender(lanes, yieldedFiber); prepareFreshStack(root, 0); markRootSuspended(root, lanes, 0, !0); break; } a: { - forceSync = root; - switch (yieldDuration) { + yieldEndTime = root; + switch (startTime) { case RootInProgress: case RootFatalErrored: throw Error("Root did not complete. This is a bug in React."); @@ -17641,15 +17780,15 @@ if ((lanes & 4194048) !== lanes) break; case RootSuspendedAtTheShell: setCurrentTrackFromLanes(lanes); - logSuspendedRenderPhase(renderStartTime, startTime, lanes); - finalizeRender(lanes, startTime); - yieldEndTime = lanes; - 0 !== (yieldEndTime & 3) || 0 !== (yieldEndTime & 124) - ? (blockingSuspendedTime = startTime) - : 0 !== (yieldEndTime & 4194048) && - (transitionSuspendedTime = startTime); + logSuspendedRenderPhase(renderStartTime, yieldedFiber, lanes); + finalizeRender(lanes, yieldedFiber); + forceSync = lanes; + 0 !== (forceSync & 3) || 0 !== (forceSync & 124) + ? (blockingSuspendedTime = yieldedFiber) + : 0 !== (forceSync & 4194048) && + (transitionSuspendedTime = yieldedFiber); markRootSuspended( - forceSync, + yieldEndTime, lanes, workInProgressDeferredLane, !workInProgressRootDidSkipSuspendedSiblings @@ -17666,8 +17805,8 @@ } if (null !== ReactSharedInternals.actQueue) commitRoot( - forceSync, yieldEndTime, + forceSync, lanes, workInProgressRootRecoverableErrors, workInProgressTransitions, @@ -17675,10 +17814,10 @@ workInProgressDeferredLane, workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, - yieldDuration, + startTime, IMMEDIATE_COMMIT, renderStartTime, - startTime + yieldedFiber ); else { if ( @@ -17690,17 +17829,17 @@ 10 < renderWasConcurrent) ) { markRootSuspended( - forceSync, + yieldEndTime, lanes, workInProgressDeferredLane, !workInProgressRootDidSkipSuspendedSiblings ); - if (0 !== getNextLanes(forceSync, 0, !0)) break a; - forceSync.timeoutHandle = scheduleTimeout( + if (0 !== getNextLanes(yieldEndTime, 0, !0)) break a; + yieldEndTime.timeoutHandle = scheduleTimeout( commitRootWhenReady.bind( null, - forceSync, yieldEndTime, + forceSync, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -17709,18 +17848,18 @@ workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + startTime, THROTTLED_COMMIT, renderStartTime, - startTime + yieldedFiber ), renderWasConcurrent ); break a; } commitRootWhenReady( - forceSync, yieldEndTime, + forceSync, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -17729,10 +17868,10 @@ workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + startTime, IMMEDIATE_COMMIT, renderStartTime, - startTime + yieldedFiber ); } } @@ -17919,10 +18058,38 @@ } function prepareFreshStack(root, lanes) { supportsUserTiming && - (performance.mark("Blocking Track", blockingLaneMarker), - performance.mark("Transition Track", transitionLaneMarker), - performance.mark("Suspense Track", suspenseLaneMarker), - performance.mark("Idle Track", idleLaneMarker)); + (console.timeStamp( + "Blocking Track", + 0.003, + 0.003, + "Blocking", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Transition Track", + 0.003, + 0.003, + "Transition", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Suspense Track", + 0.003, + 0.003, + "Suspense", + LANES_TRACK_GROUP, + "primary-light" + ), + console.timeStamp( + "Idle Track", + 0.003, + 0.003, + "Idle", + LANES_TRACK_GROUP, + "primary-light" + )); var previousRenderStartTime = renderStartTime; renderStartTime = now(); if (0 !== workInProgressRootRenderLanes && 0 < previousRenderStartTime) { @@ -17939,18 +18106,18 @@ else { var endTime = renderStartTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( (lanes & 536870912) === lanes ? "Prewarm" : (lanes & 201326741) === lanes ? "Interrupted Hydration" : "Interrupted Render", - reusableLaneOptions - )); + previousRenderStartTime, + endTime, + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } finalizeRender(workInProgressRootRenderLanes, renderStartTime); } @@ -17959,7 +18126,7 @@ 0 <= blockingUpdateTime && blockingUpdateTime < blockingClampTime ? blockingClampTime : blockingUpdateTime; - endTime = + var clampedEventTime = 0 <= blockingEventTime && blockingEventTime < blockingClampTime ? blockingClampTime : blockingEventTime; @@ -17967,120 +18134,196 @@ (setCurrentTrackFromLanes(lanes), logSuspendedWithDelayPhase( blockingSuspendedTime, - 0 <= endTime - ? endTime + 0 <= clampedEventTime + ? clampedEventTime : 0 <= previousRenderStartTime ? previousRenderStartTime : renderStartTime, lanes )); var eventType = blockingEventType, - eventIsRepeat = blockingEventIsRepeat, - isSpawnedUpdate = blockingSpawnedUpdate, - renderStartTime$jscomp$0 = renderStartTime; - supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Blocking"), - 0 < endTime && - null !== eventType && - ((reusableLaneDevToolDetails.color = eventIsRepeat - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = - 0 < previousRenderStartTime - ? previousRenderStartTime - : renderStartTime$jscomp$0), - performance.measure( - eventIsRepeat ? "" : "Event: " + eventType, - reusableLaneOptions - )), + eventIsRepeat = blockingEventIsRepeat; + endTime = blockingSpawnedUpdate; + var renderStartTime$jscomp$0 = renderStartTime, + debugTask = blockingUpdateTask; + if (supportsUserTiming) { + currentTrack = "Blocking"; + if (0 < clampedEventTime && null !== eventType) { + var color = eventIsRepeat ? "secondary-light" : "warning"; + debugTask + ? debugTask.run( + console.timeStamp.bind( + console, + eventIsRepeat ? "" : "Event: " + eventType, + clampedEventTime, + 0 < previousRenderStartTime + ? previousRenderStartTime + : renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ) + ) + : console.timeStamp( + eventIsRepeat ? "" : "Event: " + eventType, + clampedEventTime, + 0 < previousRenderStartTime + ? previousRenderStartTime + : renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ); + } 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate + ((clampedEventTime = endTime ? "error" : (lanes & 738197653) === lanes ? "tertiary-light" : "primary-light"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( - isSpawnedUpdate - ? "Cascading Update" - : 5 < renderStartTime$jscomp$0 - previousRenderStartTime - ? "Update Blocked" - : "Update", - reusableLaneOptions - ))); - blockingSuspendedTime = blockingUpdateTime = -1.1; + debugTask + ? debugTask.run( + console.timeStamp.bind( + console, + endTime + ? "Cascading Update" + : 5 < renderStartTime$jscomp$0 - previousRenderStartTime + ? "Update Blocked" + : "Update", + previousRenderStartTime, + renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + clampedEventTime + ) + ) + : console.timeStamp( + endTime + ? "Cascading Update" + : 5 < renderStartTime$jscomp$0 - previousRenderStartTime + ? "Update Blocked" + : "Update", + previousRenderStartTime, + renderStartTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + clampedEventTime + )); + } + blockingUpdateTime = -1.1; + blockingUpdateTask = null; + blockingSuspendedTime = -1.1; blockingEventIsRepeat = !0; blockingSpawnedUpdate = !1; } - 0 !== (lanes & 4194048) && - ((previousRenderStartTime = + if (0 !== (lanes & 4194048)) { + previousRenderStartTime = 0 <= transitionStartTime && transitionStartTime < transitionClampTime ? transitionClampTime - : transitionStartTime), - (endTime = + : transitionStartTime; + endTime = 0 <= transitionUpdateTime && transitionUpdateTime < transitionClampTime ? transitionClampTime - : transitionUpdateTime), - (eventType = + : transitionUpdateTime; + renderStartTime$jscomp$0 = 0 <= transitionEventTime && transitionEventTime < transitionClampTime ? transitionClampTime - : transitionEventTime), + : transitionEventTime; 0 <= transitionSuspendedTime && (setCurrentTrackFromLanes(lanes), logSuspendedWithDelayPhase( transitionSuspendedTime, - 0 <= eventType - ? eventType + 0 <= renderStartTime$jscomp$0 + ? renderStartTime$jscomp$0 : 0 <= endTime ? endTime : renderStartTime, lanes - )), - (eventIsRepeat = transitionEventType), - (isSpawnedUpdate = transitionEventIsRepeat), - (renderStartTime$jscomp$0 = renderStartTime), - supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Transition"), - 0 < eventType && - null !== eventIsRepeat && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = eventType), - (reusableLaneOptions.end = + )); + debugTask = transitionEventType; + clampedEventTime = transitionEventIsRepeat; + eventType = renderStartTime; + eventIsRepeat = transitionUpdateTask; + if (supportsUserTiming) { + currentTrack = "Transition"; + if (0 < renderStartTime$jscomp$0 && null !== debugTask) { + color = clampedEventTime ? "secondary-light" : "warning"; + var endTime$jscomp$0 = 0 < previousRenderStartTime ? previousRenderStartTime : 0 < endTime ? endTime - : renderStartTime$jscomp$0), - performance.measure( - isSpawnedUpdate ? "" : "Event: " + eventIsRepeat, - reusableLaneOptions - )), + : eventType; + eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + clampedEventTime ? "" : "Event: " + debugTask, + renderStartTime$jscomp$0, + endTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ) + ) + : console.timeStamp( + clampedEventTime ? "" : "Event: " + debugTask, + renderStartTime$jscomp$0, + endTime$jscomp$0, + currentTrack, + LANES_TRACK_GROUP, + color + ); + } 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = - 0 < endTime ? endTime : renderStartTime$jscomp$0), - performance.measure("Action", reusableLaneOptions)), + (eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + "Action", + previousRenderStartTime, + 0 < endTime ? endTime : eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-dark" + ) + ) + : console.timeStamp( + "Action", + previousRenderStartTime, + 0 < endTime ? endTime : eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-dark" + )); 0 < endTime && - ((reusableLaneDevToolDetails.color = "primary-light"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( - 5 < renderStartTime$jscomp$0 - endTime - ? "Update Blocked" - : "Update", - reusableLaneOptions - ))), - (transitionSuspendedTime = - transitionUpdateTime = - transitionStartTime = - -1.1), - (transitionEventIsRepeat = !0)); + (eventIsRepeat + ? eventIsRepeat.run( + console.timeStamp.bind( + console, + 5 < eventType - endTime ? "Update Blocked" : "Update", + endTime, + eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-light" + ) + ) + : console.timeStamp( + 5 < eventType - endTime ? "Update Blocked" : "Update", + endTime, + eventType, + currentTrack, + LANES_TRACK_GROUP, + "primary-light" + )); + } + transitionUpdateTime = transitionStartTime = -1.1; + transitionUpdateTask = null; + transitionSuspendedTime = -1.1; + transitionEventIsRepeat = !0; + } previousRenderStartTime = root.timeoutHandle; previousRenderStartTime !== noTimeout && ((root.timeoutHandle = noTimeout), @@ -18114,10 +18357,10 @@ endTime = root.entangledLanes; if (0 !== endTime) for (root = root.entanglements, endTime &= lanes; 0 < endTime; ) - (eventType = 31 - clz32(endTime)), - (eventIsRepeat = 1 << eventType), - (lanes |= root[eventType]), - (endTime &= ~eventIsRepeat); + (renderStartTime$jscomp$0 = 31 - clz32(endTime)), + (debugTask = 1 << renderStartTime$jscomp$0), + (lanes |= root[renderStartTime$jscomp$0]), + (endTime &= ~debugTask); entangledRenderLanes = lanes; finishQueueingConcurrentUpdates(); root = getCurrentTime(); @@ -18685,10 +18928,18 @@ finishedWork.alternate.memoizedState.isDehydrated && 0 !== (finishedWork.flags & 256) ) - : logRenderPhase( + : supportsUserTiming && + console.timeStamp( + (lanes & 536870912) === lanes + ? "Prepared" + : (lanes & 201326741) === lanes + ? "Hydrated" + : "Render", completedRenderStartTime, completedRenderEndTime, - lanes + currentTrack, + LANES_TRACK_GROUP, + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" ); if (null === finishedWork) null !== root.stoppingGestures && stopCompletedGestures(root); @@ -18745,9 +18996,25 @@ commitErrors = null; commitStartTime = now(); suspendedCommitReason === SUSPENDED_COMMIT - ? logSuspendedCommitPhase(completedRenderEndTime, commitStartTime) + ? supportsUserTiming && + console.timeStamp( + "Suspended on CSS or Images", + completedRenderEndTime, + commitStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ) : suspendedCommitReason === THROTTLED_COMMIT && - logSuspenseThrottlePhase(completedRenderEndTime, commitStartTime); + supportsUserTiming && + console.timeStamp( + "Throttled", + completedRenderEndTime, + commitStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ); shouldStartViewTransition = !1; suspendedCommitReason = 0 !== (finishedWork.flags & 13878); if ( @@ -18999,10 +19266,14 @@ !1 ) : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = completedRenderEndTime), - (reusableLaneOptions.end = suspendedCommitReason), - performance.measure("Commit", reusableLaneOptions)); + console.timeStamp( + "Commit", + completedRenderEndTime, + suspendedCommitReason, + currentTrack, + LANES_TRACK_GROUP, + "secondary-dark" + ); completedRenderEndTime = (lanes & 335544064) === lanes ? 10262 : 10256; (completedRenderEndTime = 0 !== finishedWork.actualDuration || @@ -19413,17 +19684,15 @@ var passiveEffectStartTime = 0; commitErrors = null; passiveEffectStartTime = now$1(); - var startTime = commitEndTime, - endTime = passiveEffectStartTime; - wasDelayedCommit = !!wasDelayedCommit; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( wasDelayedCommit ? "Waiting for Paint" : "", - reusableLaneOptions - )); + commitEndTime, + passiveEffectStartTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-light" + ); wasDelayedCommit = executionContext; executionContext |= CommitContext; var finishedWork = priority.current; @@ -19451,10 +19720,14 @@ !0 ) : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = finishedWork$jscomp$0), - (reusableLaneOptions.end = passiveEffectsEndTime), - performance.measure("Remaining Effects", reusableLaneOptions)); + console.timeStamp( + "Remaining Effects", + finishedWork$jscomp$0, + passiveEffectsEndTime, + currentTrack, + LANES_TRACK_GROUP, + "secondary-dark" + ); finalizeRender(lanes, passiveEffectsEndTime); flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects @@ -23346,6 +23619,7 @@ } else if ( node === SUSPENSE_START_DATA || node === SUSPENSE_PENDING_START_DATA || + node === SUSPENSE_QUEUED_START_DATA || node === SUSPENSE_FALLBACK_START_DATA || node === ACTIVITY_START_DATA ) @@ -23398,6 +23672,7 @@ else (node !== SUSPENSE_START_DATA && node !== SUSPENSE_PENDING_START_DATA && + node !== SUSPENSE_QUEUED_START_DATA && node !== SUSPENSE_FALLBACK_START_DATA) || suspenseInstance++; node = nextNode; @@ -24178,18 +24453,26 @@ } return instance; } + function isSuspenseInstancePending(instance) { + return ( + instance.data === SUSPENSE_PENDING_START_DATA || + instance.data === SUSPENSE_QUEUED_START_DATA + ); + } function isSuspenseInstanceFallback(instance) { return ( instance.data === SUSPENSE_FALLBACK_START_DATA || (instance.data === SUSPENSE_PENDING_START_DATA && - instance.ownerDocument.readyState === DOCUMENT_READY_STATE_COMPLETE) + instance.ownerDocument.readyState !== DOCUMENT_READY_STATE_LOADING) ); } function registerSuspenseInstanceRetry(instance, callback) { var ownerDocument = instance.ownerDocument; - if ( + if (instance.data === SUSPENSE_QUEUED_START_DATA) + instance._reactRetry = callback; + else if ( instance.data !== SUSPENSE_PENDING_START_DATA || - ownerDocument.readyState === DOCUMENT_READY_STATE_COMPLETE + ownerDocument.readyState !== DOCUMENT_READY_STATE_LOADING ) callback(); else { @@ -24211,6 +24494,7 @@ nodeType === SUSPENSE_START_DATA || nodeType === SUSPENSE_FALLBACK_START_DATA || nodeType === SUSPENSE_PENDING_START_DATA || + nodeType === SUSPENSE_QUEUED_START_DATA || nodeType === ACTIVITY_START_DATA || nodeType === FORM_STATE_IS_MATCHING || nodeType === FORM_STATE_IS_NOT_MATCHING @@ -24275,6 +24559,7 @@ (data !== SUSPENSE_START_DATA && data !== SUSPENSE_FALLBACK_START_DATA && data !== SUSPENSE_PENDING_START_DATA && + data !== SUSPENSE_QUEUED_START_DATA && data !== ACTIVITY_START_DATA) || depth++; } @@ -24291,6 +24576,7 @@ data === SUSPENSE_START_DATA || data === SUSPENSE_FALLBACK_START_DATA || data === SUSPENSE_PENDING_START_DATA || + data === SUSPENSE_QUEUED_START_DATA || data === ACTIVITY_START_DATA ) { if (0 === depth) return targetInstance; @@ -25277,7 +25563,7 @@ (container.callback = callback)); element = enqueueUpdate(rootFiber, container, lane); null !== element && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "root.render()"), scheduleUpdateOnFiber(element, rootFiber, lane), entangleTransitions(element, rootFiber, lane)); } @@ -27275,69 +27561,11 @@ }; } var supportsUserTiming = - "undefined" !== typeof performance && - "function" === typeof performance.measure, + "undefined" !== typeof console && + "function" === typeof console.timeStamp, COMPONENTS_TRACK = "Components \u269b", - reusableComponentDevToolDetails = { - color: "primary", - track: COMPONENTS_TRACK - }, - reusableComponentOptions = { - start: -0, - end: -0, - detail: { devtools: reusableComponentDevToolDetails } - }, LANES_TRACK_GROUP = "Scheduler \u269b", - reusableLaneDevToolDetails = { - color: "primary", - track: "Blocking", - trackGroup: LANES_TRACK_GROUP - }, - reusableLaneOptions = { - start: -0, - end: -0, - detail: { devtools: reusableLaneDevToolDetails } - }, - blockingLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Blocking", - trackGroup: LANES_TRACK_GROUP - } - } - }, - transitionLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Transition", - trackGroup: LANES_TRACK_GROUP - } - } - }, - suspenseLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Suspense", - trackGroup: LANES_TRACK_GROUP - } - } - }, - idleLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Idle", - trackGroup: LANES_TRACK_GROUP - } - } - }, + currentTrack = "Blocking", valueCursor = createCursor(null); var rendererCursorDEV = createCursor(null); var rendererSigil = {}; @@ -27376,6 +27604,11 @@ }, entangledTransitionTypes = null, now = Scheduler.unstable_now, + createTask = console.createTask + ? console.createTask + : function () { + return null; + }, renderStartTime = -0, commitStartTime = -0, commitEndTime = -0, @@ -27388,6 +27621,7 @@ componentEffectErrors = null, blockingClampTime = -0, blockingUpdateTime = -1.1, + blockingUpdateTask = null, blockingEventTime = -1.1, blockingEventType = null, blockingEventIsRepeat = !1, @@ -27396,6 +27630,7 @@ transitionClampTime = -0, transitionStartTime = -1.1, transitionUpdateTime = -1.1, + transitionUpdateTask = null, transitionEventTime = -1.1, transitionEventType = null, transitionEventIsRepeat = !1, @@ -28978,7 +29213,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); payload = enqueueUpdate(inst, update, lane); null !== payload && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.setState()"), scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); }, @@ -28993,7 +29228,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); payload = enqueueUpdate(inst, update, lane); null !== payload && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.replaceState()"), scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); }, @@ -29007,7 +29242,7 @@ (warnOnInvalidCallback(callback), (update.callback = callback)); callback = enqueueUpdate(inst, update, lane); null !== callback && - (startUpdateTimerByLane(lane), + (startUpdateTimerByLane(lane, "this.forceUpdate()"), scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); } @@ -29299,13 +29534,14 @@ SUSPENSE_START_DATA = "$", SUSPENSE_END_DATA = "/$", SUSPENSE_PENDING_START_DATA = "$?", + SUSPENSE_QUEUED_START_DATA = "$~", SUSPENSE_FALLBACK_START_DATA = "$!", PREAMBLE_CONTRIBUTION_HTML = "html", PREAMBLE_CONTRIBUTION_BODY = "body", PREAMBLE_CONTRIBUTION_HEAD = "head", FORM_STATE_IS_MATCHING = "F!", FORM_STATE_IS_NOT_MATCHING = "F", - DOCUMENT_READY_STATE_COMPLETE = "complete", + DOCUMENT_READY_STATE_LOADING = "loading", STYLE = "style", HostContextNamespaceNone = 0, HostContextNamespaceSvg = 1, @@ -29924,11 +30160,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.2.0-experimental-197d6a04-20250424" !== isomorphicReactPackageVersion) + if ("19.2.0-experimental-c129c242-20250505" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.2.0-experimental-197d6a04-20250424\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.2.0-experimental-c129c242-20250505\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -29965,10 +30201,10 @@ !(function () { var internals = { bundleType: 1, - version: "19.2.0-experimental-197d6a04-20250424", + version: "19.2.0-experimental-c129c242-20250505", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.2.0-experimental-197d6a04-20250424" + reconcilerVersion: "19.2.0-experimental-c129c242-20250505" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -30440,7 +30676,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.2.0-experimental-197d6a04-20250424"; + exports.version = "19.2.0-experimental-c129c242-20250505"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js index dcde2d365d1ae..5d6c4f2588c24 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js @@ -3057,29 +3057,10 @@ function getViewTransitionClassName(defaultClass, eventClass) { : eventClass; } var supportsUserTiming = - "undefined" !== typeof performance && - "function" === typeof performance.measure, - reusableComponentDevToolDetails = { - color: "primary", - track: "Components \u269b" - }, - reusableComponentOptions = { - start: -0, - end: -0, - detail: { devtools: reusableComponentDevToolDetails } - }, - reusableLaneDevToolDetails = { - color: "primary", - track: "Blocking", - trackGroup: "Scheduler \u269b" - }, - reusableLaneOptions = { - start: -0, - end: -0, - detail: { devtools: reusableLaneDevToolDetails } - }; + "undefined" !== typeof console && "function" === typeof console.timeStamp, + currentTrack = "Blocking"; function setCurrentTrackFromLanes(lanes) { - reusableLaneDevToolDetails.track = + currentTrack = lanes & 127 ? "Blocking" : lanes & 4194176 @@ -3090,52 +3071,16 @@ function setCurrentTrackFromLanes(lanes) { ? "Idle" : "Other"; } -var blockingLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Blocking", - trackGroup: "Scheduler \u269b" - } - } - }, - transitionLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Transition", - trackGroup: "Scheduler \u269b" - } - } - }, - suspenseLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Suspense", - trackGroup: "Scheduler \u269b" - } - } - }, - idleLaneMarker = { - startTime: 0.003, - detail: { - devtools: { - color: "primary-light", - track: "Idle", - trackGroup: "Scheduler \u269b" - } - } - }; function logComponentTrigger(fiber, startTime, endTime, trigger) { supportsUserTiming && - ((reusableComponentDevToolDetails.color = "warning"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(trigger, reusableComponentOptions)); + console.timeStamp( + trigger, + startTime, + endTime, + "Components \u269b", + void 0, + "warning" + ); } function logComponentReappeared(fiber, startTime, endTime) { logComponentTrigger(fiber, startTime, endTime, "Reconnect"); @@ -3147,7 +3092,12 @@ function logComponentRender(fiber, startTime, endTime, wasHydrated) { if (null === fiber.alternate || fiber.alternate.child !== fiber.child) for (fiber = fiber.child; null !== fiber; fiber = fiber.sibling) selfTime -= fiber.actualDuration; - reusableComponentDevToolDetails.color = + console.timeStamp( + name, + startTime, + endTime, + "Components \u269b", + void 0, 0.5 > selfTime ? wasHydrated ? "tertiary-light" @@ -3160,132 +3110,97 @@ function logComponentRender(fiber, startTime, endTime, wasHydrated) { ? wasHydrated ? "tertiary-dark" : "primary-dark" - : "error"; - reusableComponentOptions.start = startTime; - reusableComponentOptions.end = endTime; - performance.measure(name, reusableComponentOptions); + : "error" + ); } } function logComponentErrored(fiber, startTime, endTime) { - if (supportsUserTiming) { - var name = getComponentNameFromFiber(fiber); - null !== name && - performance.measure(name, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: "Components \u269b", - tooltipText: - 13 === fiber.tag - ? "Hydration failed" - : "Error boundary caught an error", - properties: [] - } - } - }); - } + supportsUserTiming && + ((fiber = getComponentNameFromFiber(fiber)), + null !== fiber && + console.timeStamp( + fiber, + startTime, + endTime, + "Components \u269b", + void 0, + "error" + )); } function logComponentEffect(fiber, startTime, endTime, selfTime, errors) { null !== errors ? supportsUserTiming && ((selfTime = getComponentNameFromFiber(fiber)), null !== selfTime && - performance.measure(selfTime, { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: "Components \u269b", - tooltipText: "A lifecycle or effect errored", - properties: [] - } - } - })) + console.timeStamp( + selfTime, + startTime, + endTime, + "Components \u269b", + void 0, + "error" + )) : ((fiber = getComponentNameFromFiber(fiber)), null !== fiber && supportsUserTiming && - ((reusableComponentDevToolDetails.color = + console.timeStamp( + fiber, + startTime, + endTime, + "Components \u269b", + void 0, 1 > selfTime ? "secondary-light" : 100 > selfTime ? "secondary" : 500 > selfTime ? "secondary-dark" - : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = endTime), - performance.measure(fiber, reusableComponentOptions))); -} -function logRenderPhase(startTime, endTime, lanes) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( - (lanes & 536870912) === lanes - ? "Prepared" - : (lanes & 201326741) === lanes - ? "Hydrated" - : "Render", - reusableLaneOptions - )); + : "error" + )); } function logSuspendedRenderPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Prewarm", reusableLaneOptions)); + console.timeStamp( + "Prewarm", + startTime, + endTime, + currentTrack, + "Scheduler \u269b", + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logSuspendedWithDelayPhase(startTime, endTime, lanes) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended", reusableLaneOptions)); + console.timeStamp( + "Suspended", + startTime, + endTime, + currentTrack, + "Scheduler \u269b", + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } function logErroredRenderPhase(startTime, endTime) { supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Errored", reusableLaneOptions)); -} -function logSuspenseThrottlePhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Throttled", reusableLaneOptions)); -} -function logSuspendedCommitPhase(startTime, endTime) { - supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure("Suspended on CSS or Images", reusableLaneOptions)); + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + "Scheduler \u269b", + "error" + ); } -function logCommitErrored(startTime, endTime, errors, passive) { +function logCommitErrored(startTime, endTime) { supportsUserTiming && - performance.measure("Errored", { - start: startTime, - end: endTime, - detail: { - devtools: { - color: "error", - track: reusableLaneDevToolDetails.track, - trackGroup: "Scheduler \u269b", - tooltipText: passive ? "Remaining Effects Errored" : "Commit Errored", - properties: [] - } - } - }); + console.timeStamp( + "Errored", + startTime, + endTime, + currentTrack, + "Scheduler \u269b", + "error" + ); } var valueCursor = createCursor(null), currentlyRenderingFiber$1 = null, @@ -5020,7 +4935,7 @@ function findFirstSuspended(row) { null !== state && ((state = state.dehydrated), null === state || - "$?" === state.data || + isSuspenseInstancePending(state) || isSuspenseInstanceFallback(state)) ) return node; @@ -5307,7 +5222,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$67 = !1; + didReadFromEntangledAsyncAction$68 = !1; do { var updateLane = update.lane & -536870913, shouldSkipUpdate = @@ -5360,11 +5275,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$67 = !0); + (didReadFromEntangledAsyncAction$68 = !0); else if ((renderLanes & scheduledGesture) === scheduledGesture) { update = update.next; scheduledGesture === currentEntangledLane && - (didReadFromEntangledAsyncAction$67 = !0); + (didReadFromEntangledAsyncAction$68 = !0); continue; } else (updateLane = { @@ -5397,7 +5312,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$67 && + didReadFromEntangledAsyncAction$68 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -5492,7 +5407,8 @@ function updateStoreInstance(fiber, inst, nextSnapshot, getSnapshot) { } function subscribeToStore(fiber, inst, subscribe) { return subscribe(function () { - checkIfSnapshotChanged(inst) && forceStoreRerender(fiber); + checkIfSnapshotChanged(inst) && + (startUpdateTimerByLane(2), forceStoreRerender(fiber)); }); } function checkIfSnapshotChanged(inst) { @@ -5605,8 +5521,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$74) { - onActionError(actionQueue, node, error$74); + } catch (error$75) { + onActionError(actionQueue, node, error$75); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -6060,8 +5976,14 @@ function requestFormReset$2(formFiber) { var transition = ReactSharedInternals.T; if (null !== transition && transition.gesture) throw Error(formatProdErrorMessage(555)); - transition = ensureFormComponentIsStateful(formFiber).next.queue; - dispatchSetStateInternal(formFiber, transition, {}, requestUpdateLane()); + transition = ensureFormComponentIsStateful(formFiber); + null === transition.next && (transition = formFiber.alternate.memoizedState); + dispatchSetStateInternal( + formFiber, + transition.next.queue, + {}, + requestUpdateLane() + ); } function useHostTransitionStatus() { return readContext(HostTransitionContext); @@ -6079,15 +6001,15 @@ function refreshCache(fiber, seedKey, seedValue) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$77 = enqueueUpdate(provider, fiber, lane); - null !== root$77 && + var root$78 = enqueueUpdate(provider, fiber, lane); + null !== root$78 && (startUpdateTimerByLane(lane), - scheduleUpdateOnFiber(root$77, provider, lane), - entangleTransitions(root$77, provider, lane)); + scheduleUpdateOnFiber(root$78, provider, lane), + entangleTransitions(root$78, provider, lane)); provider = createCache(); null !== seedKey && void 0 !== seedKey && - null !== root$77 && + null !== root$78 && provider.data.set(seedKey, seedValue); fiber.payload = { cache: provider }; return; @@ -6654,9 +6576,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$81 in Component) - void 0 === newProps[propName$81] && - (newProps[propName$81] = Component[propName$81]); + for (var propName$82 in Component) + void 0 === newProps[propName$82] && + (newProps[propName$82] = Component[propName$82]); } return newProps; } @@ -6702,9 +6624,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$82) { + } catch (e$83) { setTimeout(function () { - throw e$82; + throw e$83; }); } } @@ -6715,9 +6637,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$83) { + } catch (e$84) { setTimeout(function () { - throw e$83; + throw e$84; }); } } @@ -7722,14 +7644,15 @@ function updateSuspenseComponent(current, workInProgress, renderLanes) { scheduleUpdateOnFiber(JSCompiler_temp, current, nextProps), SelectiveHydrationException) ); - "$?" === nextPrimaryChildren.data || renderDidSuspendDelayIfPossible(); + isSuspenseInstancePending(nextPrimaryChildren) || + renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, workInProgress, renderLanes ); } else - "$?" === nextPrimaryChildren.data + isSuspenseInstancePending(nextPrimaryChildren) ? ((workInProgress.flags |= 192), (workInProgress.child = current.child), (workInProgress = null)) @@ -8838,14 +8761,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$125 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$125 = lastTailNode), + for (var lastTailNode$126 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$126 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$125 + null === lastTailNode$126 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$125.sibling = null); + : (lastTailNode$126.sibling = null); } } function bubbleProperties(completedWork) { @@ -8857,53 +8780,53 @@ function bubbleProperties(completedWork) { if (didBailout) if (0 !== (completedWork.mode & 2)) { for ( - var treeBaseDuration$127 = completedWork.selfBaseDuration, - child$128 = completedWork.child; - null !== child$128; + var treeBaseDuration$128 = completedWork.selfBaseDuration, + child$129 = completedWork.child; + null !== child$129; ) - (newChildLanes |= child$128.lanes | child$128.childLanes), - (subtreeFlags |= child$128.subtreeFlags & 65011712), - (subtreeFlags |= child$128.flags & 65011712), - (treeBaseDuration$127 += child$128.treeBaseDuration), - (child$128 = child$128.sibling); - completedWork.treeBaseDuration = treeBaseDuration$127; + (newChildLanes |= child$129.lanes | child$129.childLanes), + (subtreeFlags |= child$129.subtreeFlags & 65011712), + (subtreeFlags |= child$129.flags & 65011712), + (treeBaseDuration$128 += child$129.treeBaseDuration), + (child$129 = child$129.sibling); + completedWork.treeBaseDuration = treeBaseDuration$128; } else for ( - treeBaseDuration$127 = completedWork.child; - null !== treeBaseDuration$127; + treeBaseDuration$128 = completedWork.child; + null !== treeBaseDuration$128; ) (newChildLanes |= - treeBaseDuration$127.lanes | treeBaseDuration$127.childLanes), - (subtreeFlags |= treeBaseDuration$127.subtreeFlags & 65011712), - (subtreeFlags |= treeBaseDuration$127.flags & 65011712), - (treeBaseDuration$127.return = completedWork), - (treeBaseDuration$127 = treeBaseDuration$127.sibling); + treeBaseDuration$128.lanes | treeBaseDuration$128.childLanes), + (subtreeFlags |= treeBaseDuration$128.subtreeFlags & 65011712), + (subtreeFlags |= treeBaseDuration$128.flags & 65011712), + (treeBaseDuration$128.return = completedWork), + (treeBaseDuration$128 = treeBaseDuration$128.sibling); else if (0 !== (completedWork.mode & 2)) { - treeBaseDuration$127 = completedWork.actualDuration; - child$128 = completedWork.selfBaseDuration; + treeBaseDuration$128 = completedWork.actualDuration; + child$129 = completedWork.selfBaseDuration; for (var child = completedWork.child; null !== child; ) (newChildLanes |= child.lanes | child.childLanes), (subtreeFlags |= child.subtreeFlags), (subtreeFlags |= child.flags), - (treeBaseDuration$127 += child.actualDuration), - (child$128 += child.treeBaseDuration), + (treeBaseDuration$128 += child.actualDuration), + (child$129 += child.treeBaseDuration), (child = child.sibling); - completedWork.actualDuration = treeBaseDuration$127; - completedWork.treeBaseDuration = child$128; + completedWork.actualDuration = treeBaseDuration$128; + completedWork.treeBaseDuration = child$129; } else for ( - treeBaseDuration$127 = completedWork.child; - null !== treeBaseDuration$127; + treeBaseDuration$128 = completedWork.child; + null !== treeBaseDuration$128; ) (newChildLanes |= - treeBaseDuration$127.lanes | treeBaseDuration$127.childLanes), - (subtreeFlags |= treeBaseDuration$127.subtreeFlags), - (subtreeFlags |= treeBaseDuration$127.flags), - (treeBaseDuration$127.return = completedWork), - (treeBaseDuration$127 = treeBaseDuration$127.sibling); + treeBaseDuration$128.lanes | treeBaseDuration$128.childLanes), + (subtreeFlags |= treeBaseDuration$128.subtreeFlags), + (subtreeFlags |= treeBaseDuration$128.flags), + (treeBaseDuration$128.return = completedWork), + (treeBaseDuration$128 = treeBaseDuration$128.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -9720,8 +9643,8 @@ function safelyCallComponentWillUnmount( } else try { instance.componentWillUnmount(); - } catch (error$168) { - captureCommitPhaseError(current, nearestMountedAncestor, error$168); + } catch (error$169) { + captureCommitPhaseError(current, nearestMountedAncestor, error$169); } } function safelyAttachRef(current, nearestMountedAncestor) { @@ -9792,8 +9715,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordEffectDuration(current); } else ref(null); - } catch (error$170) { - captureCommitPhaseError(current, nearestMountedAncestor, error$170); + } catch (error$171) { + captureCommitPhaseError(current, nearestMountedAncestor, error$171); } else ref.current = null; } @@ -10730,11 +10653,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$165) { + } catch (error$166) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$165 + error$166 ); } else { @@ -10751,11 +10674,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$166) { + } catch (error$167) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$166 + error$167 ); } recordEffectDuration(); @@ -10766,11 +10689,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$167) { + } catch (error$168) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$167 + error$168 ); } } @@ -11773,25 +11696,25 @@ function commitReconciliationEffects(finishedWork) { ); break; case 5: - var parent$171 = hostParentFiber.stateNode; + var parent$172 = hostParentFiber.stateNode; hostParentFiber.flags & 32 && - (setTextContent(parent$171, ""), (hostParentFiber.flags &= -33)); - var before$172 = getHostSibling(finishedWork); + (setTextContent(parent$172, ""), (hostParentFiber.flags &= -33)); + var before$173 = getHostSibling(finishedWork); insertOrAppendPlacementNode( finishedWork, - before$172, - parent$171, + before$173, + parent$172, parentFragmentInstances ); break; case 3: case 4: - var parent$173 = hostParentFiber.stateNode.containerInfo, - before$174 = getHostSibling(finishedWork); + var parent$174 = hostParentFiber.stateNode.containerInfo, + before$175 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$174, - parent$173, + before$175, + parent$174, parentFragmentInstances ); break; @@ -13297,7 +13220,7 @@ function recursivelyInsertClones( if (null === nextPhase) recursivelyInsertNewFiber(deletions, i, parentViewTransition, 5); else { - var nextPhase$215 = deletions.flags; + var nextPhase$216 = deletions.flags; switch (deletions.tag) { case 26: recursivelyInsertClones( @@ -13323,16 +13246,16 @@ function recursivelyInsertClones( (setTextContent(clone, ""), (viewTransitionMutationContext = !0))) : (clone = clone.cloneNode(!1)); - if (nextPhase$215 & 4) { - nextPhase$215 = clone; + if (nextPhase$216 & 4) { + nextPhase$216 = clone; var newProps = deletions.memoizedProps; updateProperties( - nextPhase$215, + nextPhase$216, deletions.type, nextPhase.memoizedProps, newProps ); - nextPhase$215[internalPropsKey] = newProps; + nextPhase$216[internalPropsKey] = newProps; } 1 === visitPhase || 2 === visitPhase ? (appendChild(i, clone), @@ -13351,7 +13274,7 @@ function recursivelyInsertClones( if (null === parentViewTransition) throw Error(formatProdErrorMessage(162)); parentViewTransition = parentViewTransition.cloneNode(!1); - nextPhase$215 & 4 && + nextPhase$216 & 4 && ((parentViewTransition.nodeValue = nextPhase.memoizedProps), (viewTransitionMutationContext = !0)); appendChild(i, parentViewTransition); @@ -13364,7 +13287,7 @@ function recursivelyInsertClones( case 22: null === deletions.memoizedState ? ((nextPhase = - 0 === visitPhase && 0 !== (nextPhase$215 & 8192) + 0 === visitPhase && 0 !== (nextPhase$216 & 8192) ? 1 : visitPhase), recursivelyInsertClones( @@ -13382,8 +13305,8 @@ function recursivelyInsertClones( parentViewTransition = pushMutationContext(); clone = deletions.stateNode; clone.clones = null; - nextPhase$215 = 1 === visitPhase ? 2 : visitPhase; - recursivelyInsertClones(deletions, i, clone, nextPhase$215); + nextPhase$216 = 1 === visitPhase ? 2 : visitPhase; + recursivelyInsertClones(deletions, i, clone, nextPhase$216); viewTransitionMutationContext && (deletions.flags |= 4); 1 === visitPhase ? applyExitViewTransition(deletions) @@ -13633,47 +13556,56 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { switch (yieldReason) { case 3: case 2: - var startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Suspended", reusableComponentOptions)); + console.timeStamp( + "Suspended", + yieldStartTime, + yieldEndTime, + "Components \u269b", + void 0, + "primary-light" + ); break; case 9: - startTime = yieldStartTime; supportsUserTiming && - ((reusableComponentDevToolDetails.color = "primary-light"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Action", reusableComponentOptions)); + console.timeStamp( + "Action", + yieldStartTime, + yieldEndTime, + "Components \u269b", + void 0, + "primary-light" + ); break; default: - if (((startTime = yieldStartTime), supportsUserTiming)) { - var yieldDuration = yieldEndTime - startTime; + if (supportsUserTiming) { + var yieldDuration = yieldEndTime - yieldStartTime; 3 > yieldDuration || - ((reusableComponentDevToolDetails.color = + console.timeStamp( + "Blocked", + yieldStartTime, + yieldEndTime, + "Components \u269b", + void 0, 5 > yieldDuration ? "primary-light" : 10 > yieldDuration ? "primary" : 100 > yieldDuration ? "primary-dark" - : "error"), - (reusableComponentOptions.start = startTime), - (reusableComponentOptions.end = yieldEndTime), - performance.measure("Blocked", reusableComponentOptions)); + : "error" + ); } } } var exitStatus = (yieldEndTime = - (!forceSync && - 0 === (lanes & 124) && - 0 === (lanes & root$jscomp$0.expiredLanes)) || - checkIfRootIsPrerendering(root$jscomp$0, lanes)) - ? renderRootConcurrent(root$jscomp$0, lanes) - : renderRootSync(root$jscomp$0, lanes, !0); - yieldDuration = yieldEndTime; + (!forceSync && + 0 === (lanes & 124) && + 0 === (lanes & root$jscomp$0.expiredLanes)) || + checkIfRootIsPrerendering(root$jscomp$0, lanes)) + ? renderRootConcurrent(root$jscomp$0, lanes) + : renderRootSync(root$jscomp$0, lanes, !0), + renderWasConcurrent = yieldEndTime; do { if (0 === exitStatus) { workInProgressRootIsPrerendering && @@ -13684,25 +13616,30 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { yieldReason = lanes; break; } else { - startTime = now$1(); + yieldDuration = now$1(); forceSync = root$jscomp$0.current.alternate; - if (yieldDuration && !isRenderConsistentWithExternalStores(forceSync)) { + if ( + renderWasConcurrent && + !isRenderConsistentWithExternalStores(forceSync) + ) { setCurrentTrackFromLanes(lanes); - forceSync = renderStartTime; - yieldDuration = startTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "error"), - (reusableLaneOptions.start = forceSync), - (reusableLaneOptions.end = yieldDuration), - performance.measure("Teared Render", reusableLaneOptions)); - finalizeRender(lanes, startTime); + console.timeStamp( + "Teared Render", + renderStartTime, + yieldDuration, + currentTrack, + "Scheduler \u269b", + "error" + ); + finalizeRender(lanes, yieldDuration); exitStatus = renderRootSync(root$jscomp$0, lanes, !1); - yieldDuration = !1; + renderWasConcurrent = !1; continue; } if (2 === exitStatus) { - yieldDuration = lanes; - if (root$jscomp$0.errorRecoveryDisabledLanes & yieldDuration) + renderWasConcurrent = lanes; + if (root$jscomp$0.errorRecoveryDisabledLanes & renderWasConcurrent) var JSCompiler_inline_result = 0; else (JSCompiler_inline_result = root$jscomp$0.pendingLanes & -536870913), @@ -13714,47 +13651,48 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { : 0); if (0 !== JSCompiler_inline_result) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldDuration); + finalizeRender(lanes, yieldDuration); lanes = JSCompiler_inline_result; var root = root$jscomp$0; - startTime = workInProgressRootConcurrentErrors; + yieldDuration = workInProgressRootConcurrentErrors; var wasRootDehydrated = root.current.memoizedState.isDehydrated; wasRootDehydrated && (prepareFreshStack(root, JSCompiler_inline_result).flags |= 256); exitStatus = renderRootSync(root, JSCompiler_inline_result, !1); 2 !== exitStatus && (workInProgressRootDidAttachPingListener && !wasRootDehydrated - ? ((root.errorRecoveryDisabledLanes |= yieldDuration), - (workInProgressRootInterleavedUpdatedLanes |= yieldDuration), + ? ((root.errorRecoveryDisabledLanes |= renderWasConcurrent), + (workInProgressRootInterleavedUpdatedLanes |= + renderWasConcurrent), (exitStatus = 4)) - : ((yieldDuration = workInProgressRootRecoverableErrors), - (workInProgressRootRecoverableErrors = startTime), - null !== yieldDuration && - ((startTime = yieldDuration), + : ((renderWasConcurrent = workInProgressRootRecoverableErrors), + (workInProgressRootRecoverableErrors = yieldDuration), + null !== renderWasConcurrent && + ((yieldDuration = renderWasConcurrent), null === workInProgressRootRecoverableErrors - ? (workInProgressRootRecoverableErrors = startTime) + ? (workInProgressRootRecoverableErrors = yieldDuration) : workInProgressRootRecoverableErrors.push.apply( workInProgressRootRecoverableErrors, - startTime + yieldDuration )))); - yieldDuration = !1; + renderWasConcurrent = !1; if (2 !== exitStatus) continue; - else startTime = now$1(); + else yieldDuration = now$1(); } } if (1 === exitStatus) { setCurrentTrackFromLanes(lanes); - logErroredRenderPhase(renderStartTime, startTime); - finalizeRender(lanes, startTime); + logErroredRenderPhase(renderStartTime, yieldDuration); + finalizeRender(lanes, yieldDuration); prepareFreshStack(root$jscomp$0, 0); markRootSuspended(root$jscomp$0, lanes, 0, !0); break; } a: { yieldEndTime = root$jscomp$0; - yieldDuration = exitStatus; - switch (yieldDuration) { + renderWasConcurrent = exitStatus; + switch (renderWasConcurrent) { case 0: case 1: throw Error(formatProdErrorMessage(345)); @@ -13762,13 +13700,13 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { if ((lanes & 4194048) !== lanes) break; case 6: setCurrentTrackFromLanes(lanes); - logSuspendedRenderPhase(renderStartTime, startTime, lanes); - finalizeRender(lanes, startTime); + logSuspendedRenderPhase(renderStartTime, yieldDuration, lanes); + finalizeRender(lanes, yieldDuration); forceSync = lanes; 0 !== (forceSync & 3) || 0 !== (forceSync & 124) - ? (blockingSuspendedTime = startTime) + ? (blockingSuspendedTime = yieldDuration) : 0 !== (forceSync & 4194048) && - (transitionSuspendedTime = startTime); + (transitionSuspendedTime = yieldDuration); markRootSuspended( yieldEndTime, lanes, @@ -13810,10 +13748,10 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + renderWasConcurrent, 2, renderStartTime, - startTime + yieldDuration ), exitStatus ); @@ -13830,10 +13768,10 @@ function performWorkOnRoot(root$jscomp$0, lanes, forceSync) { workInProgressRootInterleavedUpdatedLanes, workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings, - yieldDuration, + renderWasConcurrent, 0, renderStartTime, - startTime + yieldDuration ); } } @@ -14011,10 +13949,38 @@ function finalizeRender(lanes, finalizationTime) { } function prepareFreshStack(root, lanes) { supportsUserTiming && - (performance.mark("Blocking Track", blockingLaneMarker), - performance.mark("Transition Track", transitionLaneMarker), - performance.mark("Suspense Track", suspenseLaneMarker), - performance.mark("Idle Track", idleLaneMarker)); + (console.timeStamp( + "Blocking Track", + 0.003, + 0.003, + "Blocking", + "Scheduler \u269b", + "primary-light" + ), + console.timeStamp( + "Transition Track", + 0.003, + 0.003, + "Transition", + "Scheduler \u269b", + "primary-light" + ), + console.timeStamp( + "Suspense Track", + 0.003, + 0.003, + "Suspense", + "Scheduler \u269b", + "primary-light" + ), + console.timeStamp( + "Idle Track", + 0.003, + 0.003, + "Idle", + "Scheduler \u269b", + "primary-light" + )); var previousRenderStartTime = renderStartTime; renderStartTime = now(); if (0 !== workInProgressRootRenderLanes && 0 < previousRenderStartTime) { @@ -14027,18 +13993,18 @@ function prepareFreshStack(root, lanes) { else { var endTime = renderStartTime; supportsUserTiming && - ((reusableLaneDevToolDetails.color = - (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( (lanes & 536870912) === lanes ? "Prewarm" : (lanes & 201326741) === lanes ? "Interrupted Hydration" : "Interrupted Render", - reusableLaneOptions - )); + previousRenderStartTime, + endTime, + currentTrack, + "Scheduler \u269b", + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); } finalizeRender(workInProgressRootRenderLanes, renderStartTime); } @@ -14067,37 +14033,36 @@ function prepareFreshStack(root, lanes) { isSpawnedUpdate = blockingSpawnedUpdate, renderStartTime$jscomp$0 = renderStartTime; supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Blocking"), + ((currentTrack = "Blocking"), 0 < endTime && null !== eventType && - ((reusableLaneDevToolDetails.color = eventIsRepeat - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = + console.timeStamp( + eventIsRepeat ? "" : "Event: " + eventType, + endTime, 0 < previousRenderStartTime ? previousRenderStartTime - : renderStartTime$jscomp$0), - performance.measure( - eventIsRepeat ? "" : "Event: " + eventType, - reusableLaneOptions - )), + : renderStartTime$jscomp$0, + currentTrack, + "Scheduler \u269b", + eventIsRepeat ? "secondary-light" : "warning" + ), 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate - ? "error" - : (lanes & 738197653) === lanes - ? "tertiary-light" - : "primary-light"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( + console.timeStamp( isSpawnedUpdate ? "Cascading Update" : 5 < renderStartTime$jscomp$0 - previousRenderStartTime ? "Update Blocked" : "Update", - reusableLaneOptions - ))); + previousRenderStartTime, + renderStartTime$jscomp$0, + currentTrack, + "Scheduler \u269b", + isSpawnedUpdate + ? "error" + : (lanes & 738197653) === lanes + ? "tertiary-light" + : "primary-light" + )); blockingSuspendedTime = blockingUpdateTime = -1.1; blockingEventIsRepeat = !0; blockingSpawnedUpdate = !1; @@ -14126,37 +14091,39 @@ function prepareFreshStack(root, lanes) { (isSpawnedUpdate = transitionEventIsRepeat), (renderStartTime$jscomp$0 = renderStartTime), supportsUserTiming && - ((reusableLaneDevToolDetails.track = "Transition"), + ((currentTrack = "Transition"), 0 < eventType && null !== eventIsRepeat && - ((reusableLaneDevToolDetails.color = isSpawnedUpdate - ? "secondary-light" - : "warning"), - (reusableLaneOptions.start = eventType), - (reusableLaneOptions.end = + console.timeStamp( + isSpawnedUpdate ? "" : "Event: " + eventIsRepeat, + eventType, 0 < previousRenderStartTime ? previousRenderStartTime : 0 < endTime ? endTime - : renderStartTime$jscomp$0), - performance.measure( - isSpawnedUpdate ? "" : "Event: " + eventIsRepeat, - reusableLaneOptions - )), + : renderStartTime$jscomp$0, + currentTrack, + "Scheduler \u269b", + isSpawnedUpdate ? "secondary-light" : "warning" + ), 0 < previousRenderStartTime && - ((reusableLaneDevToolDetails.color = "primary-dark"), - (reusableLaneOptions.start = previousRenderStartTime), - (reusableLaneOptions.end = - 0 < endTime ? endTime : renderStartTime$jscomp$0), - performance.measure("Action", reusableLaneOptions)), + console.timeStamp( + "Action", + previousRenderStartTime, + 0 < endTime ? endTime : renderStartTime$jscomp$0, + currentTrack, + "Scheduler \u269b", + "primary-dark" + ), 0 < endTime && - ((reusableLaneDevToolDetails.color = "primary-light"), - (reusableLaneOptions.start = endTime), - (reusableLaneOptions.end = renderStartTime$jscomp$0), - performance.measure( + console.timeStamp( 5 < renderStartTime$jscomp$0 - endTime ? "Update Blocked" : "Update", - reusableLaneOptions - ))), + endTime, + renderStartTime$jscomp$0, + currentTrack, + "Scheduler \u269b", + "primary-light" + )), (transitionSuspendedTime = transitionUpdateTime = transitionStartTime = @@ -14332,8 +14299,8 @@ function renderRootSync(root, lanes, shouldYieldForPrerendering) { workLoopSync(); memoizedUpdaters = workInProgressRootExitStatus; break; - } catch (thrownValue$222) { - handleThrow(root, thrownValue$222); + } catch (thrownValue$223) { + handleThrow(root, thrownValue$223); } while (1); lanes && root.shellSuspendCounter++; @@ -14458,8 +14425,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrentByScheduler(); break; - } catch (thrownValue$224) { - handleThrow(root, thrownValue$224); + } catch (thrownValue$225) { + handleThrow(root, thrownValue$225); } while (1); lastContextDependency = currentlyRenderingFiber$1 = null; @@ -14671,26 +14638,27 @@ function commitRoot( ? logErroredRenderPhase(completedRenderStartTime, completedRenderEndTime) : null !== recoverableErrors ? supportsUserTiming && - performance.measure("Recovered", { - start: completedRenderStartTime, - end: completedRenderEndTime, - detail: { - devtools: { - color: "primary-dark", - track: reusableLaneDevToolDetails.track, - trackGroup: "Scheduler \u269b", - tooltipText: - null !== finishedWork && - null !== finishedWork.alternate && - finishedWork.alternate.memoizedState.isDehydrated && - 0 !== (finishedWork.flags & 256) - ? "Hydration Failed" - : "Recovered after Error", - properties: [] - } - } - }) - : logRenderPhase(completedRenderStartTime, completedRenderEndTime, lanes); + console.timeStamp( + "Recovered", + completedRenderStartTime, + completedRenderEndTime, + currentTrack, + "Scheduler \u269b", + "error" + ) + : supportsUserTiming && + console.timeStamp( + (lanes & 536870912) === lanes + ? "Prepared" + : (lanes & 201326741) === lanes + ? "Hydrated" + : "Render", + completedRenderStartTime, + completedRenderEndTime, + currentTrack, + "Scheduler \u269b", + (lanes & 738197653) === lanes ? "tertiary-dark" : "primary-dark" + ); if (null === finishedWork) null !== root.stoppingGestures && stopCompletedGestures(root); else { @@ -14738,9 +14706,25 @@ function commitRoot( commitErrors = null; commitStartTime = now(); 1 === suspendedCommitReason - ? logSuspendedCommitPhase(completedRenderEndTime, commitStartTime) + ? supportsUserTiming && + console.timeStamp( + "Suspended on CSS or Images", + completedRenderEndTime, + commitStartTime, + currentTrack, + "Scheduler \u269b", + "secondary-light" + ) : 2 === suspendedCommitReason && - logSuspenseThrottlePhase(completedRenderEndTime, commitStartTime); + supportsUserTiming && + console.timeStamp( + "Throttled", + completedRenderEndTime, + commitStartTime, + currentTrack, + "Scheduler \u269b", + "secondary-light" + ); shouldStartViewTransition = !1; suspendedCommitReason = 0 !== (finishedWork.flags & 13878); if (0 !== (finishedWork.subtreeFlags & 13878) || suspendedCommitReason) { @@ -14962,17 +14946,16 @@ function flushSpawnedWork() { 0 === suspendedCommitReason ? completedRenderEndTime : commitStartTime; suspendedCommitReason = commitEndTime; null !== commitErrors - ? logCommitErrored( + ? logCommitErrored(completedRenderEndTime, suspendedCommitReason) + : supportsUserTiming && + console.timeStamp( + "Commit", completedRenderEndTime, suspendedCommitReason, - commitErrors, - !1 - ) - : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = completedRenderEndTime), - (reusableLaneOptions.end = suspendedCommitReason), - performance.measure("Commit", reusableLaneOptions)); + currentTrack, + "Scheduler \u269b", + "secondary-dark" + ); completedRenderEndTime = (lanes & 335544064) === lanes ? 10262 : 10256; (completedRenderEndTime = 0 !== finishedWork.actualDuration || @@ -15155,26 +15138,26 @@ function commitGestureOnRoot(root, finishedWork) { } var rotate = computedStyle.rotate; if ("none" !== rotate && "" !== rotate) { - var parts$302 = rotate.split(" "); + var parts$303 = rotate.split(" "); transform = - 1 === parts$302.length - ? "rotate(" + parts$302[0] + ") " + transform - : 2 === parts$302.length + 1 === parts$303.length + ? "rotate(" + parts$303[0] + ") " + transform + : 2 === parts$303.length ? "rotate" + - parts$302[0].toUpperCase() + + parts$303[0].toUpperCase() + "(" + - parts$302[1] + + parts$303[1] + ") " + transform - : "rotate3d(" + parts$302.join(", ") + ") " + transform; + : "rotate3d(" + parts$303.join(", ") + ") " + transform; } var translate = computedStyle.translate; if ("none" !== translate && "" !== translate) { - var parts$303 = translate.split(" "); + var parts$304 = translate.split(" "); transform = - (3 === parts$303.length ? "translate3d" : "translate") + + (3 === parts$304.length ? "translate3d" : "translate") + "(" + - parts$303.join(", ") + + parts$304.join(", ") + ") " + transform; } @@ -15325,17 +15308,15 @@ function flushPassiveEffects(wasDelayedCommit) { var passiveEffectStartTime = 0; commitErrors = null; passiveEffectStartTime = now$1(); - var startTime = commitEndTime, - endTime = passiveEffectStartTime; - wasDelayedCommit = !!wasDelayedCommit; supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-light"), - (reusableLaneOptions.start = startTime), - (reusableLaneOptions.end = endTime), - performance.measure( + console.timeStamp( wasDelayedCommit ? "Waiting for Paint" : "", - reusableLaneOptions - )); + commitEndTime, + passiveEffectStartTime, + currentTrack, + "Scheduler \u269b", + "secondary-light" + ); wasDelayedCommit = executionContext; executionContext |= 4; var finishedWork = renderPriority.current; @@ -15355,17 +15336,16 @@ function flushPassiveEffects(wasDelayedCommit) { var passiveEffectsEndTime = now$1(); finishedWork$jscomp$0 = passiveEffectStartTime; null !== commitErrors - ? logCommitErrored( + ? logCommitErrored(finishedWork$jscomp$0, passiveEffectsEndTime) + : supportsUserTiming && + console.timeStamp( + "Remaining Effects", finishedWork$jscomp$0, passiveEffectsEndTime, - commitErrors, - !0 - ) - : supportsUserTiming && - ((reusableLaneDevToolDetails.color = "secondary-dark"), - (reusableLaneOptions.start = finishedWork$jscomp$0), - (reusableLaneOptions.end = passiveEffectsEndTime), - performance.measure("Remaining Effects", reusableLaneOptions)); + currentTrack, + "Scheduler \u269b", + "secondary-dark" + ); finalizeRender(lanes, passiveEffectsEndTime); flushSyncWorkAcrossRoots_impl(0, !1); if ( @@ -15537,14 +15517,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$230 = firstScheduledRoot; null !== root$230; ) { + for (var root$231 = firstScheduledRoot; null !== root$231; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$230.pendingLanes; + var pendingLanes = root$231.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$230.suspendedLanes, - pingedLanes = root$230.pingedLanes; + var suspendedLanes = root$231.suspendedLanes, + pingedLanes = root$231.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -15558,21 +15538,21 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$230, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$231, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$230, - root$230 === workInProgressRoot ? JSCompiler_inline_result : 0, - null !== root$230.cancelPendingCommit || - -1 !== root$230.timeoutHandle + root$231, + root$231 === workInProgressRoot ? JSCompiler_inline_result : 0, + null !== root$231.cancelPendingCommit || + -1 !== root$231.timeoutHandle )), (0 === (JSCompiler_inline_result & 3) && 64 !== JSCompiler_inline_result) || - checkIfRootIsPrerendering(root$230, JSCompiler_inline_result) || + checkIfRootIsPrerendering(root$231, JSCompiler_inline_result) || ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$230, JSCompiler_inline_result)); - root$230 = root$230.next; + performSyncWorkOnRoot(root$231, JSCompiler_inline_result)); + root$231 = root$231.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -15857,20 +15837,20 @@ function debounceScrollEnd(targetInst, nativeEvent, nativeEventTarget) { (nativeEventTarget[internalScrollTimer] = targetInst)); } for ( - var i$jscomp$inline_1929 = 0; - i$jscomp$inline_1929 < simpleEventPluginEvents.length; - i$jscomp$inline_1929++ + var i$jscomp$inline_1949 = 0; + i$jscomp$inline_1949 < simpleEventPluginEvents.length; + i$jscomp$inline_1949++ ) { - var eventName$jscomp$inline_1930 = - simpleEventPluginEvents[i$jscomp$inline_1929], - domEventName$jscomp$inline_1931 = - eventName$jscomp$inline_1930.toLowerCase(), - capitalizedEvent$jscomp$inline_1932 = - eventName$jscomp$inline_1930[0].toUpperCase() + - eventName$jscomp$inline_1930.slice(1); + var eventName$jscomp$inline_1950 = + simpleEventPluginEvents[i$jscomp$inline_1949], + domEventName$jscomp$inline_1951 = + eventName$jscomp$inline_1950.toLowerCase(), + capitalizedEvent$jscomp$inline_1952 = + eventName$jscomp$inline_1950[0].toUpperCase() + + eventName$jscomp$inline_1950.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1931, - "on" + capitalizedEvent$jscomp$inline_1932 + domEventName$jscomp$inline_1951, + "on" + capitalizedEvent$jscomp$inline_1952 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -17127,34 +17107,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$244 = props[hasSrc]; - if (null != propValue$244) + var propValue$245 = props[hasSrc]; + if (null != propValue$245) switch (hasSrc) { case "name": - hasSrcSet = propValue$244; + hasSrcSet = propValue$245; break; case "type": - propValue = propValue$244; + propValue = propValue$245; break; case "checked": - checked = propValue$244; + checked = propValue$245; break; case "defaultChecked": - defaultChecked = propValue$244; + defaultChecked = propValue$245; break; case "value": - propKey = propValue$244; + propKey = propValue$245; break; case "defaultValue": - defaultValue = propValue$244; + defaultValue = propValue$245; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$244) + if (null != propValue$245) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$244, props, null); + setProp(domElement, tag, hasSrc, propValue$245, props, null); } } initInput( @@ -17293,14 +17273,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$244 in props) - props.hasOwnProperty(propValue$244) && - ((hasSrc = props[propValue$244]), + for (propValue$245 in props) + props.hasOwnProperty(propValue$245) && + ((hasSrc = props[propValue$245]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$244, + propValue$245, hasSrc, props, void 0 @@ -17348,14 +17328,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$261 in nextProps) { - var propKey = nextProps[propKey$261]; - lastProp = lastProps[propKey$261]; + for (var propKey$262 in nextProps) { + var propKey = nextProps[propKey$262]; + lastProp = lastProps[propKey$262]; if ( - nextProps.hasOwnProperty(propKey$261) && + nextProps.hasOwnProperty(propKey$262) && (null != propKey || null != lastProp) ) - switch (propKey$261) { + switch (propKey$262) { case "type": propKey !== lastProp && (viewTransitionMutationContext = !0); type = propKey; @@ -17390,7 +17370,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$261, + propKey$262, propKey, nextProps, lastProp @@ -17409,7 +17389,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$261 = null; + propKey = value = defaultValue = propKey$262 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -17441,7 +17421,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { switch (name) { case "value": type !== lastDefaultValue && (viewTransitionMutationContext = !0); - propKey$261 = type; + propKey$262 = type; break; case "defaultValue": type !== lastDefaultValue && (viewTransitionMutationContext = !0); @@ -17464,15 +17444,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$261 - ? updateOptions(domElement, !!lastProps, propKey$261, !1) + null != propKey$262 + ? updateOptions(domElement, !!lastProps, propKey$262, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$261 = null; + propKey = propKey$262 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -17497,7 +17477,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { switch (value) { case "value": name !== type && (viewTransitionMutationContext = !0); - propKey$261 = name; + propKey$262 = name; break; case "defaultValue": name !== type && (viewTransitionMutationContext = !0); @@ -17512,17 +17492,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$261, propKey); + updateTextarea(domElement, propKey$262, propKey); return; case "option": - for (var propKey$277 in lastProps) + for (var propKey$278 in lastProps) if ( - ((propKey$261 = lastProps[propKey$277]), - lastProps.hasOwnProperty(propKey$277) && - null != propKey$261 && - !nextProps.hasOwnProperty(propKey$277)) + ((propKey$262 = lastProps[propKey$278]), + lastProps.hasOwnProperty(propKey$278) && + null != propKey$262 && + !nextProps.hasOwnProperty(propKey$278)) ) - switch (propKey$277) { + switch (propKey$278) { case "selected": domElement.selected = !1; break; @@ -17530,34 +17510,34 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$277, + propKey$278, null, nextProps, - propKey$261 + propKey$262 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$261 = nextProps[lastDefaultValue]), + ((propKey$262 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$261 !== propKey && - (null != propKey$261 || null != propKey)) + propKey$262 !== propKey && + (null != propKey$262 || null != propKey)) ) switch (lastDefaultValue) { case "selected": - propKey$261 !== propKey && (viewTransitionMutationContext = !0); + propKey$262 !== propKey && (viewTransitionMutationContext = !0); domElement.selected = - propKey$261 && - "function" !== typeof propKey$261 && - "symbol" !== typeof propKey$261; + propKey$262 && + "function" !== typeof propKey$262 && + "symbol" !== typeof propKey$262; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$261, + propKey$262, nextProps, propKey ); @@ -17578,24 +17558,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$282 in lastProps) - (propKey$261 = lastProps[propKey$282]), - lastProps.hasOwnProperty(propKey$282) && - null != propKey$261 && - !nextProps.hasOwnProperty(propKey$282) && - setProp(domElement, tag, propKey$282, null, nextProps, propKey$261); + for (var propKey$283 in lastProps) + (propKey$262 = lastProps[propKey$283]), + lastProps.hasOwnProperty(propKey$283) && + null != propKey$262 && + !nextProps.hasOwnProperty(propKey$283) && + setProp(domElement, tag, propKey$283, null, nextProps, propKey$262); for (checked in nextProps) if ( - ((propKey$261 = nextProps[checked]), + ((propKey$262 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$261 !== propKey && - (null != propKey$261 || null != propKey)) + propKey$262 !== propKey && + (null != propKey$262 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$261) + if (null != propKey$262) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -17603,7 +17583,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$261, + propKey$262, nextProps, propKey ); @@ -17611,49 +17591,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$287 in lastProps) - (propKey$261 = lastProps[propKey$287]), - lastProps.hasOwnProperty(propKey$287) && - void 0 !== propKey$261 && - !nextProps.hasOwnProperty(propKey$287) && + for (var propKey$288 in lastProps) + (propKey$262 = lastProps[propKey$288]), + lastProps.hasOwnProperty(propKey$288) && + void 0 !== propKey$262 && + !nextProps.hasOwnProperty(propKey$288) && setPropOnCustomElement( domElement, tag, - propKey$287, + propKey$288, void 0, nextProps, - propKey$261 + propKey$262 ); for (defaultChecked in nextProps) - (propKey$261 = nextProps[defaultChecked]), + (propKey$262 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$261 === propKey || - (void 0 === propKey$261 && void 0 === propKey) || + propKey$262 === propKey || + (void 0 === propKey$262 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$261, + propKey$262, nextProps, propKey ); return; } } - for (var propKey$292 in lastProps) - (propKey$261 = lastProps[propKey$292]), - lastProps.hasOwnProperty(propKey$292) && - null != propKey$261 && - !nextProps.hasOwnProperty(propKey$292) && - setProp(domElement, tag, propKey$292, null, nextProps, propKey$261); + for (var propKey$293 in lastProps) + (propKey$262 = lastProps[propKey$293]), + lastProps.hasOwnProperty(propKey$293) && + null != propKey$262 && + !nextProps.hasOwnProperty(propKey$293) && + setProp(domElement, tag, propKey$293, null, nextProps, propKey$262); for (lastProp in nextProps) - (propKey$261 = nextProps[lastProp]), + (propKey$262 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$261 === propKey || - (null == propKey$261 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$261, nextProps, propKey); + propKey$262 === propKey || + (null == propKey$262 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$262, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -17762,7 +17742,13 @@ function clearHydrationBoundary(parentInstance, hydrationInstance) { return; } depth--; - } else if ("$" === node || "$?" === node || "$!" === node || "&" === node) + } else if ( + "$" === node || + "$?" === node || + "$~" === node || + "$!" === node || + "&" === node + ) depth++; else if ("html" === node) releaseSingletonInstance(parentInstance.ownerDocument.documentElement); @@ -17807,7 +17793,8 @@ function hideOrUnhideDehydratedBoundary(suspenseInstance, isHidden) { if (0 === suspenseInstance) break; else suspenseInstance--; else - ("$" !== node && "$?" !== node && "$!" !== node) || suspenseInstance++; + ("$" !== node && "$?" !== node && "$~" !== node && "$!" !== node) || + suspenseInstance++; node = nextNode; } while (node); } @@ -18218,20 +18205,20 @@ function startGestureTransition( ))) : (isExitGroupAnim = !0); } - var timing$307 = pseudoElement.getTiming(); + var timing$308 = pseudoElement.getTiming(); anim = rangeEnd - - (("number" === typeof timing$307.duration - ? timing$307.duration + (("number" === typeof timing$308.duration + ? timing$308.duration : 0) + - timing$307.delay) * + timing$308.delay) * longestDuration; - groupName = rangeEnd - timing$307.delay * longestDuration; + groupName = rangeEnd - timing$308.delay * longestDuration; if ( - "reverse" === timing$307.direction || - "alternate-reverse" === timing$307.direction + "reverse" === timing$308.direction || + "alternate-reverse" === timing$308.direction ) - (timing$307 = anim), (anim = groupName), (groupName = timing$307); + (timing$308 = anim), (anim = groupName), (groupName = timing$308); animateGesture( pseudoElement.getKeyframes(), pseudoElement.target, @@ -18661,15 +18648,19 @@ function canHydrateHydrationBoundary(instance, inRootOrSingleton) { } return instance; } +function isSuspenseInstancePending(instance) { + return "$?" === instance.data || "$~" === instance.data; +} function isSuspenseInstanceFallback(instance) { return ( "$!" === instance.data || - ("$?" === instance.data && "complete" === instance.ownerDocument.readyState) + ("$?" === instance.data && "loading" !== instance.ownerDocument.readyState) ); } function registerSuspenseInstanceRetry(instance, callback) { var ownerDocument = instance.ownerDocument; - if ("$?" !== instance.data || "complete" === ownerDocument.readyState) + if ("$~" === instance.data) instance._reactRetry = callback; + else if ("$?" !== instance.data || "loading" !== ownerDocument.readyState) callback(); else { var listener = function () { @@ -18690,6 +18681,7 @@ function getNextHydratable(node) { "$" === nodeType || "$!" === nodeType || "$?" === nodeType || + "$~" === nodeType || "&" === nodeType || "F!" === nodeType || "F" === nodeType @@ -18711,7 +18703,11 @@ function getNextHydratableInstanceAfterHydrationBoundary(hydrationInstance) { return getNextHydratable(hydrationInstance.nextSibling); depth--; } else - ("$" !== data && "$!" !== data && "$?" !== data && "&" !== data) || + ("$" !== data && + "$!" !== data && + "$?" !== data && + "$~" !== data && + "&" !== data) || depth++; } hydrationInstance = hydrationInstance.nextSibling; @@ -18723,7 +18719,13 @@ function getParentHydrationBoundary(targetInstance) { for (var depth = 0; targetInstance; ) { if (8 === targetInstance.nodeType) { var data = targetInstance.data; - if ("$" === data || "$!" === data || "$?" === data || "&" === data) { + if ( + "$" === data || + "$!" === data || + "$?" === data || + "$~" === data || + "&" === data + ) { if (0 === depth) return targetInstance; depth--; } else ("/$" !== data && "/&" !== data) || depth++; @@ -19070,26 +19072,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$312 = getResourcesFromRoot( + var styles$313 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$313 = styles$312.get(type); - resource$313 || + resource$314 = styles$313.get(type); + resource$314 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$313 = { + (resource$314 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$312.set(type, resource$313), - (styles$312 = JSCompiler_inline_result.querySelector( + styles$313.set(type, resource$314), + (styles$313 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$312._p && - ((resource$313.instance = styles$312), - (resource$313.state.loading = 5)), + !styles$313._p && + ((resource$314.instance = styles$313), + (resource$314.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -19102,16 +19104,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$312 || + styles$313 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$313.state + resource$314.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$313; + return resource$314; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -19208,37 +19210,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$318 = hoistableRoot.querySelector( + var instance$319 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$318) + if (instance$319) return ( (resource.state.loading |= 4), - (resource.instance = instance$318), - markNodeAsHoistable(instance$318), - instance$318 + (resource.instance = instance$319), + markNodeAsHoistable(instance$319), + instance$319 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$318 = ( + instance$319 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$318); - var linkInstance = instance$318; + markNodeAsHoistable(instance$319); + var linkInstance = instance$319; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$318, "link", instance); + setInitialProperties(instance$319, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$318, props.precedence, hoistableRoot); - return (resource.instance = instance$318); + insertStylesheet(instance$319, props.precedence, hoistableRoot); + return (resource.instance = instance$319); case "script": - instance$318 = getScriptKey(props.src); + instance$319 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$318) + getScriptSelectorFromKey(instance$319) )) ) return ( @@ -19247,7 +19249,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$318))) + if ((styleProps = preloadPropsMap.get(instance$319))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -20329,16 +20331,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_2245 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_2265 = React.version; if ( - "19.2.0-experimental-197d6a04-20250424" !== - isomorphicReactPackageVersion$jscomp$inline_2245 + "19.2.0-experimental-c129c242-20250505" !== + isomorphicReactPackageVersion$jscomp$inline_2265 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_2245, - "19.2.0-experimental-197d6a04-20250424" + isomorphicReactPackageVersion$jscomp$inline_2265, + "19.2.0-experimental-c129c242-20250505" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -20358,24 +20360,24 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2891 = { +var internals$jscomp$inline_2903 = { bundleType: 0, - version: "19.2.0-experimental-197d6a04-20250424", + version: "19.2.0-experimental-c129c242-20250505", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.2.0-experimental-197d6a04-20250424" + reconcilerVersion: "19.2.0-experimental-c129c242-20250505" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2892 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2904 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2892.isDisabled && - hook$jscomp$inline_2892.supportsFiber + !hook$jscomp$inline_2904.isDisabled && + hook$jscomp$inline_2904.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2892.inject( - internals$jscomp$inline_2891 + (rendererID = hook$jscomp$inline_2904.inject( + internals$jscomp$inline_2903 )), - (injectedHook = hook$jscomp$inline_2892); + (injectedHook = hook$jscomp$inline_2904); } catch (err) {} } function noop() {} @@ -20628,7 +20630,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.2.0-experimental-197d6a04-20250424"; +exports.version = "19.2.0-experimental-c129c242-20250505"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js index c95d808c4a29b..89a19faa383fb 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js @@ -1398,14 +1398,29 @@ return content; } function injectFormReplayingRuntime(resumableState, renderState) { - (resumableState.instructions & 16) !== NothingSent || - renderState.externalRuntimeScript || - ((resumableState.instructions |= 16), - renderState.bootstrapChunks.unshift( - renderState.startInlineScript, - formReplayingRuntimeScript, - "\x3c/script>" - )); + if ( + (resumableState.instructions & 16) === NothingSent && + !renderState.externalRuntimeScript + ) { + resumableState.instructions |= 16; + var preamble = renderState.preamble, + bootstrapChunks = renderState.bootstrapChunks; + (preamble.htmlChunks || preamble.headChunks) && + 0 === bootstrapChunks.length + ? (bootstrapChunks.push(renderState.startInlineScript), + pushCompletedShellIdAttribute(bootstrapChunks, resumableState), + bootstrapChunks.push( + endOfStartTag, + formReplayingRuntimeScript, + endInlineScript + )) + : bootstrapChunks.unshift( + renderState.startInlineScript, + endOfStartTag, + formReplayingRuntimeScript, + endInlineScript + ); + } } function pushLinkImpl(target, props) { target.push(startChunkForTag("link")); @@ -3133,6 +3148,24 @@ styleQueue.sheets.forEach(preloadLateStyle, this); styleQueue.sheets.clear(); } + function writeCompletedShellIdAttribute(destination, resumableState) { + (resumableState.instructions & SentCompletedShellId) === NothingSent && + ((resumableState.instructions |= SentCompletedShellId), + (resumableState = "\u00ab" + resumableState.idPrefix + "R\u00bb"), + destination.push(completedShellIdAttributeStart), + (resumableState = escapeTextForBrowser(resumableState)), + destination.push(resumableState), + destination.push(attributeEnd)); + } + function pushCompletedShellIdAttribute(target, resumableState) { + (resumableState.instructions & SentCompletedShellId) === NothingSent && + ((resumableState.instructions |= SentCompletedShellId), + target.push( + completedShellIdAttributeStart, + escapeTextForBrowser("\u00ab" + resumableState.idPrefix + "R\u00bb"), + attributeEnd + )); + } function writeStyleResourceDependenciesInJS(destination, hoistableState) { destination.push(arrayFirstOpenBracket); var nextArrayOpenBrackChunk = arrayFirstOpenBracket; @@ -3452,16 +3485,18 @@ bootstrapScripts = resumableState.bootstrapScripts, bootstrapModules = resumableState.bootstrapModules; void 0 !== bootstrapScriptContent && + (bootstrapChunks.push("", + endOfStartTag, escapeEntireInlineScriptContent(bootstrapScriptContent), - "\x3c/script>" - ); + endInlineScript + )); idPrefix = { placeholderPrefix: idPrefix + "P:", segmentPrefix: idPrefix + "S:", boundaryPrefix: idPrefix + "B:", - startInlineScript: "