diff --git a/examples/reproduction-template/package.json b/examples/reproduction-template/package.json index f9c2e53818887..c425970403c64 100644 --- a/examples/reproduction-template/package.json +++ b/examples/reproduction-template/package.json @@ -7,8 +7,8 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916" }, "devDependencies": { "@types/node": "20.12.12", diff --git a/package.json b/package.json index 32e15e1a7dec2..78986bf1d92fc 100644 --- a/package.json +++ b/package.json @@ -206,19 +206,19 @@ "pretty-bytes": "5.3.0", "pretty-ms": "7.0.0", "random-seed": "0.3.0", - "react": "19.0.0-rc-206df66e-20240912", + "react": "19.0.0-rc-f2df5694-20240916", "react-17": "npm:react@17.0.2", - "react-builtin": "npm:react@19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912", + "react-builtin": "npm:react@19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916", "react-dom-17": "npm:react-dom@17.0.2", - "react-dom-builtin": "npm:react-dom@19.0.0-rc-206df66e-20240912", - "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-206df66e-20240912", - "react-experimental-builtin": "npm:react@0.0.0-experimental-206df66e-20240912", - "react-is-builtin": "npm:react-is@19.0.0-rc-206df66e-20240912", - "react-server-dom-turbopack": "19.0.0-rc-206df66e-20240912", - "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-206df66e-20240912", - "react-server-dom-webpack": "19.0.0-rc-206df66e-20240912", - "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-206df66e-20240912", + "react-dom-builtin": "npm:react-dom@19.0.0-rc-f2df5694-20240916", + "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-f2df5694-20240916", + "react-experimental-builtin": "npm:react@0.0.0-experimental-f2df5694-20240916", + "react-is-builtin": "npm:react-is@19.0.0-rc-f2df5694-20240916", + "react-server-dom-turbopack": "19.0.0-rc-f2df5694-20240916", + "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-f2df5694-20240916", + "react-server-dom-webpack": "19.0.0-rc-f2df5694-20240916", + "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-f2df5694-20240916", "react-ssr-prepass": "1.0.8", "react-virtualized": "9.22.3", "relay-compiler": "13.0.2", @@ -228,8 +228,8 @@ "resolve-from": "5.0.0", "sass": "1.54.0", "satori": "0.10.9", - "scheduler-builtin": "npm:scheduler@0.25.0-rc-206df66e-20240912", - "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-206df66e-20240912", + "scheduler-builtin": "npm:scheduler@0.25.0-rc-f2df5694-20240916", + "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-f2df5694-20240916", "seedrandom": "3.0.5", "semver": "7.3.7", "shell-quote": "1.7.3", @@ -269,10 +269,10 @@ "@babel/traverse": "7.22.5", "@types/react": "npm:types-react@19.0.0-rc.0", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912", - "react-is": "19.0.0-rc-206df66e-20240912", - "scheduler": "0.25.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916", + "react-is": "19.0.0-rc-f2df5694-20240916", + "scheduler": "0.25.0-rc-f2df5694-20240916" }, "patchedDependencies": { "webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch" diff --git a/packages/create-next-app/templates/index.ts b/packages/create-next-app/templates/index.ts index 19565d0feb866..67e746016b78a 100644 --- a/packages/create-next-app/templates/index.ts +++ b/packages/create-next-app/templates/index.ts @@ -13,7 +13,7 @@ import { GetTemplateFileArgs, InstallTemplateArgs } from "./types"; // Do not rename or format. sync-react script relies on this line. // prettier-ignore -const nextjsReactPeerVersion = "19.0.0-rc-206df66e-20240912"; +const nextjsReactPeerVersion = "19.0.0-rc-f2df5694-20240916"; /** * Get the file path for a given file in a template, e.g. "next.config.js". diff --git a/packages/next/package.json b/packages/next/package.json index 383f0507333ba..ebcf851a59f30 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -108,8 +108,8 @@ "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912", + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916", "sass": "^1.3.0" }, "peerDependenciesMeta": { 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 2802a6a75b62d..b839da99859d9 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 @@ -352,16 +352,16 @@ } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -965,73 +965,10 @@ )); } } - function injectProfilingHooks(profilingHooks) { - injectedProfilingHooks = profilingHooks; - } - function markCommitStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStopped && - injectedProfilingHooks.markCommitStopped(); - } - function markComponentRenderStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStarted && - injectedProfilingHooks.markComponentRenderStarted(fiber); - } - function markComponentRenderStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStopped && - injectedProfilingHooks.markComponentRenderStopped(); - } - function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); - } - function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); - } - function markRenderStarted(lanes) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStarted && - injectedProfilingHooks.markRenderStarted(lanes); - } - function markRenderStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStopped && - injectedProfilingHooks.markRenderStopped(); - } - function markStateUpdateScheduled(fiber, lane) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markStateUpdateScheduled && - injectedProfilingHooks.markStateUpdateScheduled(fiber, lane); - } function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } - function getLabelForLane(lane) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 4194176) return "Transition"; - if (lane & 62914560) return "Retry"; - if (lane & 67108864) return "SelectiveHydration"; - if (lane & 134217728) return "IdleHydration"; - if (lane & 268435456) return "Idle"; - if (lane & 536870912) return "Offscreen"; - if (lane & 1073741824) return "Deferred"; - } function getHighestPriorityLanes(lanes) { var pendingSyncLanes = lanes & 42; if (0 !== pendingSyncLanes) return pendingSyncLanes; @@ -3627,23 +3564,44 @@ : !1 : !1; } - function getActiveElementDeep() { + function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm1246836171$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm1246836171$1 = + containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm1246836171$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm1246836171$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm1246836171$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm1246836171$1.contentWindow.location + .href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm1246836171$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm1246836171$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm1246836171$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3659,103 +3617,98 @@ "true" === elem.contentEditable) ); } - function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; + function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { if ( null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) + hasSelectionCapabilities(containerInfo) ) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = - priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && - priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } function constructSelectEvent( @@ -4028,11 +3981,18 @@ profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } - function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { + function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } + } + function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -6637,8 +6597,8 @@ try { (currentTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, currentTransition); - } catch (error$3) { - onActionError(actionQueue, node, error$3); + } catch (error$4) { + onActionError(actionQueue, node, error$4); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -7302,7 +7262,6 @@ queue, JSCompiler_OptimizeArgumentsArray_p0 ))); - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p0); } function dispatchSetState( fiber, @@ -7366,7 +7325,6 @@ JSCompiler_OptimizeArgumentsArray_p1 )); } - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p1); } function dispatchOptimisticSetState( fiber, @@ -7400,7 +7358,6 @@ )), null !== throwIfDuringRender && scheduleUpdateOnFiber(throwIfDuringRender, fiber, 2); - markStateUpdateScheduled(fiber, 2); } function isRenderPhaseUpdate(fiber) { var alternate = fiber.alternate; @@ -7623,9 +7580,9 @@ var onUncaughtError = root.onUncaughtError; onUncaughtError(error, { componentStack: errorInfo.stack }); } - } catch (e$4) { + } catch (e$5) { setTimeout(function () { - throw e$4; + throw e$5; }); } } @@ -7640,9 +7597,9 @@ componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$5) { + } catch (e$6) { setTimeout(function () { - throw e$5; + throw e$6; }); } } @@ -7941,7 +7898,6 @@ "ref" !== key && (propsWithoutRef[key] = nextProps[key]); } else propsWithoutRef = nextProps; prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); nextProps = renderWithHooks( current, workInProgress, @@ -7951,7 +7907,6 @@ renderLanes ); key = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8197,7 +8152,6 @@ componentName )))); prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); Component = renderWithHooks( current, workInProgress, @@ -8207,7 +8161,6 @@ renderLanes ); nextProps = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8227,7 +8180,6 @@ renderLanes ) { prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); hookTypesUpdateIndexDev = -1; ignorePreviousDependencies = null !== current && current.type !== workInProgress.type; @@ -8240,7 +8192,6 @@ ); finishRenderingHooks(current, workInProgress); Component = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8756,18 +8707,16 @@ current = workInProgress; if (state && "function" !== typeof Component.getDerivedStateFromError) (Component = null), (profilerStartTime = -1); - else { - markComponentRenderStarted(workInProgress); - Component = callRenderInDEV(lane); - if (workInProgress.mode & StrictLegacyMode) { - setIsStrictModeForDevtools(!0); - try { - callRenderInDEV(lane); - } finally { - setIsStrictModeForDevtools(!1); - } + else if ( + ((Component = callRenderInDEV(lane)), + workInProgress.mode & StrictLegacyMode) + ) { + setIsStrictModeForDevtools(!0); + try { + callRenderInDEV(lane); + } finally { + setIsStrictModeForDevtools(!1); } - markComponentRenderStopped(); } workInProgress.flags |= 1; null !== current$jscomp$0 && state @@ -8858,33 +8807,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2286; - var JSCompiler_object_inline_stack_2285 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2241; + var JSCompiler_object_inline_stack_2240 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2283 = !1; + var JSCompiler_object_inline_message_2238 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2286 = didSuspend) || - (JSCompiler_object_inline_componentStack_2286 = + (JSCompiler_object_inline_componentStack_2241 = didSuspend) || + (JSCompiler_object_inline_componentStack_2241 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2286 && - ((JSCompiler_object_inline_message_2283 = !0), + JSCompiler_object_inline_componentStack_2241 && + ((JSCompiler_object_inline_message_2238 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2286 = + JSCompiler_object_inline_componentStack_2241 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2283 + JSCompiler_object_inline_message_2238 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2284 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2239 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2284)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2239)) { c: { - var instance = JSCompiler_object_inline_digest_2284; + var instance = JSCompiler_object_inline_digest_2239; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8925,19 +8874,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2284 + JSCompiler_object_inline_digest_2239 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2284 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2239 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2284 && - ((JSCompiler_object_inline_digest_2284 = - JSCompiler_object_inline_digest_2284.dehydrated), - null !== JSCompiler_object_inline_digest_2284) + null !== JSCompiler_object_inline_digest_2239 && + ((JSCompiler_object_inline_digest_2239 = + JSCompiler_object_inline_digest_2239.dehydrated), + null !== JSCompiler_object_inline_digest_2239) ) return ( - JSCompiler_object_inline_digest_2284.data === + JSCompiler_object_inline_digest_2239.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8945,68 +8894,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2284 = - JSCompiler_object_inline_stack_2285.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2285.fallback; - if (JSCompiler_object_inline_message_2283) + JSCompiler_object_inline_digest_2239 = + JSCompiler_object_inline_stack_2240.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2240.fallback; + if (JSCompiler_object_inline_message_2238) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2285 = + (JSCompiler_object_inline_stack_2240 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2284, + JSCompiler_object_inline_digest_2239, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2283 = workInProgress.child), - (JSCompiler_object_inline_message_2283.memoizedState = + (JSCompiler_object_inline_message_2238 = workInProgress.child), + (JSCompiler_object_inline_message_2238.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2283.childLanes = + (JSCompiler_object_inline_message_2238.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2286, + JSCompiler_object_inline_componentStack_2241, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2285 + JSCompiler_object_inline_stack_2240 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2285.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2240.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2285 = + (JSCompiler_object_inline_stack_2240 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2284, + JSCompiler_object_inline_digest_2239, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2283 = workInProgress.child), - (JSCompiler_object_inline_message_2283.memoizedState = + (JSCompiler_object_inline_message_2238 = workInProgress.child), + (JSCompiler_object_inline_message_2238.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2283.childLanes = + (JSCompiler_object_inline_message_2238.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2286, + JSCompiler_object_inline_componentStack_2241, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2285 + JSCompiler_object_inline_stack_2240 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2284 + JSCompiler_object_inline_digest_2239 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2284 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2284) + ((JSCompiler_object_inline_digest_2239 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2239) ) { if (didSuspend) workInProgress.flags & 256 @@ -9023,94 +8972,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2283 = - JSCompiler_object_inline_stack_2285.fallback), - (JSCompiler_object_inline_digest_2284 = workInProgress.mode), - (JSCompiler_object_inline_stack_2285 = + (JSCompiler_object_inline_message_2238 = + JSCompiler_object_inline_stack_2240.fallback), + (JSCompiler_object_inline_digest_2239 = workInProgress.mode), + (JSCompiler_object_inline_stack_2240 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2285.children + children: JSCompiler_object_inline_stack_2240.children }, - JSCompiler_object_inline_digest_2284 + JSCompiler_object_inline_digest_2239 )), - (JSCompiler_object_inline_message_2283 = + (JSCompiler_object_inline_message_2238 = createFiberFromFragment( - JSCompiler_object_inline_message_2283, - JSCompiler_object_inline_digest_2284, + JSCompiler_object_inline_message_2238, + JSCompiler_object_inline_digest_2239, renderLanes, null )), - (JSCompiler_object_inline_message_2283.flags |= 2), - (JSCompiler_object_inline_stack_2285.return = workInProgress), - (JSCompiler_object_inline_message_2283.return = workInProgress), - (JSCompiler_object_inline_stack_2285.sibling = - JSCompiler_object_inline_message_2283), - (workInProgress.child = JSCompiler_object_inline_stack_2285), + (JSCompiler_object_inline_message_2238.flags |= 2), + (JSCompiler_object_inline_stack_2240.return = workInProgress), + (JSCompiler_object_inline_message_2238.return = workInProgress), + (JSCompiler_object_inline_stack_2240.sibling = + JSCompiler_object_inline_message_2238), + (workInProgress.child = JSCompiler_object_inline_stack_2240), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2285 = workInProgress.child), - (JSCompiler_object_inline_stack_2285.memoizedState = + (JSCompiler_object_inline_stack_2240 = workInProgress.child), + (JSCompiler_object_inline_stack_2240.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2285.childLanes = + (JSCompiler_object_inline_stack_2240.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2286, + JSCompiler_object_inline_componentStack_2241, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2283)); + (workInProgress = JSCompiler_object_inline_message_2238)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2284.data === + JSCompiler_object_inline_digest_2239.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2286 = - JSCompiler_object_inline_digest_2284.nextSibling && - JSCompiler_object_inline_digest_2284.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2286) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2286.dgst; - var message = JSCompiler_object_inline_componentStack_2286.msg; - instance = JSCompiler_object_inline_componentStack_2286.stck; + JSCompiler_object_inline_componentStack_2241 = + JSCompiler_object_inline_digest_2239.nextSibling && + JSCompiler_object_inline_digest_2239.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2241) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2241.dgst; + var message = JSCompiler_object_inline_componentStack_2241.msg; + instance = JSCompiler_object_inline_componentStack_2241.stck; var componentStack = - JSCompiler_object_inline_componentStack_2286.cstck; + JSCompiler_object_inline_componentStack_2241.cstck; } - JSCompiler_object_inline_message_2283 = message; - JSCompiler_object_inline_digest_2284 = JSCompiler_temp; - JSCompiler_object_inline_stack_2285 = instance; - JSCompiler_object_inline_componentStack_2286 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2284 && - ((JSCompiler_object_inline_message_2283 = - JSCompiler_object_inline_message_2283 - ? Error(JSCompiler_object_inline_message_2283) + JSCompiler_object_inline_message_2238 = message; + JSCompiler_object_inline_digest_2239 = JSCompiler_temp; + JSCompiler_object_inline_stack_2240 = instance; + JSCompiler_object_inline_componentStack_2241 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2239 && + ((JSCompiler_object_inline_message_2238 = + JSCompiler_object_inline_message_2238 + ? Error(JSCompiler_object_inline_message_2238) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2283.stack = - JSCompiler_object_inline_stack_2285 || ""), - (JSCompiler_object_inline_message_2283.digest = - JSCompiler_object_inline_digest_2284), - (JSCompiler_object_inline_componentStack_2286 = - void 0 === JSCompiler_object_inline_componentStack_2286 + (JSCompiler_object_inline_message_2238.stack = + JSCompiler_object_inline_stack_2240 || ""), + (JSCompiler_object_inline_message_2238.digest = + JSCompiler_object_inline_digest_2239), + (JSCompiler_object_inline_componentStack_2241 = + void 0 === JSCompiler_object_inline_componentStack_2241 ? null - : JSCompiler_object_inline_componentStack_2286), - "string" === typeof JSCompiler_object_inline_componentStack_2286 && + : JSCompiler_object_inline_componentStack_2241), + "string" === typeof JSCompiler_object_inline_componentStack_2241 && CapturedStacks.set( - JSCompiler_object_inline_message_2283, - JSCompiler_object_inline_componentStack_2286 + JSCompiler_object_inline_message_2238, + JSCompiler_object_inline_componentStack_2241 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2283, + value: JSCompiler_object_inline_message_2238, source: null, - stack: JSCompiler_object_inline_componentStack_2286 + stack: JSCompiler_object_inline_componentStack_2241 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9125,25 +9074,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2286 = + (JSCompiler_object_inline_componentStack_2241 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2286) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2241) ) { - JSCompiler_object_inline_componentStack_2286 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2286) { - JSCompiler_object_inline_stack_2285 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2285 & 42)) - JSCompiler_object_inline_stack_2285 = 1; + JSCompiler_object_inline_componentStack_2241 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2241) { + JSCompiler_object_inline_stack_2240 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2240 & 42)) + JSCompiler_object_inline_stack_2240 = 1; else - switch (JSCompiler_object_inline_stack_2285) { + switch (JSCompiler_object_inline_stack_2240) { case 2: - JSCompiler_object_inline_stack_2285 = 1; + JSCompiler_object_inline_stack_2240 = 1; break; case 8: - JSCompiler_object_inline_stack_2285 = 4; + JSCompiler_object_inline_stack_2240 = 4; break; case 32: - JSCompiler_object_inline_stack_2285 = 16; + JSCompiler_object_inline_stack_2240 = 16; break; case 128: case 256: @@ -9164,40 +9113,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2285 = 64; + JSCompiler_object_inline_stack_2240 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2285 = 134217728; + JSCompiler_object_inline_stack_2240 = 134217728; break; default: - JSCompiler_object_inline_stack_2285 = 0; + JSCompiler_object_inline_stack_2240 = 0; } - JSCompiler_object_inline_stack_2285 = + JSCompiler_object_inline_stack_2240 = 0 !== - (JSCompiler_object_inline_stack_2285 & - (JSCompiler_object_inline_componentStack_2286.suspendedLanes | + (JSCompiler_object_inline_stack_2240 & + (JSCompiler_object_inline_componentStack_2241.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2285; + : JSCompiler_object_inline_stack_2240; if ( - 0 !== JSCompiler_object_inline_stack_2285 && - JSCompiler_object_inline_stack_2285 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2240 && + JSCompiler_object_inline_stack_2240 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2285), + ((prevState.retryLane = JSCompiler_object_inline_stack_2240), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2285 + JSCompiler_object_inline_stack_2240 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2286, + JSCompiler_object_inline_componentStack_2241, current, - JSCompiler_object_inline_stack_2285 + JSCompiler_object_inline_stack_2240 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2284.data === + JSCompiler_object_inline_digest_2239.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9205,7 +9154,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2284.data === + JSCompiler_object_inline_digest_2239.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9213,12 +9162,12 @@ null, current )), - (JSCompiler_object_inline_digest_2284._reactRetry = + (JSCompiler_object_inline_digest_2239._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2284.nextSibling + JSCompiler_object_inline_digest_2239.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9236,54 +9185,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2285.children + JSCompiler_object_inline_stack_2240.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2283) + if (JSCompiler_object_inline_message_2238) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2283 = - JSCompiler_object_inline_stack_2285.fallback), - (JSCompiler_object_inline_digest_2284 = workInProgress.mode), + (JSCompiler_object_inline_message_2238 = + JSCompiler_object_inline_stack_2240.fallback), + (JSCompiler_object_inline_digest_2239 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2285 = createWorkInProgress( + (JSCompiler_object_inline_stack_2240 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2285.children + children: JSCompiler_object_inline_stack_2240.children } )), - (JSCompiler_object_inline_stack_2285.subtreeFlags = + (JSCompiler_object_inline_stack_2240.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2283 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2238 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2283 + JSCompiler_object_inline_message_2238 )) - : ((JSCompiler_object_inline_message_2283 = createFiberFromFragment( - JSCompiler_object_inline_message_2283, - JSCompiler_object_inline_digest_2284, + : ((JSCompiler_object_inline_message_2238 = createFiberFromFragment( + JSCompiler_object_inline_message_2238, + JSCompiler_object_inline_digest_2239, renderLanes, null )), - (JSCompiler_object_inline_message_2283.flags |= 2)), - (JSCompiler_object_inline_message_2283.return = workInProgress), - (JSCompiler_object_inline_stack_2285.return = workInProgress), - (JSCompiler_object_inline_stack_2285.sibling = - JSCompiler_object_inline_message_2283), - (workInProgress.child = JSCompiler_object_inline_stack_2285), - (JSCompiler_object_inline_stack_2285 = - JSCompiler_object_inline_message_2283), - (JSCompiler_object_inline_message_2283 = workInProgress.child), - (JSCompiler_object_inline_digest_2284 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2284 - ? (JSCompiler_object_inline_digest_2284 = + (JSCompiler_object_inline_message_2238.flags |= 2)), + (JSCompiler_object_inline_message_2238.return = workInProgress), + (JSCompiler_object_inline_stack_2240.return = workInProgress), + (JSCompiler_object_inline_stack_2240.sibling = + JSCompiler_object_inline_message_2238), + (workInProgress.child = JSCompiler_object_inline_stack_2240), + (JSCompiler_object_inline_stack_2240 = + JSCompiler_object_inline_message_2238), + (JSCompiler_object_inline_message_2238 = workInProgress.child), + (JSCompiler_object_inline_digest_2239 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2239 + ? (JSCompiler_object_inline_digest_2239 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2284.cachePool), + JSCompiler_object_inline_digest_2239.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9291,38 +9240,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2284 = { + (JSCompiler_object_inline_digest_2239 = { baseLanes: - JSCompiler_object_inline_digest_2284.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2239.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2283.memoizedState = - JSCompiler_object_inline_digest_2284), - (JSCompiler_object_inline_message_2283.childLanes = + (JSCompiler_object_inline_message_2238.memoizedState = + JSCompiler_object_inline_digest_2239), + (JSCompiler_object_inline_message_2238.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2286, + JSCompiler_object_inline_componentStack_2241, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2285 + JSCompiler_object_inline_stack_2240 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2285.children + children: JSCompiler_object_inline_stack_2240.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2286 = + ((JSCompiler_object_inline_componentStack_2241 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2286 + null === JSCompiler_object_inline_componentStack_2241 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2286.push(current)); + : JSCompiler_object_inline_componentStack_2241.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9671,6 +9620,7 @@ case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -10257,6 +10207,7 @@ case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), (returnFiber.effectDuration = 0), (returnFiber.passiveEffectDuration = 0), @@ -10298,13 +10249,11 @@ ), prepareToReadContext(workInProgress), (prevSibling = readContext(prevSibling)), - markComponentRenderStarted(workInProgress), (returnFiber = callComponentInDEV( returnFiber, prevSibling, void 0 )), - markComponentRenderStopped(), (workInProgress.flags |= 1), reconcileChildren( current, @@ -10943,21 +10892,7 @@ do { if ( (updateQueue.tag & flags) === flags && - ((flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStarted && - injectedProfilingHooks.markComponentPassiveEffectMountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStarted && - injectedProfilingHooks.markComponentLayoutEffectMountStarted( - finishedWork - ), - (lastEffect = void 0), + ((lastEffect = void 0), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), (lastEffect = runWithFiberInDEV( @@ -10967,16 +10902,6 @@ )), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStopped && - injectedProfilingHooks.markComponentPassiveEffectMountStopped() - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStopped && - injectedProfilingHooks.markComponentLayoutEffectMountStopped(), void 0 !== lastEffect && "function" !== typeof lastEffect) ) { var hookName = void 0; @@ -11034,15 +10959,6 @@ destroy = inst.destroy; void 0 !== destroy && ((inst.destroy = void 0), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStarted && - injectedProfilingHooks.markComponentPassiveEffectUnmountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStarted(finishedWork), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), runWithFiberInDEV( @@ -11053,14 +10969,7 @@ destroy ), (flags & Insertion) !== NoFlags && - (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && - injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStopped()); + (isRunningInsertionEffect = !1)); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -11261,20 +11170,21 @@ recordLayoutEffectDuration(current); } else runWithFiberInDEV(current, ref, null); - } catch (error$6) { - captureCommitPhaseError(current, nearestMountedAncestor, error$6); + } catch (error$7) { + captureCommitPhaseError(current, nearestMountedAncestor, error$7); } else ref.current = null; } function commitProfiler(finishedWork, current, commitTime, effectDuration) { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit; _finishedWork$memoize = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof _finishedWork$memoize && _finishedWork$memoize( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -11309,6 +11219,25 @@ captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + function commitProfilerPostCommitImpl( + finishedWork, + current, + commitTime, + passiveEffectDuration + ) { + var _finishedWork$memoize2 = finishedWork.memoizedProps; + finishedWork = _finishedWork$memoize2.id; + _finishedWork$memoize2 = _finishedWork$memoize2.onPostCommit; + current = null === current ? "mount" : "update"; + currentUpdateIsNested && (current = "nested-update"); + "function" === typeof _finishedWork$memoize2 && + _finishedWork$memoize2( + finishedWork, + current, + passiveEffectDuration, + commitTime + ); + } function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -11464,8 +11393,9 @@ ); } function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -11487,7 +11417,7 @@ selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$2) { + } catch (e$3) { JSCompiler_temp = null; break a; } @@ -11746,7 +11676,6 @@ a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -11966,41 +11895,39 @@ ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - var tag = prevHostParentIsContainer.tag, - inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - ((tag & Insertion) !== NoFlags - ? ((inst.destroy = void 0), + var _tag = prevHostParentIsContainer.tag, + _inst = prevHostParentIsContainer.inst, + _destroy = _inst.destroy; + void 0 !== _destroy && + ((_tag & Insertion) !== NoFlags + ? ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )) - : (tag & Layout) !== NoFlags && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - shouldProfile(deletedFiber) + : (_tag & Layout) !== NoFlags && + (shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), - (inst.destroy = void 0), + (_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy ), recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), + : ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy - )), - markComponentLayoutEffectUnmountStopped())); + _destroy + )))); prevHostParentIsContainer = prevHostParentIsContainer.next; } while (prevHostParentIsContainer !== prevHostParent); } @@ -12794,7 +12721,6 @@ commitTime, includeWorkInProgressEffects ), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12881,25 +12807,47 @@ root, parentFiber, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - if (parentFiber.subtreeFlags & 10256) - for (parentFiber = parentFiber.child; null !== parentFiber; ) + if ( + parentFiber.subtreeFlags & 10256 || + (0 !== parentFiber.actualDuration && + (null === parentFiber.alternate || + parentFiber.alternate.child !== parentFiber.child)) + ) + for (parentFiber = parentFiber.child; null !== parentFiber; ) { + var nextSibling = parentFiber.sibling; commitPassiveMountOnFiber( root, parentFiber, committedLanes, - committedTransitions - ), - (parentFiber = parentFiber.sibling); + committedTransitions, + null !== nextSibling ? nextSibling.actualStartTime : endTime + ); + parentFiber = nextSibling; + } } function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - var flags = finishedWork.flags; + if ( + (finishedWork.mode & ProfileMode) !== NoMode && + 0 < finishedWork.actualStartTime + ) { + var startTime = finishedWork.actualStartTime, + name = getComponentNameFromFiber(finishedWork); + null !== name && + supportsUserTiming && + ((reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(name, reusableComponentOptions)); + } + startTime = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12908,9 +12856,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: @@ -12918,9 +12867,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && ((finishedRoot = null), null !== finishedWork.alternate && (finishedRoot = finishedWork.alternate.memoizedState.cache), @@ -12929,30 +12879,68 @@ (retainCache(finishedWork), null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + if (startTime & 2048 && executionContext & CommitContext) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + runWithFiberInDEV( + finishedWork, + commitProfilerPostCommitImpl, + finishedWork, + finishedWork.alternate, + commitTime, + finishedRoot + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: - var _instance = finishedWork.stateNode; + name = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _instance._visibility & OffscreenPassiveEffectsConnected + ? name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) : recursivelyTraverseAtomicPassiveEffects( finishedRoot, finishedWork ) - : _instance._visibility & OffscreenPassiveEffectsConnected + : name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) - : ((_instance._visibility |= OffscreenPassiveEffectsConnected), + : ((name._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -12960,7 +12948,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - flags & 2048 && + startTime & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -12971,9 +12959,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -12981,7 +12970,8 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); } } @@ -13336,9 +13326,9 @@ this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; this._debugTask = this._debugStack = this._debugOwner = @@ -13377,8 +13367,8 @@ (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -14596,6 +14586,7 @@ } a: { renderWasConcurrent = root; + completeTime = now(); switch (didTimeout) { case RootInProgress: case RootFatalErrored: @@ -14875,6 +14866,7 @@ ensureRootIsScheduled(root), null ); + completeTime = now(); root.finishedWork = root.current.alternate; root.finishedLanes = lanes; commitRoot( @@ -14983,42 +14975,14 @@ : SuspendedOnError); workInProgressThrownValue = thrownValue; var erroredWork = workInProgress; - if (null === erroredWork) - (workInProgressRootExitStatus = RootFatalErrored), + null === erroredWork + ? ((workInProgressRootExitStatus = RootFatalErrored), logUncaughtError( root, createCapturedValueAtFiber(thrownValue, root.current) - ); - else - switch ( - (erroredWork.mode & ProfileMode && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), - markComponentRenderStopped(), - workInProgressSuspendedReason) - ) { - case SuspendedOnError: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentErrored && - injectedProfilingHooks.markComponentErrored( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - break; - case SuspendedOnData: - case SuspendedOnImmediate: - case SuspendedOnDeprecatedThrowPromise: - case SuspendedAndReadyToContinue: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentSuspended && - injectedProfilingHooks.markComponentSuspended( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - } + )) + : erroredWork.mode & ProfileMode && + stopProfilerTimerIfRunningAndRecordDuration(erroredWork); } function shouldRemainOnPreviousScreen() { var handler = suspenseHandlerStackCursor.current; @@ -15081,7 +15045,6 @@ workInProgressTransitions = null; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); lanes = !1; a: do try { @@ -15115,8 +15078,8 @@ } workLoopSync(); break; - } catch (thrownValue$8) { - handleThrow(root, thrownValue$8); + } catch (thrownValue$9) { + handleThrow(root, thrownValue$9); } while (1); lanes && root.shellSuspendCounter++; @@ -15128,7 +15091,6 @@ throw Error( "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue." ); - markRenderStopped(); workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15157,7 +15119,6 @@ workInProgressRootRenderTargetTime = now$1() + RENDER_TIMEOUT_MS; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); a: do try { if ( @@ -15276,22 +15237,15 @@ ? workLoopSync() : workLoopConcurrent(); break; - } catch (thrownValue$9) { - handleThrow(root, thrownValue$9); + } catch (thrownValue$10) { + handleThrow(root, thrownValue$10); } while (1); resetContextDependencies(); ReactSharedInternals.H = prevDispatcher; ReactSharedInternals.A = prevAsyncDispatcher; executionContext = prevExecutionContext; - if (null !== workInProgress) - return ( - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderYielded && - injectedProfilingHooks.markRenderYielded(), - RootInProgress - ); - markRenderStopped(); + if (null !== workInProgress) return RootInProgress; workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15312,7 +15266,7 @@ unitOfWork, entangledRenderLanes )), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = runWithFiberInDEV( unitOfWork, beginWork, @@ -15365,7 +15319,7 @@ (current = beginWork(current, unitOfWork, entangledRenderLanes)); } isProfilingMode && - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0); + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork); return current; } function throwAndUnwindWorkLoop(root, unitOfWork, thrownValue) { @@ -15418,23 +15372,16 @@ } var current = completedWork.alternate; unitOfWork = completedWork.return; - (completedWork.mode & ProfileMode) === NoMode - ? (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )) - : (startProfilerTimer(completedWork), - (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = runWithFiberInDEV( + completedWork, + completeWork, + current, + completedWork, + entangledRenderLanes + ); + (completedWork.mode & ProfileMode) !== NoMode && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -15458,7 +15405,7 @@ return; } if ((unitOfWork.mode & ProfileMode) !== NoMode) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -15529,10 +15476,7 @@ throw Error("Should not already be working."); var finishedWork = root.finishedWork, lanes = root.finishedLanes; - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStarted && - injectedProfilingHooks.markCommitStarted(lanes); - if (null === finishedWork) return markCommitStopped(), null; + if (null === finishedWork) return null; 0 === lanes && console.error( "root.finishedLanes should not be empty during a commit. This is a bug in React." @@ -15560,7 +15504,8 @@ root === workInProgressRoot && ((workInProgress = workInProgressRoot = null), (workInProgressRootRenderLanes = 0)); - (0 === (finishedWork.subtreeFlags & 10256) && + (0 === finishedWork.actualDuration && + 0 === (finishedWork.subtreeFlags & 10256) && 0 === (finishedWork.flags & 10256)) || rootDoesHavePassiveEffects || ((rootDoesHavePassiveEffects = !0), @@ -15581,19 +15526,11 @@ commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStarted && - injectedProfilingHooks.markLayoutEffectsStarted(lanes), commitLayoutEffects(finishedWork, root, lanes), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStopped && - injectedProfilingHooks.markLayoutEffectsStopped(), requestPaint(), (executionContext = updatedLanes), (ReactDOMSharedInternals.p = spawnedLane), @@ -15638,7 +15575,6 @@ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))) : (nestedUpdateCount = 0); flushSyncWorkAcrossRoots_impl(0, !1); - markCommitStopped(); return null; } function makeErrorInfo(componentStack) { @@ -15676,10 +15612,10 @@ if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + priority = pendingPassiveTransitions; pendingPassiveTransitions = null; - priority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root$jscomp$0 = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if ( @@ -15689,75 +15625,36 @@ throw Error( "Cannot flush passive effects while already rendering." ); + reusableComponentDevToolDetails.track = + lanes & 63 + ? "Blocking" + : lanes & 4194240 + ? "Transition" + : lanes & 62914560 + ? "Suspense" + : lanes & 2080374784 + ? "Idle" + : "Other"; isFlushingPassiveEffects = !0; didScheduleUpdateDuringPassiveEffects = !1; - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStarted && - injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(priority.current); + commitPassiveUnmountOnFiber(root$jscomp$0.current); commitPassiveMountOnFiber( - priority, - priority.current, + root$jscomp$0, + root$jscomp$0.current, lanes, - transitions + priority, + completeTime ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if ( - executionContext & CommitContext && - 0 !== (finishedWork.flags & 4) - ) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$jscomp$0 = commitTime, - phase = - null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$jscomp$0 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStopped && - injectedProfilingHooks.markPassiveEffectsStopped(); - commitDoubleInvokeEffectsInDEV(priority); + commitDoubleInvokeEffectsInDEV(root$jscomp$0); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects - ? priority === rootWithPassiveNestedUpdates + ? root$jscomp$0 === rootWithPassiveNestedUpdates ? nestedPassiveUpdateCount++ : ((nestedPassiveUpdateCount = 0), - (rootWithPassiveNestedUpdates = priority)) + (rootWithPassiveNestedUpdates = root$jscomp$0)) : (nestedPassiveUpdateCount = 0); didScheduleUpdateDuringPassiveEffects = isFlushingPassiveEffects = !1; @@ -15766,7 +15663,7 @@ "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, priority); + injectedHook.onPostCommitFiberRoot(rendererID, root$jscomp$0); } catch (err) { hasLoggedError || ((hasLoggedError = !0), @@ -15775,7 +15672,7 @@ err )); } - var stateNode = priority.current.stateNode; + var stateNode = root$jscomp$0.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -15789,15 +15686,6 @@ } return !1; } - function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); - } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -20350,7 +20238,7 @@ ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -20511,9 +20399,6 @@ err )); } - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderScheduled && - injectedProfilingHooks.markRenderScheduled(lane); parentComponent = getContextForSubtree(parentComponent); null === container.context ? (container.context = parentComponent) @@ -20562,14 +20447,6 @@ function getCurrentFiberForDevTools() { return current; } - function getLaneLabelMap() { - for (var map = new Map(), lane = 1, index = 0; 31 > index; index++) { - var label = getLabelForLane(lane); - map.set(lane, label); - lane *= 2; - } - return map; - } function dispatchDiscreteEvent( domEventName, eventSystemFlags, @@ -21234,7 +21111,6 @@ unstable_setDisableYieldValue = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, - injectedProfilingHooks = null, hasLoggedError = !1, isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__, clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, @@ -22450,12 +22326,27 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, + completeTime = 0, commitTime = 0, layoutEffectStartTime = -1, profilerStartTime = -1, passiveEffectStartTime = -1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, + supportsUserTiming = + "undefined" !== typeof performance && + "function" === typeof performance.measure, + reusableComponentDevToolDetails = { + dataType: "track-entry", + color: "primary", + track: "Blocking", + trackGroup: "Components \u269b" + }, + reusableComponentOptions = { + start: -0, + end: -0, + detail: { devtools: reusableComponentDevToolDetails } + }, ReactStrictModeWarnings = { recordUnsafeLifecycleWarnings: function () {}, flushPendingUnsafeLifecycleWarnings: function () {}, @@ -24078,7 +23969,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueReplaceState: function (inst, payload, callback) { inst = inst._reactInternals; @@ -24093,7 +23983,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueForceUpdate: function (inst, callback) { inst = inst._reactInternals; @@ -24107,10 +23996,6 @@ null !== callback && (scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markForceUpdateScheduled && - injectedProfilingHooks.markForceUpdateScheduled(inst, lane); } }, reportGlobalError = @@ -24195,7 +24080,7 @@ var nonExtensibleObject = Object.preventExtensions({}); new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); - } catch (e$7) { + } catch (e$8) { hasBadMapPolyfill = !0; } var DefaultAsyncDispatcher = { @@ -24268,7 +24153,6 @@ rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, NESTED_UPDATE_LIMIT = 50, @@ -24824,11 +24708,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24865,11 +24749,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912" + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24884,8 +24768,6 @@ internals.scheduleRoot = scheduleRoot; internals.setRefreshHandler = setRefreshHandler; internals.getCurrentFiber = getCurrentFiberForDevTools; - internals.getLaneLabelMap = getLaneLabelMap; - internals.injectProfilingHooks = injectProfilingHooks; return injectInternals(internals); })() && canUseDOM && @@ -25013,7 +24895,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; "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 8662569706d06..3fdf598312e2c 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 @@ -166,16 +166,16 @@ function describeNativeComponentFrame(fn, construct) { } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -364,36 +364,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$2 = parentA.child; child$2; ) { - if (child$2 === a) { + for (var didFindChild = !1, child$3 = parentA.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) { - for (child$2 = parentB.child; child$2; ) { - if (child$2 === a) { + for (child$3 = parentB.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) throw Error(formatProdErrorMessage(189)); } @@ -721,18 +721,18 @@ function markRootFinished( 0 < remainingLanes; ) { - var index$7 = 31 - clz32(remainingLanes), - lane = 1 << index$7; - entanglements[index$7] = 0; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = hiddenUpdates[index$7]; + var index$8 = 31 - clz32(remainingLanes), + lane = 1 << index$8; + entanglements[index$8] = 0; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = hiddenUpdates[index$8]; if (null !== hiddenUpdatesForLane) for ( - hiddenUpdates[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + hiddenUpdates[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -536870913); } remainingLanes &= ~lane; @@ -757,10 +757,10 @@ function markSpawnedDeferredLane(root, spawnedLane, entangledLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -910,8 +910,8 @@ function setValueForAttribute(node, name, value) { node.removeAttribute(name); return; case "boolean": - var prefix$10 = name.toLowerCase().slice(0, 5); - if ("data-" !== prefix$10 && "aria-" !== prefix$10) { + var prefix$11 = name.toLowerCase().slice(0, 5); + if ("data-" !== prefix$11 && "aria-" !== prefix$11) { node.removeAttribute(name); return; } @@ -1244,15 +1244,15 @@ function setValueForStyles(node, styles, prevStyles) { : "float" === styleName ? (node.cssFloat = "") : (node[styleName] = "")); - for (var styleName$16 in styles) - (styleName = styles[styleName$16]), - styles.hasOwnProperty(styleName$16) && - prevStyles[styleName$16] !== styleName && - setValueForStyle(node, styleName$16, styleName); - } else for (var styleName$17 in styles) - styles.hasOwnProperty(styleName$17) && - setValueForStyle(node, styleName$17, styles[styleName$17]); + (styleName = styles[styleName$17]), + styles.hasOwnProperty(styleName$17) && + prevStyles[styleName$17] !== styleName && + setValueForStyle(node, styleName$17, styleName); + } else + for (var styleName$18 in styles) + styles.hasOwnProperty(styleName$18) && + setValueForStyle(node, styleName$18, styles[styleName$18]); } function isCustomElement(tagName) { if (-1 === tagName.indexOf("-")) return !1; @@ -1981,19 +1981,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$283; + var JSCompiler_inline_result$jscomp$284; if (canUseDOM) { - var isSupported$jscomp$inline_418 = "oninput" in document; - if (!isSupported$jscomp$inline_418) { - var element$jscomp$inline_419 = document.createElement("div"); - element$jscomp$inline_419.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_418 = - "function" === typeof element$jscomp$inline_419.oninput; + var isSupported$jscomp$inline_419 = "oninput" in document; + if (!isSupported$jscomp$inline_419) { + var element$jscomp$inline_420 = document.createElement("div"); + element$jscomp$inline_420.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_419 = + "function" === typeof element$jscomp$inline_420.oninput; } - JSCompiler_inline_result$jscomp$283 = isSupported$jscomp$inline_418; - } else JSCompiler_inline_result$jscomp$283 = !1; + JSCompiler_inline_result$jscomp$284 = isSupported$jscomp$inline_419; + } else JSCompiler_inline_result$jscomp$284 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$283 && + JSCompiler_inline_result$jscomp$284 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2107,23 +2107,37 @@ function containsNode(outerNode, innerNode) { : !1 : !1; } -function getActiveElementDeep() { +function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmp797407923$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmp797407923$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmp797407923$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmp797407923$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp797407923$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmp797407923$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmp797407923$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmp797407923$1 = getActiveElement(containerInfo.document); } - return element; + return $jscomp$optchain$tmp797407923$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2139,101 +2153,95 @@ function hasSelectionCapabilities(elem) { "true" === elem.contentEditable) ); } -function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; +function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { - if ( - null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) - ) + if (null !== priorSelectionRange && hasSelectionCapabilities(containerInfo)) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } var skipSelectionChangeEvent = @@ -3933,7 +3941,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$55 = !1; + didReadFromEntangledAsyncAction$56 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -3954,11 +3962,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$55 = !0); + (didReadFromEntangledAsyncAction$56 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$55 = !0); + (didReadFromEntangledAsyncAction$56 = !0); continue; } else (updateLane = { @@ -4004,7 +4012,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$55 && + didReadFromEntangledAsyncAction$56 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4202,8 +4210,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$61) { - onActionError(actionQueue, node, error$61); + } catch (error$62) { + onActionError(actionQueue, node, error$62); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4640,14 +4648,14 @@ function refreshCache(fiber, seedKey, seedValue) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$64 = enqueueUpdate(provider, fiber, lane); - null !== root$64 && - (scheduleUpdateOnFiber(root$64, provider, lane), - entangleTransitions(root$64, provider, lane)); + var root$65 = enqueueUpdate(provider, fiber, lane); + null !== root$65 && + (scheduleUpdateOnFiber(root$65, provider, lane), + entangleTransitions(root$65, provider, lane)); provider = createCache(); null !== seedKey && void 0 !== seedKey && - null !== root$64 && + null !== root$65 && provider.data.set(seedKey, seedValue); fiber.payload = { cache: provider }; return; @@ -5170,9 +5178,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$68 in Component) - void 0 === newProps[propName$68] && - (newProps[propName$68] = Component[propName$68]); + for (var propName$69 in Component) + void 0 === newProps[propName$69] && + (newProps[propName$69] = Component[propName$69]); } return newProps; } @@ -5218,9 +5226,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$69) { + } catch (e$70) { setTimeout(function () { - throw e$69; + throw e$70; }); } } @@ -5231,9 +5239,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$70) { + } catch (e$71) { setTimeout(function () { - throw e$70; + throw e$71; }); } } @@ -7688,8 +7696,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$115) { - captureCommitPhaseError(current, nearestMountedAncestor, error$115); + } catch (error$116) { + captureCommitPhaseError(current, nearestMountedAncestor, error$116); } else ref.current = null; } @@ -7806,8 +7814,9 @@ var offscreenSubtreeIsHidden = !1, nextEffect = null, shouldFireAfterActiveInstanceBlur = !1; function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -7829,7 +7838,7 @@ function commitBeforeMutationEffects(root, firstChild) { selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$20) { + } catch (e$21) { JSCompiler_temp = null; break a; } @@ -8004,11 +8013,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$114) { + } catch (error$115) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$114 + error$115 ); } } @@ -8179,7 +8188,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$123 = hostParentIsContainer; + var prevHostParentIsContainer$124 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8187,7 +8196,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$123; + hostParentIsContainer = prevHostParentIsContainer$124; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8255,18 +8264,18 @@ function commitDeletionEffectsOnFiber( ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - prevHostParentIsContainer$123 = prevHostParentIsContainer.tag; + prevHostParentIsContainer$124 = prevHostParentIsContainer.tag; var inst = prevHostParentIsContainer.inst, destroy = inst.destroy; void 0 !== destroy && - (0 !== (prevHostParentIsContainer$123 & 2) + (0 !== (prevHostParentIsContainer$124 & 2) ? ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, nearestMountedAncestor, destroy )) - : 0 !== (prevHostParentIsContainer$123 & 4) && + : 0 !== (prevHostParentIsContainer$124 & 4) && ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, @@ -8837,21 +8846,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$116 = JSCompiler_inline_result.stateNode; + var parent$117 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$116, ""), + (setTextContent(parent$117, ""), (JSCompiler_inline_result.flags &= -33)); - var before$117 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$117, parent$116); + var before$118 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$118, parent$117); break; case 3: case 4: - var parent$118 = JSCompiler_inline_result.stateNode.containerInfo, - before$119 = getHostSibling(finishedWork); + var parent$119 = JSCompiler_inline_result.stateNode.containerInfo, + before$120 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$119, - parent$118 + before$120, + parent$119 ); break; default: @@ -9118,6 +9127,14 @@ function commitPassiveMountOnFiber( (finishedWork.refCount++, null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + break; case 23: break; case 22: @@ -9746,14 +9763,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$136 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$136 = lastTailNode), + for (var lastTailNode$137 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$137 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$136 + null === lastTailNode$137 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$136.sibling = null); + : (lastTailNode$137.sibling = null); } } function bubbleProperties(completedWork) { @@ -9763,19 +9780,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$137 = completedWork.child; null !== child$137; ) - (newChildLanes |= child$137.lanes | child$137.childLanes), - (subtreeFlags |= child$137.subtreeFlags & 31457280), - (subtreeFlags |= child$137.flags & 31457280), - (child$137.return = completedWork), - (child$137 = child$137.sibling); + for (var child$138 = completedWork.child; null !== child$138; ) + (newChildLanes |= child$138.lanes | child$138.childLanes), + (subtreeFlags |= child$138.subtreeFlags & 31457280), + (subtreeFlags |= child$138.flags & 31457280), + (child$138.return = completedWork), + (child$138 = child$138.sibling); else - for (child$137 = completedWork.child; null !== child$137; ) - (newChildLanes |= child$137.lanes | child$137.childLanes), - (subtreeFlags |= child$137.subtreeFlags), - (subtreeFlags |= child$137.flags), - (child$137.return = completedWork), - (child$137 = child$137.sibling); + for (child$138 = completedWork.child; null !== child$138; ) + (newChildLanes |= child$138.lanes | child$138.childLanes), + (subtreeFlags |= child$138.subtreeFlags), + (subtreeFlags |= child$138.flags), + (child$138.return = completedWork), + (child$138 = child$138.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10052,11 +10069,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$149 = null; + var cache$150 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$149 = newProps.memoizedState.cachePool.pool); - cache$149 !== type && (newProps.flags |= 2048); + (cache$150 = newProps.memoizedState.cachePool.pool); + cache$150 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10081,8 +10098,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$149 = type.rendering; - if (null === cache$149) + cache$150 = type.rendering; + if (null === cache$150) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10090,11 +10107,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$149 = findFirstSuspended(current); - if (null !== cache$149) { + cache$150 = findFirstSuspended(current); + if (null !== cache$150) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$149.updateQueue; + current = cache$150.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10119,7 +10136,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$149)), null !== current)) { + if (((current = findFirstSuspended(cache$150)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10129,7 +10146,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$149.alternate && + !cache$150.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10142,13 +10159,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$149.sibling = workInProgress.child), - (workInProgress.child = cache$149)) + ? ((cache$150.sibling = workInProgress.child), + (workInProgress.child = cache$150)) : ((current = type.last), null !== current - ? (current.sibling = cache$149) - : (workInProgress.child = cache$149), - (type.last = cache$149)); + ? (current.sibling = cache$150) + : (workInProgress.child = cache$150), + (type.last = cache$150)); } if (null !== type.tail) return ( @@ -10668,9 +10685,9 @@ function markRootSuspended( didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes); didSkipSuspendedSiblings = root.expirationTimes; for (var lanes = suspendedLanes; 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6; - didSkipSuspendedSiblings[index$6] = -1; + var index$7 = 31 - clz32(lanes), + lane = 1 << index$7; + didSkipSuspendedSiblings[index$7] = -1; lanes &= ~lane; } 0 !== spawnedLane && @@ -10783,9 +10800,9 @@ function prepareFreshStack(root, lanes) { 0 < allEntangledLanes; ) { - var index$4 = 31 - clz32(allEntangledLanes), - lane = 1 << index$4; - lanes |= root[index$4]; + var index$5 = 31 - clz32(allEntangledLanes), + lane = 1 << index$5; + lanes |= root[index$5]; allEntangledLanes &= ~lane; } entangledRenderLanes = lanes; @@ -10896,8 +10913,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$164) { - handleThrow(root, thrownValue$164); + } catch (thrownValue$165) { + handleThrow(root, thrownValue$165); } while (1); lanes && root.shellSuspendCounter++; @@ -11006,8 +11023,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$166) { - handleThrow(root, thrownValue$166); + } catch (thrownValue$167) { + handleThrow(root, thrownValue$167); } while (1); resetContextDependencies(); @@ -11241,7 +11258,7 @@ function commitRootImpl( (executionContext |= 4), commitBeforeMutationEffects(root, finishedWork), commitMutationEffectsOnFiber(finishedWork, root), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -11290,7 +11307,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$170 = rootWithPendingPassiveEffects, + var root$171 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11329,7 +11346,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$170, remainingLanes); + releaseRootPooledCache(root$171, remainingLanes); } } return !1; @@ -11488,14 +11505,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$172 = firstScheduledRoot; null !== root$172; ) { + for (var root$173 = firstScheduledRoot; null !== root$173; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$172.pendingLanes; + var pendingLanes = root$173.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$172.suspendedLanes, - pingedLanes = root$172.pingedLanes; + var suspendedLanes = root$173.suspendedLanes, + pingedLanes = root$173.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11509,17 +11526,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$172, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$172, - root$172 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$173, + root$173 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$172, JSCompiler_inline_result)); - root$172 = root$172.next; + performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); + root$173 = root$173.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -11560,12 +11577,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -11729,20 +11746,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1400 = 0; - i$jscomp$inline_1400 < simpleEventPluginEvents.length; - i$jscomp$inline_1400++ + var i$jscomp$inline_1401 = 0; + i$jscomp$inline_1401 < simpleEventPluginEvents.length; + i$jscomp$inline_1401++ ) { - var eventName$jscomp$inline_1401 = - simpleEventPluginEvents[i$jscomp$inline_1400], - domEventName$jscomp$inline_1402 = - eventName$jscomp$inline_1401.toLowerCase(), - capitalizedEvent$jscomp$inline_1403 = - eventName$jscomp$inline_1401[0].toUpperCase() + - eventName$jscomp$inline_1401.slice(1); + var eventName$jscomp$inline_1402 = + simpleEventPluginEvents[i$jscomp$inline_1401], + domEventName$jscomp$inline_1403 = + eventName$jscomp$inline_1402.toLowerCase(), + capitalizedEvent$jscomp$inline_1404 = + eventName$jscomp$inline_1402[0].toUpperCase() + + eventName$jscomp$inline_1402.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1402, - "on" + capitalizedEvent$jscomp$inline_1403 + domEventName$jscomp$inline_1403, + "on" + capitalizedEvent$jscomp$inline_1404 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -12925,34 +12942,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$186 = props[hasSrc]; - if (null != propValue$186) + var propValue$187 = props[hasSrc]; + if (null != propValue$187) switch (hasSrc) { case "name": - hasSrcSet = propValue$186; + hasSrcSet = propValue$187; break; case "type": - propValue = propValue$186; + propValue = propValue$187; break; case "checked": - checked = propValue$186; + checked = propValue$187; break; case "defaultChecked": - defaultChecked = propValue$186; + defaultChecked = propValue$187; break; case "value": - propKey = propValue$186; + propKey = propValue$187; break; case "defaultValue": - defaultValue = propValue$186; + defaultValue = propValue$187; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$186) + if (null != propValue$187) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$186, props, null); + setProp(domElement, tag, hasSrc, propValue$187, props, null); } } initInput( @@ -13089,14 +13106,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$186 in props) - props.hasOwnProperty(propValue$186) && - ((hasSrc = props[propValue$186]), + for (propValue$187 in props) + props.hasOwnProperty(propValue$187) && + ((hasSrc = props[propValue$187]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$186, + propValue$187, hasSrc, props, void 0 @@ -13144,14 +13161,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$203 in nextProps) { - var propKey = nextProps[propKey$203]; - lastProp = lastProps[propKey$203]; + for (var propKey$204 in nextProps) { + var propKey = nextProps[propKey$204]; + lastProp = lastProps[propKey$204]; if ( - nextProps.hasOwnProperty(propKey$203) && + nextProps.hasOwnProperty(propKey$204) && (null != propKey || null != lastProp) ) - switch (propKey$203) { + switch (propKey$204) { case "type": type = propKey; break; @@ -13180,7 +13197,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$203, + propKey$204, propKey, nextProps, lastProp @@ -13199,7 +13216,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$203 = null; + propKey = value = defaultValue = propKey$204 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13230,7 +13247,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$203 = type; + propKey$204 = type; break; case "defaultValue": defaultValue = type; @@ -13251,15 +13268,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$203 - ? updateOptions(domElement, !!lastProps, propKey$203, !1) + null != propKey$204 + ? updateOptions(domElement, !!lastProps, propKey$204, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$203 = null; + propKey = propKey$204 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13283,7 +13300,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$203 = name; + propKey$204 = name; break; case "defaultValue": propKey = name; @@ -13297,17 +13314,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$203, propKey); + updateTextarea(domElement, propKey$204, propKey); return; case "option": - for (var propKey$219 in lastProps) + for (var propKey$220 in lastProps) if ( - ((propKey$203 = lastProps[propKey$219]), - lastProps.hasOwnProperty(propKey$219) && - null != propKey$203 && - !nextProps.hasOwnProperty(propKey$219)) + ((propKey$204 = lastProps[propKey$220]), + lastProps.hasOwnProperty(propKey$220) && + null != propKey$204 && + !nextProps.hasOwnProperty(propKey$220)) ) - switch (propKey$219) { + switch (propKey$220) { case "selected": domElement.selected = !1; break; @@ -13315,33 +13332,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$219, + propKey$220, null, nextProps, - propKey$203 + propKey$204 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$203 = nextProps[lastDefaultValue]), + ((propKey$204 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$203 !== propKey && - (null != propKey$203 || null != propKey)) + propKey$204 !== propKey && + (null != propKey$204 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$203 && - "function" !== typeof propKey$203 && - "symbol" !== typeof propKey$203; + propKey$204 && + "function" !== typeof propKey$204 && + "symbol" !== typeof propKey$204; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$203, + propKey$204, nextProps, propKey ); @@ -13362,24 +13379,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$224 in lastProps) - (propKey$203 = lastProps[propKey$224]), - lastProps.hasOwnProperty(propKey$224) && - null != propKey$203 && - !nextProps.hasOwnProperty(propKey$224) && - setProp(domElement, tag, propKey$224, null, nextProps, propKey$203); + for (var propKey$225 in lastProps) + (propKey$204 = lastProps[propKey$225]), + lastProps.hasOwnProperty(propKey$225) && + null != propKey$204 && + !nextProps.hasOwnProperty(propKey$225) && + setProp(domElement, tag, propKey$225, null, nextProps, propKey$204); for (checked in nextProps) if ( - ((propKey$203 = nextProps[checked]), + ((propKey$204 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$203 !== propKey && - (null != propKey$203 || null != propKey)) + propKey$204 !== propKey && + (null != propKey$204 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$203) + if (null != propKey$204) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13387,7 +13404,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$203, + propKey$204, nextProps, propKey ); @@ -13395,49 +13412,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$229 in lastProps) - (propKey$203 = lastProps[propKey$229]), - lastProps.hasOwnProperty(propKey$229) && - void 0 !== propKey$203 && - !nextProps.hasOwnProperty(propKey$229) && + for (var propKey$230 in lastProps) + (propKey$204 = lastProps[propKey$230]), + lastProps.hasOwnProperty(propKey$230) && + void 0 !== propKey$204 && + !nextProps.hasOwnProperty(propKey$230) && setPropOnCustomElement( domElement, tag, - propKey$229, + propKey$230, void 0, nextProps, - propKey$203 + propKey$204 ); for (defaultChecked in nextProps) - (propKey$203 = nextProps[defaultChecked]), + (propKey$204 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$203 === propKey || - (void 0 === propKey$203 && void 0 === propKey) || + propKey$204 === propKey || + (void 0 === propKey$204 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$203, + propKey$204, nextProps, propKey ); return; } } - for (var propKey$234 in lastProps) - (propKey$203 = lastProps[propKey$234]), - lastProps.hasOwnProperty(propKey$234) && - null != propKey$203 && - !nextProps.hasOwnProperty(propKey$234) && - setProp(domElement, tag, propKey$234, null, nextProps, propKey$203); + for (var propKey$235 in lastProps) + (propKey$204 = lastProps[propKey$235]), + lastProps.hasOwnProperty(propKey$235) && + null != propKey$204 && + !nextProps.hasOwnProperty(propKey$235) && + setProp(domElement, tag, propKey$235, null, nextProps, propKey$204); for (lastProp in nextProps) - (propKey$203 = nextProps[lastProp]), + (propKey$204 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$203 === propKey || - (null == propKey$203 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$203, nextProps, propKey); + propKey$204 === propKey || + (null == propKey$204 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$204, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -13982,26 +13999,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$242 = getResourcesFromRoot( + var styles$243 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$243 = styles$242.get(type); - resource$243 || + resource$244 = styles$243.get(type); + resource$244 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$243 = { + (resource$244 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$242.set(type, resource$243), - (styles$242 = JSCompiler_inline_result.querySelector( + styles$243.set(type, resource$244), + (styles$243 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$242._p && - ((resource$243.instance = styles$242), - (resource$243.state.loading = 5)), + !styles$243._p && + ((resource$244.instance = styles$243), + (resource$244.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14014,16 +14031,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$242 || + styles$243 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$243.state + resource$244.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$243; + return resource$244; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14120,37 +14137,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$248 = hoistableRoot.querySelector( + var instance$249 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$248) + if (instance$249) return ( (resource.state.loading |= 4), - (resource.instance = instance$248), - markNodeAsHoistable(instance$248), - instance$248 + (resource.instance = instance$249), + markNodeAsHoistable(instance$249), + instance$249 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$248 = ( + instance$249 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$248); - var linkInstance = instance$248; + markNodeAsHoistable(instance$249); + var linkInstance = instance$249; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$248, "link", instance); + setInitialProperties(instance$249, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$248, props.precedence, hoistableRoot); - return (resource.instance = instance$248); + insertStylesheet(instance$249, props.precedence, hoistableRoot); + return (resource.instance = instance$249); case "script": - instance$248 = getScriptKey(props.src); + instance$249 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$248) + getScriptSelectorFromKey(instance$249) )) ) return ( @@ -14159,7 +14176,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$248))) + if ((styleProps = preloadPropsMap.get(instance$249))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -14420,7 +14437,7 @@ function insertStylesheetIntoRoot(root, resource) { ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -15183,16 +15200,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1647 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1648 = React.version; if ( - "19.0.0-experimental-206df66e-20240912" !== - isomorphicReactPackageVersion$jscomp$inline_1647 + "19.0.0-experimental-f2df5694-20240916" !== + isomorphicReactPackageVersion$jscomp$inline_1648 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1647, - "19.0.0-experimental-206df66e-20240912" + isomorphicReactPackageVersion$jscomp$inline_1648, + "19.0.0-experimental-f2df5694-20240916" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15212,25 +15229,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2085 = { +var internals$jscomp$inline_2087 = { bundleType: 0, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912" + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2086 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2088 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2086.isDisabled && - hook$jscomp$inline_2086.supportsFiber + !hook$jscomp$inline_2088.isDisabled && + hook$jscomp$inline_2088.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2086.inject( - internals$jscomp$inline_2085 + (rendererID = hook$jscomp$inline_2088.inject( + internals$jscomp$inline_2087 )), - (injectedHook = hook$jscomp$inline_2086); + (injectedHook = hook$jscomp$inline_2088); } catch (err) {} } exports.createRoot = function (container, options) { @@ -15322,4 +15339,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; 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 fe7200790c1a5..df4eadfd264ac 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 @@ -352,16 +352,16 @@ } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -973,73 +973,10 @@ )); } } - function injectProfilingHooks(profilingHooks) { - injectedProfilingHooks = profilingHooks; - } - function markCommitStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStopped && - injectedProfilingHooks.markCommitStopped(); - } - function markComponentRenderStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStarted && - injectedProfilingHooks.markComponentRenderStarted(fiber); - } - function markComponentRenderStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStopped && - injectedProfilingHooks.markComponentRenderStopped(); - } - function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); - } - function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); - } - function markRenderStarted(lanes) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStarted && - injectedProfilingHooks.markRenderStarted(lanes); - } - function markRenderStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStopped && - injectedProfilingHooks.markRenderStopped(); - } - function markStateUpdateScheduled(fiber, lane) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markStateUpdateScheduled && - injectedProfilingHooks.markStateUpdateScheduled(fiber, lane); - } function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } - function getLabelForLane(lane) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 4194176) return "Transition"; - if (lane & 62914560) return "Retry"; - if (lane & 67108864) return "SelectiveHydration"; - if (lane & 134217728) return "IdleHydration"; - if (lane & 268435456) return "Idle"; - if (lane & 536870912) return "Offscreen"; - if (lane & 1073741824) return "Deferred"; - } function getHighestPriorityLanes(lanes) { var pendingSyncLanes = lanes & 42; if (0 !== pendingSyncLanes) return pendingSyncLanes; @@ -3635,23 +3572,44 @@ : !1 : !1; } - function getActiveElementDeep() { + function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm1887412677$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm1887412677$1 = + containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm1887412677$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm1887412677$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm1887412677$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm1887412677$1.contentWindow.location + .href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm1887412677$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm1887412677$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm1887412677$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3667,103 +3625,98 @@ "true" === elem.contentEditable) ); } - function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; + function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { if ( null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) + hasSelectionCapabilities(containerInfo) ) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = - priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && - priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } function constructSelectEvent( @@ -4036,11 +3989,18 @@ profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } - function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { + function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } + } + function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -6645,8 +6605,8 @@ try { (currentTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, currentTransition); - } catch (error$3) { - onActionError(actionQueue, node, error$3); + } catch (error$4) { + onActionError(actionQueue, node, error$4); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -7310,7 +7270,6 @@ queue, JSCompiler_OptimizeArgumentsArray_p0 ))); - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p0); } function dispatchSetState( fiber, @@ -7374,7 +7333,6 @@ JSCompiler_OptimizeArgumentsArray_p1 )); } - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p1); } function dispatchOptimisticSetState( fiber, @@ -7408,7 +7366,6 @@ )), null !== throwIfDuringRender && scheduleUpdateOnFiber(throwIfDuringRender, fiber, 2); - markStateUpdateScheduled(fiber, 2); } function isRenderPhaseUpdate(fiber) { var alternate = fiber.alternate; @@ -7631,9 +7588,9 @@ var onUncaughtError = root.onUncaughtError; onUncaughtError(error, { componentStack: errorInfo.stack }); } - } catch (e$4) { + } catch (e$5) { setTimeout(function () { - throw e$4; + throw e$5; }); } } @@ -7648,9 +7605,9 @@ componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$5) { + } catch (e$6) { setTimeout(function () { - throw e$5; + throw e$6; }); } } @@ -7949,7 +7906,6 @@ "ref" !== key && (propsWithoutRef[key] = nextProps[key]); } else propsWithoutRef = nextProps; prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); nextProps = renderWithHooks( current, workInProgress, @@ -7959,7 +7915,6 @@ renderLanes ); key = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8205,7 +8160,6 @@ componentName )))); prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); Component = renderWithHooks( current, workInProgress, @@ -8215,7 +8169,6 @@ renderLanes ); nextProps = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8235,7 +8188,6 @@ renderLanes ) { prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); hookTypesUpdateIndexDev = -1; ignorePreviousDependencies = null !== current && current.type !== workInProgress.type; @@ -8248,7 +8200,6 @@ ); finishRenderingHooks(current, workInProgress); Component = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8764,18 +8715,16 @@ current = workInProgress; if (state && "function" !== typeof Component.getDerivedStateFromError) (Component = null), (profilerStartTime = -1); - else { - markComponentRenderStarted(workInProgress); - Component = callRenderInDEV(lane); - if (workInProgress.mode & StrictLegacyMode) { - setIsStrictModeForDevtools(!0); - try { - callRenderInDEV(lane); - } finally { - setIsStrictModeForDevtools(!1); - } + else if ( + ((Component = callRenderInDEV(lane)), + workInProgress.mode & StrictLegacyMode) + ) { + setIsStrictModeForDevtools(!0); + try { + callRenderInDEV(lane); + } finally { + setIsStrictModeForDevtools(!1); } - markComponentRenderStopped(); } workInProgress.flags |= 1; null !== current$jscomp$0 && state @@ -8866,33 +8815,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2291; - var JSCompiler_object_inline_stack_2290 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2246; + var JSCompiler_object_inline_stack_2245 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2288 = !1; + var JSCompiler_object_inline_message_2243 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2291 = didSuspend) || - (JSCompiler_object_inline_componentStack_2291 = + (JSCompiler_object_inline_componentStack_2246 = didSuspend) || + (JSCompiler_object_inline_componentStack_2246 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2291 && - ((JSCompiler_object_inline_message_2288 = !0), + JSCompiler_object_inline_componentStack_2246 && + ((JSCompiler_object_inline_message_2243 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2291 = + JSCompiler_object_inline_componentStack_2246 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2288 + JSCompiler_object_inline_message_2243 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2289 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2244 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2289)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2244)) { c: { - var instance = JSCompiler_object_inline_digest_2289; + var instance = JSCompiler_object_inline_digest_2244; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8933,19 +8882,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2289 + JSCompiler_object_inline_digest_2244 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2289 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2244 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2289 && - ((JSCompiler_object_inline_digest_2289 = - JSCompiler_object_inline_digest_2289.dehydrated), - null !== JSCompiler_object_inline_digest_2289) + null !== JSCompiler_object_inline_digest_2244 && + ((JSCompiler_object_inline_digest_2244 = + JSCompiler_object_inline_digest_2244.dehydrated), + null !== JSCompiler_object_inline_digest_2244) ) return ( - JSCompiler_object_inline_digest_2289.data === + JSCompiler_object_inline_digest_2244.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8953,68 +8902,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2289 = - JSCompiler_object_inline_stack_2290.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2290.fallback; - if (JSCompiler_object_inline_message_2288) + JSCompiler_object_inline_digest_2244 = + JSCompiler_object_inline_stack_2245.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2245.fallback; + if (JSCompiler_object_inline_message_2243) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2290 = + (JSCompiler_object_inline_stack_2245 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2289, + JSCompiler_object_inline_digest_2244, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2288 = workInProgress.child), - (JSCompiler_object_inline_message_2288.memoizedState = + (JSCompiler_object_inline_message_2243 = workInProgress.child), + (JSCompiler_object_inline_message_2243.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2288.childLanes = + (JSCompiler_object_inline_message_2243.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2291, + JSCompiler_object_inline_componentStack_2246, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2290 + JSCompiler_object_inline_stack_2245 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2290.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2245.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2290 = + (JSCompiler_object_inline_stack_2245 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2289, + JSCompiler_object_inline_digest_2244, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2288 = workInProgress.child), - (JSCompiler_object_inline_message_2288.memoizedState = + (JSCompiler_object_inline_message_2243 = workInProgress.child), + (JSCompiler_object_inline_message_2243.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2288.childLanes = + (JSCompiler_object_inline_message_2243.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2291, + JSCompiler_object_inline_componentStack_2246, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2290 + JSCompiler_object_inline_stack_2245 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2289 + JSCompiler_object_inline_digest_2244 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2289 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2289) + ((JSCompiler_object_inline_digest_2244 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2244) ) { if (didSuspend) workInProgress.flags & 256 @@ -9031,94 +8980,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2288 = - JSCompiler_object_inline_stack_2290.fallback), - (JSCompiler_object_inline_digest_2289 = workInProgress.mode), - (JSCompiler_object_inline_stack_2290 = + (JSCompiler_object_inline_message_2243 = + JSCompiler_object_inline_stack_2245.fallback), + (JSCompiler_object_inline_digest_2244 = workInProgress.mode), + (JSCompiler_object_inline_stack_2245 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2290.children + children: JSCompiler_object_inline_stack_2245.children }, - JSCompiler_object_inline_digest_2289 + JSCompiler_object_inline_digest_2244 )), - (JSCompiler_object_inline_message_2288 = + (JSCompiler_object_inline_message_2243 = createFiberFromFragment( - JSCompiler_object_inline_message_2288, - JSCompiler_object_inline_digest_2289, + JSCompiler_object_inline_message_2243, + JSCompiler_object_inline_digest_2244, renderLanes, null )), - (JSCompiler_object_inline_message_2288.flags |= 2), - (JSCompiler_object_inline_stack_2290.return = workInProgress), - (JSCompiler_object_inline_message_2288.return = workInProgress), - (JSCompiler_object_inline_stack_2290.sibling = - JSCompiler_object_inline_message_2288), - (workInProgress.child = JSCompiler_object_inline_stack_2290), + (JSCompiler_object_inline_message_2243.flags |= 2), + (JSCompiler_object_inline_stack_2245.return = workInProgress), + (JSCompiler_object_inline_message_2243.return = workInProgress), + (JSCompiler_object_inline_stack_2245.sibling = + JSCompiler_object_inline_message_2243), + (workInProgress.child = JSCompiler_object_inline_stack_2245), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2290 = workInProgress.child), - (JSCompiler_object_inline_stack_2290.memoizedState = + (JSCompiler_object_inline_stack_2245 = workInProgress.child), + (JSCompiler_object_inline_stack_2245.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2290.childLanes = + (JSCompiler_object_inline_stack_2245.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2291, + JSCompiler_object_inline_componentStack_2246, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2288)); + (workInProgress = JSCompiler_object_inline_message_2243)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2289.data === + JSCompiler_object_inline_digest_2244.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2291 = - JSCompiler_object_inline_digest_2289.nextSibling && - JSCompiler_object_inline_digest_2289.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2291) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2291.dgst; - var message = JSCompiler_object_inline_componentStack_2291.msg; - instance = JSCompiler_object_inline_componentStack_2291.stck; + JSCompiler_object_inline_componentStack_2246 = + JSCompiler_object_inline_digest_2244.nextSibling && + JSCompiler_object_inline_digest_2244.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2246) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2246.dgst; + var message = JSCompiler_object_inline_componentStack_2246.msg; + instance = JSCompiler_object_inline_componentStack_2246.stck; var componentStack = - JSCompiler_object_inline_componentStack_2291.cstck; + JSCompiler_object_inline_componentStack_2246.cstck; } - JSCompiler_object_inline_message_2288 = message; - JSCompiler_object_inline_digest_2289 = JSCompiler_temp; - JSCompiler_object_inline_stack_2290 = instance; - JSCompiler_object_inline_componentStack_2291 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2289 && - ((JSCompiler_object_inline_message_2288 = - JSCompiler_object_inline_message_2288 - ? Error(JSCompiler_object_inline_message_2288) + JSCompiler_object_inline_message_2243 = message; + JSCompiler_object_inline_digest_2244 = JSCompiler_temp; + JSCompiler_object_inline_stack_2245 = instance; + JSCompiler_object_inline_componentStack_2246 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2244 && + ((JSCompiler_object_inline_message_2243 = + JSCompiler_object_inline_message_2243 + ? Error(JSCompiler_object_inline_message_2243) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2288.stack = - JSCompiler_object_inline_stack_2290 || ""), - (JSCompiler_object_inline_message_2288.digest = - JSCompiler_object_inline_digest_2289), - (JSCompiler_object_inline_componentStack_2291 = - void 0 === JSCompiler_object_inline_componentStack_2291 + (JSCompiler_object_inline_message_2243.stack = + JSCompiler_object_inline_stack_2245 || ""), + (JSCompiler_object_inline_message_2243.digest = + JSCompiler_object_inline_digest_2244), + (JSCompiler_object_inline_componentStack_2246 = + void 0 === JSCompiler_object_inline_componentStack_2246 ? null - : JSCompiler_object_inline_componentStack_2291), - "string" === typeof JSCompiler_object_inline_componentStack_2291 && + : JSCompiler_object_inline_componentStack_2246), + "string" === typeof JSCompiler_object_inline_componentStack_2246 && CapturedStacks.set( - JSCompiler_object_inline_message_2288, - JSCompiler_object_inline_componentStack_2291 + JSCompiler_object_inline_message_2243, + JSCompiler_object_inline_componentStack_2246 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2288, + value: JSCompiler_object_inline_message_2243, source: null, - stack: JSCompiler_object_inline_componentStack_2291 + stack: JSCompiler_object_inline_componentStack_2246 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9133,25 +9082,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2291 = + (JSCompiler_object_inline_componentStack_2246 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2291) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2246) ) { - JSCompiler_object_inline_componentStack_2291 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2291) { - JSCompiler_object_inline_stack_2290 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2290 & 42)) - JSCompiler_object_inline_stack_2290 = 1; + JSCompiler_object_inline_componentStack_2246 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2246) { + JSCompiler_object_inline_stack_2245 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2245 & 42)) + JSCompiler_object_inline_stack_2245 = 1; else - switch (JSCompiler_object_inline_stack_2290) { + switch (JSCompiler_object_inline_stack_2245) { case 2: - JSCompiler_object_inline_stack_2290 = 1; + JSCompiler_object_inline_stack_2245 = 1; break; case 8: - JSCompiler_object_inline_stack_2290 = 4; + JSCompiler_object_inline_stack_2245 = 4; break; case 32: - JSCompiler_object_inline_stack_2290 = 16; + JSCompiler_object_inline_stack_2245 = 16; break; case 128: case 256: @@ -9172,40 +9121,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2290 = 64; + JSCompiler_object_inline_stack_2245 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2290 = 134217728; + JSCompiler_object_inline_stack_2245 = 134217728; break; default: - JSCompiler_object_inline_stack_2290 = 0; + JSCompiler_object_inline_stack_2245 = 0; } - JSCompiler_object_inline_stack_2290 = + JSCompiler_object_inline_stack_2245 = 0 !== - (JSCompiler_object_inline_stack_2290 & - (JSCompiler_object_inline_componentStack_2291.suspendedLanes | + (JSCompiler_object_inline_stack_2245 & + (JSCompiler_object_inline_componentStack_2246.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2290; + : JSCompiler_object_inline_stack_2245; if ( - 0 !== JSCompiler_object_inline_stack_2290 && - JSCompiler_object_inline_stack_2290 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2245 && + JSCompiler_object_inline_stack_2245 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2290), + ((prevState.retryLane = JSCompiler_object_inline_stack_2245), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2290 + JSCompiler_object_inline_stack_2245 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2291, + JSCompiler_object_inline_componentStack_2246, current, - JSCompiler_object_inline_stack_2290 + JSCompiler_object_inline_stack_2245 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2289.data === + JSCompiler_object_inline_digest_2244.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9213,7 +9162,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2289.data === + JSCompiler_object_inline_digest_2244.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9221,12 +9170,12 @@ null, current )), - (JSCompiler_object_inline_digest_2289._reactRetry = + (JSCompiler_object_inline_digest_2244._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2289.nextSibling + JSCompiler_object_inline_digest_2244.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9244,54 +9193,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2290.children + JSCompiler_object_inline_stack_2245.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2288) + if (JSCompiler_object_inline_message_2243) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2288 = - JSCompiler_object_inline_stack_2290.fallback), - (JSCompiler_object_inline_digest_2289 = workInProgress.mode), + (JSCompiler_object_inline_message_2243 = + JSCompiler_object_inline_stack_2245.fallback), + (JSCompiler_object_inline_digest_2244 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2290 = createWorkInProgress( + (JSCompiler_object_inline_stack_2245 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2290.children + children: JSCompiler_object_inline_stack_2245.children } )), - (JSCompiler_object_inline_stack_2290.subtreeFlags = + (JSCompiler_object_inline_stack_2245.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2288 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2243 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2288 + JSCompiler_object_inline_message_2243 )) - : ((JSCompiler_object_inline_message_2288 = createFiberFromFragment( - JSCompiler_object_inline_message_2288, - JSCompiler_object_inline_digest_2289, + : ((JSCompiler_object_inline_message_2243 = createFiberFromFragment( + JSCompiler_object_inline_message_2243, + JSCompiler_object_inline_digest_2244, renderLanes, null )), - (JSCompiler_object_inline_message_2288.flags |= 2)), - (JSCompiler_object_inline_message_2288.return = workInProgress), - (JSCompiler_object_inline_stack_2290.return = workInProgress), - (JSCompiler_object_inline_stack_2290.sibling = - JSCompiler_object_inline_message_2288), - (workInProgress.child = JSCompiler_object_inline_stack_2290), - (JSCompiler_object_inline_stack_2290 = - JSCompiler_object_inline_message_2288), - (JSCompiler_object_inline_message_2288 = workInProgress.child), - (JSCompiler_object_inline_digest_2289 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2289 - ? (JSCompiler_object_inline_digest_2289 = + (JSCompiler_object_inline_message_2243.flags |= 2)), + (JSCompiler_object_inline_message_2243.return = workInProgress), + (JSCompiler_object_inline_stack_2245.return = workInProgress), + (JSCompiler_object_inline_stack_2245.sibling = + JSCompiler_object_inline_message_2243), + (workInProgress.child = JSCompiler_object_inline_stack_2245), + (JSCompiler_object_inline_stack_2245 = + JSCompiler_object_inline_message_2243), + (JSCompiler_object_inline_message_2243 = workInProgress.child), + (JSCompiler_object_inline_digest_2244 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2244 + ? (JSCompiler_object_inline_digest_2244 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2289.cachePool), + JSCompiler_object_inline_digest_2244.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9299,38 +9248,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2289 = { + (JSCompiler_object_inline_digest_2244 = { baseLanes: - JSCompiler_object_inline_digest_2289.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2244.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2288.memoizedState = - JSCompiler_object_inline_digest_2289), - (JSCompiler_object_inline_message_2288.childLanes = + (JSCompiler_object_inline_message_2243.memoizedState = + JSCompiler_object_inline_digest_2244), + (JSCompiler_object_inline_message_2243.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2291, + JSCompiler_object_inline_componentStack_2246, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2290 + JSCompiler_object_inline_stack_2245 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2290.children + children: JSCompiler_object_inline_stack_2245.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2291 = + ((JSCompiler_object_inline_componentStack_2246 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2291 + null === JSCompiler_object_inline_componentStack_2246 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2291.push(current)); + : JSCompiler_object_inline_componentStack_2246.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9679,6 +9628,7 @@ case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -10265,6 +10215,7 @@ case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), (returnFiber.effectDuration = 0), (returnFiber.passiveEffectDuration = 0), @@ -10306,13 +10257,11 @@ ), prepareToReadContext(workInProgress), (prevSibling = readContext(prevSibling)), - markComponentRenderStarted(workInProgress), (returnFiber = callComponentInDEV( returnFiber, prevSibling, void 0 )), - markComponentRenderStopped(), (workInProgress.flags |= 1), reconcileChildren( current, @@ -10951,21 +10900,7 @@ do { if ( (updateQueue.tag & flags) === flags && - ((flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStarted && - injectedProfilingHooks.markComponentPassiveEffectMountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStarted && - injectedProfilingHooks.markComponentLayoutEffectMountStarted( - finishedWork - ), - (lastEffect = void 0), + ((lastEffect = void 0), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), (lastEffect = runWithFiberInDEV( @@ -10975,16 +10910,6 @@ )), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStopped && - injectedProfilingHooks.markComponentPassiveEffectMountStopped() - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStopped && - injectedProfilingHooks.markComponentLayoutEffectMountStopped(), void 0 !== lastEffect && "function" !== typeof lastEffect) ) { var hookName = void 0; @@ -11042,15 +10967,6 @@ destroy = inst.destroy; void 0 !== destroy && ((inst.destroy = void 0), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStarted && - injectedProfilingHooks.markComponentPassiveEffectUnmountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStarted(finishedWork), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), runWithFiberInDEV( @@ -11061,14 +10977,7 @@ destroy ), (flags & Insertion) !== NoFlags && - (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && - injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStopped()); + (isRunningInsertionEffect = !1)); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -11269,20 +11178,21 @@ recordLayoutEffectDuration(current); } else runWithFiberInDEV(current, ref, null); - } catch (error$6) { - captureCommitPhaseError(current, nearestMountedAncestor, error$6); + } catch (error$7) { + captureCommitPhaseError(current, nearestMountedAncestor, error$7); } else ref.current = null; } function commitProfiler(finishedWork, current, commitTime, effectDuration) { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit; _finishedWork$memoize = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof _finishedWork$memoize && _finishedWork$memoize( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -11317,6 +11227,25 @@ captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + function commitProfilerPostCommitImpl( + finishedWork, + current, + commitTime, + passiveEffectDuration + ) { + var _finishedWork$memoize2 = finishedWork.memoizedProps; + finishedWork = _finishedWork$memoize2.id; + _finishedWork$memoize2 = _finishedWork$memoize2.onPostCommit; + current = null === current ? "mount" : "update"; + currentUpdateIsNested && (current = "nested-update"); + "function" === typeof _finishedWork$memoize2 && + _finishedWork$memoize2( + finishedWork, + current, + passiveEffectDuration, + commitTime + ); + } function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -11472,8 +11401,9 @@ ); } function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -11495,7 +11425,7 @@ selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$2) { + } catch (e$3) { JSCompiler_temp = null; break a; } @@ -11754,7 +11684,6 @@ a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -11974,41 +11903,39 @@ ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - var tag = prevHostParentIsContainer.tag, - inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - ((tag & Insertion) !== NoFlags - ? ((inst.destroy = void 0), + var _tag = prevHostParentIsContainer.tag, + _inst = prevHostParentIsContainer.inst, + _destroy = _inst.destroy; + void 0 !== _destroy && + ((_tag & Insertion) !== NoFlags + ? ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )) - : (tag & Layout) !== NoFlags && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - shouldProfile(deletedFiber) + : (_tag & Layout) !== NoFlags && + (shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), - (inst.destroy = void 0), + (_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy ), recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), + : ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy - )), - markComponentLayoutEffectUnmountStopped())); + _destroy + )))); prevHostParentIsContainer = prevHostParentIsContainer.next; } while (prevHostParentIsContainer !== prevHostParent); } @@ -12802,7 +12729,6 @@ commitTime, includeWorkInProgressEffects ), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12889,25 +12815,47 @@ root, parentFiber, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - if (parentFiber.subtreeFlags & 10256) - for (parentFiber = parentFiber.child; null !== parentFiber; ) + if ( + parentFiber.subtreeFlags & 10256 || + (0 !== parentFiber.actualDuration && + (null === parentFiber.alternate || + parentFiber.alternate.child !== parentFiber.child)) + ) + for (parentFiber = parentFiber.child; null !== parentFiber; ) { + var nextSibling = parentFiber.sibling; commitPassiveMountOnFiber( root, parentFiber, committedLanes, - committedTransitions - ), - (parentFiber = parentFiber.sibling); + committedTransitions, + null !== nextSibling ? nextSibling.actualStartTime : endTime + ); + parentFiber = nextSibling; + } } function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - var flags = finishedWork.flags; + if ( + (finishedWork.mode & ProfileMode) !== NoMode && + 0 < finishedWork.actualStartTime + ) { + var startTime = finishedWork.actualStartTime, + name = getComponentNameFromFiber(finishedWork); + null !== name && + supportsUserTiming && + ((reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(name, reusableComponentOptions)); + } + startTime = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12916,9 +12864,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: @@ -12926,9 +12875,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && ((finishedRoot = null), null !== finishedWork.alternate && (finishedRoot = finishedWork.alternate.memoizedState.cache), @@ -12937,30 +12887,68 @@ (retainCache(finishedWork), null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + if (startTime & 2048 && executionContext & CommitContext) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + runWithFiberInDEV( + finishedWork, + commitProfilerPostCommitImpl, + finishedWork, + finishedWork.alternate, + commitTime, + finishedRoot + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: - var _instance = finishedWork.stateNode; + name = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _instance._visibility & OffscreenPassiveEffectsConnected + ? name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) : recursivelyTraverseAtomicPassiveEffects( finishedRoot, finishedWork ) - : _instance._visibility & OffscreenPassiveEffectsConnected + : name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) - : ((_instance._visibility |= OffscreenPassiveEffectsConnected), + : ((name._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -12968,7 +12956,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - flags & 2048 && + startTime & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -12979,9 +12967,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -12989,7 +12978,8 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); } } @@ -13344,9 +13334,9 @@ this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; this._debugTask = this._debugStack = this._debugOwner = @@ -13385,8 +13375,8 @@ (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -14604,6 +14594,7 @@ } a: { renderWasConcurrent = root; + completeTime = now(); switch (didTimeout) { case RootInProgress: case RootFatalErrored: @@ -14887,6 +14878,7 @@ ensureRootIsScheduled(root), null ); + completeTime = now(); root.finishedWork = root.current.alternate; root.finishedLanes = lanes; commitRoot( @@ -14995,42 +14987,14 @@ : SuspendedOnError); workInProgressThrownValue = thrownValue; var erroredWork = workInProgress; - if (null === erroredWork) - (workInProgressRootExitStatus = RootFatalErrored), + null === erroredWork + ? ((workInProgressRootExitStatus = RootFatalErrored), logUncaughtError( root, createCapturedValueAtFiber(thrownValue, root.current) - ); - else - switch ( - (erroredWork.mode & ProfileMode && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), - markComponentRenderStopped(), - workInProgressSuspendedReason) - ) { - case SuspendedOnError: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentErrored && - injectedProfilingHooks.markComponentErrored( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - break; - case SuspendedOnData: - case SuspendedOnImmediate: - case SuspendedOnDeprecatedThrowPromise: - case SuspendedAndReadyToContinue: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentSuspended && - injectedProfilingHooks.markComponentSuspended( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - } + )) + : erroredWork.mode & ProfileMode && + stopProfilerTimerIfRunningAndRecordDuration(erroredWork); } function shouldRemainOnPreviousScreen() { var handler = suspenseHandlerStackCursor.current; @@ -15093,7 +15057,6 @@ workInProgressTransitions = null; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); lanes = !1; a: do try { @@ -15127,8 +15090,8 @@ } workLoopSync(); break; - } catch (thrownValue$8) { - handleThrow(root, thrownValue$8); + } catch (thrownValue$9) { + handleThrow(root, thrownValue$9); } while (1); lanes && root.shellSuspendCounter++; @@ -15140,7 +15103,6 @@ throw Error( "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue." ); - markRenderStopped(); workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15169,7 +15131,6 @@ workInProgressRootRenderTargetTime = now$1() + RENDER_TIMEOUT_MS; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); a: do try { if ( @@ -15288,22 +15249,15 @@ ? workLoopSync() : workLoopConcurrent(); break; - } catch (thrownValue$9) { - handleThrow(root, thrownValue$9); + } catch (thrownValue$10) { + handleThrow(root, thrownValue$10); } while (1); resetContextDependencies(); ReactSharedInternals.H = prevDispatcher; ReactSharedInternals.A = prevAsyncDispatcher; executionContext = prevExecutionContext; - if (null !== workInProgress) - return ( - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderYielded && - injectedProfilingHooks.markRenderYielded(), - RootInProgress - ); - markRenderStopped(); + if (null !== workInProgress) return RootInProgress; workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15324,7 +15278,7 @@ unitOfWork, entangledRenderLanes )), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = runWithFiberInDEV( unitOfWork, beginWork, @@ -15377,7 +15331,7 @@ (current = beginWork(current, unitOfWork, entangledRenderLanes)); } isProfilingMode && - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0); + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork); return current; } function throwAndUnwindWorkLoop(root, unitOfWork, thrownValue) { @@ -15430,23 +15384,16 @@ } var current = completedWork.alternate; unitOfWork = completedWork.return; - (completedWork.mode & ProfileMode) === NoMode - ? (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )) - : (startProfilerTimer(completedWork), - (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = runWithFiberInDEV( + completedWork, + completeWork, + current, + completedWork, + entangledRenderLanes + ); + (completedWork.mode & ProfileMode) !== NoMode && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -15470,7 +15417,7 @@ return; } if ((unitOfWork.mode & ProfileMode) !== NoMode) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -15541,10 +15488,7 @@ throw Error("Should not already be working."); var finishedWork = root.finishedWork, lanes = root.finishedLanes; - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStarted && - injectedProfilingHooks.markCommitStarted(lanes); - if (null === finishedWork) return markCommitStopped(), null; + if (null === finishedWork) return null; 0 === lanes && console.error( "root.finishedLanes should not be empty during a commit. This is a bug in React." @@ -15572,7 +15516,8 @@ root === workInProgressRoot && ((workInProgress = workInProgressRoot = null), (workInProgressRootRenderLanes = 0)); - (0 === (finishedWork.subtreeFlags & 10256) && + (0 === finishedWork.actualDuration && + 0 === (finishedWork.subtreeFlags & 10256) && 0 === (finishedWork.flags & 10256)) || rootDoesHavePassiveEffects || ((rootDoesHavePassiveEffects = !0), @@ -15593,19 +15538,11 @@ commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStarted && - injectedProfilingHooks.markLayoutEffectsStarted(lanes), commitLayoutEffects(finishedWork, root, lanes), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStopped && - injectedProfilingHooks.markLayoutEffectsStopped(), requestPaint(), (executionContext = updatedLanes), (ReactDOMSharedInternals.p = spawnedLane), @@ -15650,7 +15587,6 @@ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))) : (nestedUpdateCount = 0); flushSyncWorkAcrossRoots_impl(0, !1); - markCommitStopped(); return null; } function makeErrorInfo(componentStack) { @@ -15688,10 +15624,10 @@ if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + priority = pendingPassiveTransitions; pendingPassiveTransitions = null; - priority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root$jscomp$0 = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if ( @@ -15701,75 +15637,36 @@ throw Error( "Cannot flush passive effects while already rendering." ); + reusableComponentDevToolDetails.track = + lanes & 63 + ? "Blocking" + : lanes & 4194240 + ? "Transition" + : lanes & 62914560 + ? "Suspense" + : lanes & 2080374784 + ? "Idle" + : "Other"; isFlushingPassiveEffects = !0; didScheduleUpdateDuringPassiveEffects = !1; - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStarted && - injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(priority.current); + commitPassiveUnmountOnFiber(root$jscomp$0.current); commitPassiveMountOnFiber( - priority, - priority.current, + root$jscomp$0, + root$jscomp$0.current, lanes, - transitions + priority, + completeTime ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if ( - executionContext & CommitContext && - 0 !== (finishedWork.flags & 4) - ) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$jscomp$0 = commitTime, - phase = - null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$jscomp$0 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStopped && - injectedProfilingHooks.markPassiveEffectsStopped(); - commitDoubleInvokeEffectsInDEV(priority); + commitDoubleInvokeEffectsInDEV(root$jscomp$0); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects - ? priority === rootWithPassiveNestedUpdates + ? root$jscomp$0 === rootWithPassiveNestedUpdates ? nestedPassiveUpdateCount++ : ((nestedPassiveUpdateCount = 0), - (rootWithPassiveNestedUpdates = priority)) + (rootWithPassiveNestedUpdates = root$jscomp$0)) : (nestedPassiveUpdateCount = 0); didScheduleUpdateDuringPassiveEffects = isFlushingPassiveEffects = !1; @@ -15778,7 +15675,7 @@ "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, priority); + injectedHook.onPostCommitFiberRoot(rendererID, root$jscomp$0); } catch (err) { hasLoggedError || ((hasLoggedError = !0), @@ -15787,7 +15684,7 @@ err )); } - var stateNode = priority.current.stateNode; + var stateNode = root$jscomp$0.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -15801,15 +15698,6 @@ } return !1; } - function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); - } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -20362,7 +20250,7 @@ ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -20540,9 +20428,6 @@ err )); } - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderScheduled && - injectedProfilingHooks.markRenderScheduled(lane); parentComponent = getContextForSubtree(parentComponent); null === container.context ? (container.context = parentComponent) @@ -20591,14 +20476,6 @@ function getCurrentFiberForDevTools() { return current; } - function getLaneLabelMap() { - for (var map = new Map(), lane = 1, index = 0; 31 > index; index++) { - var label = getLabelForLane(lane); - map.set(lane, label); - lane *= 2; - } - return map; - } function dispatchDiscreteEvent( domEventName, eventSystemFlags, @@ -21291,7 +21168,6 @@ unstable_setDisableYieldValue = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, - injectedProfilingHooks = null, hasLoggedError = !1, isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__, clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, @@ -22507,12 +22383,27 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, + completeTime = 0, commitTime = 0, layoutEffectStartTime = -1, profilerStartTime = -1, passiveEffectStartTime = -1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, + supportsUserTiming = + "undefined" !== typeof performance && + "function" === typeof performance.measure, + reusableComponentDevToolDetails = { + dataType: "track-entry", + color: "primary", + track: "Blocking", + trackGroup: "Components \u269b" + }, + reusableComponentOptions = { + start: -0, + end: -0, + detail: { devtools: reusableComponentDevToolDetails } + }, ReactStrictModeWarnings = { recordUnsafeLifecycleWarnings: function () {}, flushPendingUnsafeLifecycleWarnings: function () {}, @@ -24135,7 +24026,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueReplaceState: function (inst, payload, callback) { inst = inst._reactInternals; @@ -24150,7 +24040,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueForceUpdate: function (inst, callback) { inst = inst._reactInternals; @@ -24164,10 +24053,6 @@ null !== callback && (scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markForceUpdateScheduled && - injectedProfilingHooks.markForceUpdateScheduled(inst, lane); } }, reportGlobalError = @@ -24252,7 +24137,7 @@ var nonExtensibleObject = Object.preventExtensions({}); new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); - } catch (e$7) { + } catch (e$8) { hasBadMapPolyfill = !0; } var DefaultAsyncDispatcher = { @@ -24325,7 +24210,6 @@ rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, NESTED_UPDATE_LIMIT = 50, @@ -24881,11 +24765,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24922,11 +24806,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912" + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24941,8 +24825,6 @@ internals.scheduleRoot = scheduleRoot; internals.setRefreshHandler = setRefreshHandler; internals.getCurrentFiber = getCurrentFiberForDevTools; - internals.getLaneLabelMap = getLaneLabelMap; - internals.injectProfilingHooks = injectProfilingHooks; return injectInternals(internals); })() && canUseDOM && @@ -25400,7 +25282,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; "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 0d8e53c157f31..8eedf1fa889e9 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 @@ -121,6 +121,62 @@ function getComponentNameFromType(type) { } return null; } +function getComponentNameFromFiber(fiber) { + var type = fiber.type; + switch (fiber.tag) { + case 24: + return "Cache"; + case 9: + return (type._context.displayName || "Context") + ".Consumer"; + case 10: + return (type.displayName || "Context") + ".Provider"; + case 18: + return "DehydratedFragment"; + case 11: + return ( + (fiber = type.render), + (fiber = fiber.displayName || fiber.name || ""), + type.displayName || + ("" !== fiber ? "ForwardRef(" + fiber + ")" : "ForwardRef") + ); + case 7: + return "Fragment"; + case 26: + case 27: + case 5: + return type; + case 4: + return "Portal"; + case 3: + return "Root"; + case 6: + return "Text"; + case 16: + return getComponentNameFromType(type); + case 8: + return type === REACT_STRICT_MODE_TYPE ? "StrictMode" : "Mode"; + case 22: + return "Offscreen"; + case 12: + return "Profiler"; + case 21: + return "Scope"; + case 13: + return "Suspense"; + case 19: + return "SuspenseList"; + case 25: + return "TracingMarker"; + case 1: + case 0: + case 14: + case 15: + if ("function" === typeof type) + return type.displayName || type.name || null; + if ("string" === typeof type) return type; + } + return null; +} var ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, assign = Object.assign, @@ -170,16 +226,16 @@ function describeNativeComponentFrame(fn, construct) { } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -368,36 +424,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$2 = parentA.child; child$2; ) { - if (child$2 === a) { + for (var didFindChild = !1, child$3 = parentA.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) { - for (child$2 = parentB.child; child$2; ) { - if (child$2 === a) { + for (child$3 = parentB.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) throw Error(formatProdErrorMessage(189)); } @@ -517,7 +573,6 @@ var hasOwnProperty = Object.prototype.hasOwnProperty, unstable_setDisableYieldValue = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, - injectedProfilingHooks = null, isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__; function onCommitRoot(root, eventPriority) { if (injectedHook && "function" === typeof injectedHook.onCommitFiberRoot) @@ -554,48 +609,6 @@ function setIsStrictModeForDevtools(newIsStrictMode) { injectedHook.setStrictMode(rendererID, newIsStrictMode); } catch (err) {} } -function markCommitStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStopped && - injectedProfilingHooks.markCommitStopped(); -} -function markComponentRenderStarted(fiber) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markComponentRenderStarted && - injectedProfilingHooks.markComponentRenderStarted(fiber); -} -function markComponentRenderStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markComponentRenderStopped && - injectedProfilingHooks.markComponentRenderStopped(); -} -function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); -} -function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); -} -function markRenderStarted(lanes) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStarted && - injectedProfilingHooks.markRenderStarted(lanes); -} -function markRenderStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStopped && - injectedProfilingHooks.markRenderStopped(); -} -function markStateUpdateScheduled(fiber, lane) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markStateUpdateScheduled && - injectedProfilingHooks.markStateUpdateScheduled(fiber, lane); -} var clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, log = Math.log, LN2 = Math.LN2; @@ -603,22 +616,6 @@ function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } -function getLabelForLane(lane) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 4194176) return "Transition"; - if (lane & 62914560) return "Retry"; - if (lane & 67108864) return "SelectiveHydration"; - if (lane & 134217728) return "IdleHydration"; - if (lane & 268435456) return "Idle"; - if (lane & 536870912) return "Offscreen"; - if (lane & 1073741824) return "Deferred"; -} var nextTransitionLane = 128, nextRetryLane = 4194304; function getHighestPriorityLanes(lanes) { @@ -802,18 +799,18 @@ function markRootFinished( 0 < remainingLanes; ) { - var index$7 = 31 - clz32(remainingLanes), - lane = 1 << index$7; - entanglements[index$7] = 0; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = hiddenUpdates[index$7]; + var index$8 = 31 - clz32(remainingLanes), + lane = 1 << index$8; + entanglements[index$8] = 0; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = hiddenUpdates[index$8]; if (null !== hiddenUpdatesForLane) for ( - hiddenUpdates[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + hiddenUpdates[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -536870913); } remainingLanes &= ~lane; @@ -838,19 +835,19 @@ function markSpawnedDeferredLane(root, spawnedLane, entangledLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } function addFiberToLanesMap(root, fiber, lanes) { if (isDevToolsPresent) for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) { - var index$10 = 31 - clz32(lanes), - lane = 1 << index$10; - root[index$10].add(fiber); + var index$11 = 31 - clz32(lanes), + lane = 1 << index$11; + root[index$11].add(fiber); lanes &= ~lane; } } @@ -862,16 +859,16 @@ function movePendingFibersToMemoized(root, lanes) { 0 < lanes; ) { - var index$11 = 31 - clz32(lanes); - root = 1 << index$11; - index$11 = pendingUpdatersLaneMap[index$11]; - 0 < index$11.size && - (index$11.forEach(function (fiber) { + var index$12 = 31 - clz32(lanes); + root = 1 << index$12; + index$12 = pendingUpdatersLaneMap[index$12]; + 0 < index$12.size && + (index$12.forEach(function (fiber) { var alternate = fiber.alternate; (null !== alternate && memoizedUpdaters.has(alternate)) || memoizedUpdaters.add(fiber); }), - index$11.clear()); + index$12.clear()); lanes &= ~root; } } @@ -1021,8 +1018,8 @@ function setValueForAttribute(node, name, value) { node.removeAttribute(name); return; case "boolean": - var prefix$12 = name.toLowerCase().slice(0, 5); - if ("data-" !== prefix$12 && "aria-" !== prefix$12) { + var prefix$13 = name.toLowerCase().slice(0, 5); + if ("data-" !== prefix$13 && "aria-" !== prefix$13) { node.removeAttribute(name); return; } @@ -1355,15 +1352,15 @@ function setValueForStyles(node, styles, prevStyles) { : "float" === styleName ? (node.cssFloat = "") : (node[styleName] = "")); - for (var styleName$18 in styles) - (styleName = styles[styleName$18]), - styles.hasOwnProperty(styleName$18) && - prevStyles[styleName$18] !== styleName && - setValueForStyle(node, styleName$18, styleName); - } else for (var styleName$19 in styles) - styles.hasOwnProperty(styleName$19) && - setValueForStyle(node, styleName$19, styles[styleName$19]); + (styleName = styles[styleName$19]), + styles.hasOwnProperty(styleName$19) && + prevStyles[styleName$19] !== styleName && + setValueForStyle(node, styleName$19, styleName); + } else + for (var styleName$20 in styles) + styles.hasOwnProperty(styleName$20) && + setValueForStyle(node, styleName$20, styles[styleName$20]); } function isCustomElement(tagName) { if (-1 === tagName.indexOf("-")) return !1; @@ -2092,19 +2089,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$299; + var JSCompiler_inline_result$jscomp$298; if (canUseDOM) { - var isSupported$jscomp$inline_435 = "oninput" in document; - if (!isSupported$jscomp$inline_435) { - var element$jscomp$inline_436 = document.createElement("div"); - element$jscomp$inline_436.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_435 = - "function" === typeof element$jscomp$inline_436.oninput; + var isSupported$jscomp$inline_434 = "oninput" in document; + if (!isSupported$jscomp$inline_434) { + var element$jscomp$inline_435 = document.createElement("div"); + element$jscomp$inline_435.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_434 = + "function" === typeof element$jscomp$inline_435.oninput; } - JSCompiler_inline_result$jscomp$299 = isSupported$jscomp$inline_435; - } else JSCompiler_inline_result$jscomp$299 = !1; + JSCompiler_inline_result$jscomp$298 = isSupported$jscomp$inline_434; + } else JSCompiler_inline_result$jscomp$298 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$299 && + JSCompiler_inline_result$jscomp$298 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2218,23 +2215,42 @@ function containsNode(outerNode, innerNode) { : !1 : !1; } -function getActiveElementDeep() { +function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm1303423239$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm1303423239$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm1303423239$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm1303423239$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm1303423239$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm1303423239$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm1303423239$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm1303423239$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm1303423239$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2250,101 +2266,95 @@ function hasSelectionCapabilities(elem) { "true" === elem.contentEditable) ); } -function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; +function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { - if ( - null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) - ) + if (null !== priorSelectionRange && hasSelectionCapabilities(containerInfo)) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } var skipSelectionChangeEvent = @@ -2521,6 +2531,7 @@ function getRootForUpdatedFiber(sourceFiber) { } var emptyContextObject = {}, now = Scheduler.unstable_now, + completeTime = 0, commitTime = 0, layoutEffectStartTime = -1, profilerStartTime = -1, @@ -2531,11 +2542,18 @@ function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } -function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { +function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } +} +function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -2582,7 +2600,21 @@ function transferActualDuration(fiber) { for (var child = fiber.child; child; ) (fiber.actualDuration += child.actualDuration), (child = child.sibling); } -var CapturedStacks = new WeakMap(); +var supportsUserTiming = + "undefined" !== typeof performance && + "function" === typeof performance.measure, + reusableComponentDevToolDetails = { + dataType: "track-entry", + color: "primary", + track: "Blocking", + trackGroup: "Components \u269b" + }, + reusableComponentOptions = { + start: -0, + end: -0, + detail: { devtools: reusableComponentDevToolDetails } + }, + CapturedStacks = new WeakMap(); function createCapturedValueAtFiber(value, source) { if ("object" === typeof value && null !== value) { var stack = CapturedStacks.get(value); @@ -4106,7 +4138,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$59 = !1; + didReadFromEntangledAsyncAction$60 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -4127,11 +4159,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$59 = !0); + (didReadFromEntangledAsyncAction$60 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$59 = !0); + (didReadFromEntangledAsyncAction$60 = !0); continue; } else (updateLane = { @@ -4177,7 +4209,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$59 && + didReadFromEntangledAsyncAction$60 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4375,8 +4407,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$65) { - onActionError(actionQueue, node, error$65); + } catch (error$66) { + onActionError(actionQueue, node, error$66); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4813,14 +4845,14 @@ function refreshCache(fiber, seedKey, seedValue) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$68 = enqueueUpdate(provider, fiber, lane); - null !== root$68 && - (scheduleUpdateOnFiber(root$68, provider, lane), - entangleTransitions(root$68, provider, lane)); + var root$69 = enqueueUpdate(provider, fiber, lane); + null !== root$69 && + (scheduleUpdateOnFiber(root$69, provider, lane), + entangleTransitions(root$69, provider, lane)); provider = createCache(); null !== seedKey && void 0 !== seedKey && - null !== root$68 && + null !== root$69 && provider.data.set(seedKey, seedValue); fiber.payload = { cache: provider }; return; @@ -4844,7 +4876,6 @@ function dispatchReducerAction(fiber, queue, action) { null !== action && (scheduleUpdateOnFiber(action, fiber, lane), entangleTransitionUpdate(action, queue, lane))); - markStateUpdateScheduled(fiber, lane); } function dispatchSetState(fiber, queue, action) { var lane = requestUpdateLane(), @@ -4882,7 +4913,6 @@ function dispatchSetState(fiber, queue, action) { (scheduleUpdateOnFiber(action, fiber, lane), entangleTransitionUpdate(action, queue, lane)); } - markStateUpdateScheduled(fiber, lane); } function dispatchOptimisticSetState(fiber, throwIfDuringRender, queue, action) { action = { @@ -4904,7 +4934,6 @@ function dispatchOptimisticSetState(fiber, throwIfDuringRender, queue, action) { )), null !== throwIfDuringRender && scheduleUpdateOnFiber(throwIfDuringRender, fiber, 2); - markStateUpdateScheduled(fiber, 2); } function isRenderPhaseUpdate(fiber) { var alternate = fiber.alternate; @@ -5282,7 +5311,6 @@ var classComponentUpdater = { null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueReplaceState: function (inst, payload, callback) { inst = inst._reactInternals; @@ -5295,7 +5323,6 @@ var classComponentUpdater = { null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueForceUpdate: function (inst, callback) { inst = inst._reactInternals; @@ -5307,9 +5334,6 @@ var classComponentUpdater = { null !== callback && (scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markForceUpdateScheduled && - injectedProfilingHooks.markForceUpdateScheduled(inst, lane); } }; function checkShouldComponentUpdate( @@ -5351,9 +5375,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$72 in Component) - void 0 === newProps[propName$72] && - (newProps[propName$72] = Component[propName$72]); + for (var propName$73 in Component) + void 0 === newProps[propName$73] && + (newProps[propName$73] = Component[propName$73]); } return newProps; } @@ -5399,9 +5423,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$73) { + } catch (e$74) { setTimeout(function () { - throw e$73; + throw e$74; }); } } @@ -5412,9 +5436,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$74) { + } catch (e$75) { setTimeout(function () { - throw e$74; + throw e$75; }); } } @@ -5670,7 +5694,6 @@ function updateForwardRef( "ref" !== key && (propsWithoutRef[key] = nextProps[key]); } else propsWithoutRef = nextProps; prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); nextProps = renderWithHooks( current, workInProgress, @@ -5680,7 +5703,6 @@ function updateForwardRef( renderLanes ); key = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -5877,7 +5899,6 @@ function updateFunctionComponent( renderLanes ) { prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); Component = renderWithHooks( current, workInProgress, @@ -5887,7 +5908,6 @@ function updateFunctionComponent( renderLanes ); nextProps = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -5907,7 +5927,6 @@ function replayFunctionComponent( renderLanes ) { prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); workInProgress.updateQueue = null; nextProps = renderWithHooksAgain( workInProgress, @@ -5917,7 +5936,6 @@ function replayFunctionComponent( ); finishRenderingHooks(current); Component = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -6163,9 +6181,7 @@ function updateClassComponent( ? ((context = workInProgress.stateNode), nextProps && "function" !== typeof Component.getDerivedStateFromError ? ((Component = null), (profilerStartTime = -1)) - : (markComponentRenderStarted(workInProgress), - (Component = context.render()), - markComponentRenderStopped()), + : (Component = context.render()), (workInProgress.flags |= 1), null !== current && nextProps ? ((workInProgress.child = reconcileChildFibers( @@ -6806,6 +6822,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate( case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -7245,6 +7262,7 @@ function beginWork(current, workInProgress, renderLanes) { case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (lazyComponent = workInProgress.stateNode), (lazyComponent.effectDuration = 0), (lazyComponent.passiveEffectDuration = 0), @@ -7274,9 +7292,7 @@ function beginWork(current, workInProgress, renderLanes) { (lazyComponent = workInProgress.pendingProps.children), prepareToReadContext(workInProgress), (init = readContext(init)), - markComponentRenderStarted(workInProgress), (lazyComponent = lazyComponent(init)), - markComponentRenderStopped(), (workInProgress.flags |= 1), reconcileChildren(current, workInProgress, lazyComponent, renderLanes), workInProgress.child @@ -7796,35 +7812,11 @@ function commitHookEffectListMount(flags, finishedWork) { updateQueue = firstEffect; do { if ((updateQueue.tag & flags) === flags) { - 0 !== (flags & 8) - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStarted && - injectedProfilingHooks.markComponentPassiveEffectMountStarted( - finishedWork - ) - : 0 !== (flags & 4) && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStarted && - injectedProfilingHooks.markComponentLayoutEffectMountStarted( - finishedWork - ); lastEffect = void 0; var create = updateQueue.create, inst = updateQueue.inst; lastEffect = create(); inst.destroy = lastEffect; - 0 !== (flags & 8) - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStopped && - injectedProfilingHooks.markComponentPassiveEffectMountStopped() - : 0 !== (flags & 4) && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStopped && - injectedProfilingHooks.markComponentLayoutEffectMountStopped(); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7850,22 +7842,7 @@ function commitHookEffectListUnmount( destroy = inst.destroy; void 0 !== destroy && ((inst.destroy = void 0), - 0 !== (flags & 8) - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStarted && - injectedProfilingHooks.markComponentPassiveEffectUnmountStarted( - finishedWork - ) - : 0 !== (flags & 4) && - markComponentLayoutEffectUnmountStarted(finishedWork), - safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy), - 0 !== (flags & 8) - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && - injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() - : 0 !== (flags & 4) && markComponentLayoutEffectUnmountStopped()); + safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy)); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -7932,8 +7909,8 @@ function safelyCallComponentWillUnmount( } else try { instance.componentWillUnmount(); - } catch (error$122) { - captureCommitPhaseError(current, nearestMountedAncestor, error$122); + } catch (error$123) { + captureCommitPhaseError(current, nearestMountedAncestor, error$123); } } function safelyAttachRef(current, nearestMountedAncestor) { @@ -7993,8 +7970,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordLayoutEffectDuration(current); } else ref(null); - } catch (error$123) { - captureCommitPhaseError(current, nearestMountedAncestor, error$123); + } catch (error$124) { + captureCommitPhaseError(current, nearestMountedAncestor, error$124); } else ref.current = null; } @@ -8014,13 +7991,14 @@ function commitProfilerUpdate( if (executionContext & 4) try { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit, onRender = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof onRender && onRender( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -8149,8 +8127,9 @@ function shouldProfile(current) { } var shouldFireAfterActiveInstanceBlur = !1; function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -8172,7 +8151,7 @@ function commitBeforeMutationEffects(root, firstChild) { selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$22) { + } catch (e$23) { JSCompiler_temp = null; break a; } @@ -8341,11 +8320,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$119) { + } catch (error$120) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$119 + error$120 ); } else { @@ -8362,11 +8341,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$120) { + } catch (error$121) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$120 + error$121 ); } recordLayoutEffectDuration(finishedWork); @@ -8377,11 +8356,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$121) { + } catch (error$122) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$121 + error$122 ); } } @@ -8424,7 +8403,6 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -8554,7 +8532,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$133 = hostParentIsContainer; + var prevHostParentIsContainer$132 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8562,7 +8540,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$133; + hostParentIsContainer = prevHostParentIsContainer$132; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8630,20 +8608,19 @@ function commitDeletionEffectsOnFiber( ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - prevHostParentIsContainer$133 = prevHostParentIsContainer.tag; + prevHostParentIsContainer$132 = prevHostParentIsContainer.tag; var inst = prevHostParentIsContainer.inst, destroy = inst.destroy; void 0 !== destroy && - (0 !== (prevHostParentIsContainer$133 & 2) + (0 !== (prevHostParentIsContainer$132 & 2) ? ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, nearestMountedAncestor, destroy )) - : 0 !== (prevHostParentIsContainer$133 & 4) && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - shouldProfile(deletedFiber) + : 0 !== (prevHostParentIsContainer$132 & 4) && + (shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), (inst.destroy = void 0), safelyCallDestroy( @@ -8657,8 +8634,7 @@ function commitDeletionEffectsOnFiber( deletedFiber, nearestMountedAncestor, destroy - )), - markComponentLayoutEffectUnmountStopped())); + )))); prevHostParentIsContainer = prevHostParentIsContainer.next; } while (prevHostParentIsContainer !== prevHostParent); } @@ -9239,21 +9215,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$124 = JSCompiler_inline_result.stateNode; + var parent$125 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$124, ""), + (setTextContent(parent$125, ""), (JSCompiler_inline_result.flags &= -33)); - var before$125 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$125, parent$124); + var before$126 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$126, parent$125); break; case 3: case 4: - var parent$126 = JSCompiler_inline_result.stateNode.containerInfo, - before$127 = getHostSibling(finishedWork); + var parent$127 = JSCompiler_inline_result.stateNode.containerInfo, + before$128 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$127, - parent$126 + before$128, + parent$127 ); break; default: @@ -9417,7 +9393,6 @@ function recursivelyTraverseReappearLayoutEffects( a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -9488,25 +9463,44 @@ function recursivelyTraversePassiveMountEffects( root, parentFiber, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - if (parentFiber.subtreeFlags & 10256) - for (parentFiber = parentFiber.child; null !== parentFiber; ) + if ( + parentFiber.subtreeFlags & 10256 || + (0 !== parentFiber.actualDuration && + (null === parentFiber.alternate || + parentFiber.alternate.child !== parentFiber.child)) + ) + for (parentFiber = parentFiber.child; null !== parentFiber; ) { + var nextSibling = parentFiber.sibling; commitPassiveMountOnFiber( root, parentFiber, committedLanes, - committedTransitions - ), - (parentFiber = parentFiber.sibling); + committedTransitions, + null !== nextSibling ? nextSibling.actualStartTime : endTime + ); + parentFiber = nextSibling; + } } function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - var flags = finishedWork.flags; + if (0 !== (finishedWork.mode & 2) && 0 < finishedWork.actualStartTime) { + var startTime = finishedWork.actualStartTime, + name = getComponentNameFromFiber(finishedWork); + null !== name && + supportsUserTiming && + ((reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(name, reusableComponentOptions)); + } + startTime = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -9515,18 +9509,20 @@ function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && commitHookPassiveMountEffects(finishedWork, 9); + startTime & 2048 && commitHookPassiveMountEffects(finishedWork, 9); break; case 3: recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && ((finishedRoot = null), null !== finishedWork.alternate && (finishedRoot = finishedWork.alternate.memoizedState.cache), @@ -9535,27 +9531,64 @@ function commitPassiveMountOnFiber( (finishedWork.refCount++, null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + if (startTime & 2048 && executionContext & 4) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + var _finishedWork$memoize2 = finishedWork.memoizedProps, + id = _finishedWork$memoize2.id, + onPostCommit = _finishedWork$memoize2.onPostCommit, + phase = null === finishedWork.alternate ? "mount" : "update"; + currentUpdateIsNested && (phase = "nested-update"); + "function" === typeof onPostCommit && + onPostCommit(id, phase, finishedRoot, commitTime); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: - var instance = finishedWork.stateNode; + _finishedWork$memoize2 = finishedWork.stateNode; null !== finishedWork.memoizedState - ? instance._visibility & 4 + ? _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : instance._visibility & 4 + : _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) - : ((instance._visibility |= 4), + : ((_finishedWork$memoize2._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9563,7 +9596,7 @@ function commitPassiveMountOnFiber( committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - flags & 2048 && + startTime & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -9574,9 +9607,10 @@ function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -9584,7 +9618,8 @@ function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); } } @@ -9904,9 +9939,9 @@ function FiberNode(tag, pendingProps, key, mode) { this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; } function createFiberImplClass(tag, pendingProps, key, mode) { return new FiberNode(tag, pendingProps, key, mode); @@ -9934,8 +9969,8 @@ function createWorkInProgress(current, pendingProps) { (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -10836,7 +10871,6 @@ var DefaultAsyncDispatcher = { rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, nestedUpdateCount = 0, @@ -10898,15 +10932,14 @@ function performConcurrentWorkOnRoot(root, didTimeout) { root === workInProgressRoot ? workInProgressRootRenderLanes : 0 ); if (0 === lanes) return null; - var shouldTimeSlice = - 0 === (lanes & 60) && 0 === (lanes & root.expiredLanes) && !didTimeout; - didTimeout = shouldTimeSlice + var exitStatus = (didTimeout = + 0 === (lanes & 60) && 0 === (lanes & root.expiredLanes) && !didTimeout) ? renderRootConcurrent(root, lanes) : renderRootSync(root, lanes); - if (0 !== didTimeout) { - var renderWasConcurrent = shouldTimeSlice; + if (0 !== exitStatus) { + var renderWasConcurrent = didTimeout; do { - if (6 === didTimeout) + if (6 === exitStatus) markRootSuspended( root, lanes, @@ -10914,16 +10947,16 @@ function performConcurrentWorkOnRoot(root, didTimeout) { workInProgressRootDidSkipSuspendedSiblings ); else { - shouldTimeSlice = root.current.alternate; + didTimeout = root.current.alternate; if ( renderWasConcurrent && - !isRenderConsistentWithExternalStores(shouldTimeSlice) + !isRenderConsistentWithExternalStores(didTimeout) ) { - didTimeout = renderRootSync(root, lanes); + exitStatus = renderRootSync(root, lanes); renderWasConcurrent = !1; continue; } - if (2 === didTimeout) { + if (2 === exitStatus) { renderWasConcurrent = lanes; var errorRetryLanes = getLanesToRetrySynchronouslyOnError( root, @@ -10932,17 +10965,17 @@ function performConcurrentWorkOnRoot(root, didTimeout) { if ( 0 !== errorRetryLanes && ((lanes = errorRetryLanes), - (didTimeout = recoverFromConcurrentError( + (exitStatus = recoverFromConcurrentError( root, renderWasConcurrent, errorRetryLanes )), (renderWasConcurrent = !1), - 2 !== didTimeout) + 2 !== exitStatus) ) continue; } - if (1 === didTimeout) { + if (1 === exitStatus) { prepareFreshStack(root, 0); markRootSuspended( root, @@ -10954,7 +10987,8 @@ function performConcurrentWorkOnRoot(root, didTimeout) { } a: { renderWasConcurrent = root; - switch (didTimeout) { + completeTime = now(); + switch (exitStatus) { case 0: case 1: throw Error(formatProdErrorMessage(345)); @@ -10978,12 +11012,12 @@ function performConcurrentWorkOnRoot(root, didTimeout) { default: throw Error(formatProdErrorMessage(329)); } - renderWasConcurrent.finishedWork = shouldTimeSlice; + renderWasConcurrent.finishedWork = didTimeout; renderWasConcurrent.finishedLanes = lanes; if ( (lanes & 62914560) === lanes && - ((didTimeout = globalMostRecentFallbackTime + 300 - now$1()), - 10 < didTimeout) + ((exitStatus = globalMostRecentFallbackTime + 300 - now$1()), + 10 < exitStatus) ) { markRootSuspended( renderWasConcurrent, @@ -10996,7 +11030,7 @@ function performConcurrentWorkOnRoot(root, didTimeout) { commitRootWhenReady.bind( null, renderWasConcurrent, - shouldTimeSlice, + didTimeout, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -11006,13 +11040,13 @@ function performConcurrentWorkOnRoot(root, didTimeout) { workInProgressSuspendedRetryLanes, workInProgressRootDidSkipSuspendedSiblings ), - didTimeout + exitStatus ); break a; } commitRootWhenReady( renderWasConcurrent, - shouldTimeSlice, + didTimeout, workInProgressRootRecoverableErrors, workInProgressTransitions, workInProgressRootDidIncludeRecursiveRenderUpdate, @@ -11166,9 +11200,9 @@ function markRootSuspended( didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes); didSkipSuspendedSiblings = root.expirationTimes; for (var lanes = suspendedLanes; 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6; - didSkipSuspendedSiblings[index$6] = -1; + var index$7 = 31 - clz32(lanes), + lane = 1 << index$7; + didSkipSuspendedSiblings[index$7] = -1; lanes &= ~lane; } 0 !== spawnedLane && @@ -11212,6 +11246,7 @@ function performSyncWorkOnRoot(root, lanes) { ensureRootIsScheduled(root), null ); + completeTime = now(); root.finishedWork = root.current.alternate; root.finishedLanes = lanes; commitRoot( @@ -11283,9 +11318,9 @@ function prepareFreshStack(root, lanes) { 0 < allEntangledLanes; ) { - var index$4 = 31 - clz32(allEntangledLanes), - lane = 1 << index$4; - lanes |= root[index$4]; + var index$5 = 31 - clz32(allEntangledLanes), + lane = 1 << index$5; + lanes |= root[index$5]; allEntangledLanes &= ~lane; } entangledRenderLanes = lanes; @@ -11316,40 +11351,14 @@ function handleThrow(root, thrownValue) { : 1); workInProgressThrownValue = thrownValue; var erroredWork = workInProgress; - if (null === erroredWork) - (workInProgressRootExitStatus = 1), + null === erroredWork + ? ((workInProgressRootExitStatus = 1), logUncaughtError( root, createCapturedValueAtFiber(thrownValue, root.current) - ); - else - switch ( - (erroredWork.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), - markComponentRenderStopped(), - workInProgressSuspendedReason) - ) { - case 1: - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markComponentErrored && - injectedProfilingHooks.markComponentErrored( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - break; - case 2: - case 3: - case 6: - case 7: - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markComponentSuspended && - injectedProfilingHooks.markComponentSuspended( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - } + )) + : erroredWork.mode & 2 && + stopProfilerTimerIfRunningAndRecordDuration(erroredWork); } function shouldRemainOnPreviousScreen() { var handler = suspenseHandlerStackCursor.current; @@ -11409,7 +11418,6 @@ function renderRootSync(root, lanes) { workInProgressTransitions = null; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); lanes = !1; a: do try { @@ -11445,7 +11453,6 @@ function renderRootSync(root, lanes) { ReactSharedInternals.H = prevDispatcher; ReactSharedInternals.A = prevAsyncDispatcher; if (null !== workInProgress) throw Error(formatProdErrorMessage(261)); - markRenderStopped(); workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -11471,7 +11478,6 @@ function renderRootConcurrent(root, lanes) { workInProgressRootRenderTargetTime = now$1() + 500; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); a: do try { if (0 !== workInProgressSuspendedReason && null !== workInProgress) @@ -11564,14 +11570,7 @@ function renderRootConcurrent(root, lanes) { ReactSharedInternals.H = prevDispatcher; ReactSharedInternals.A = prevAsyncDispatcher; executionContext = prevExecutionContext; - if (null !== workInProgress) - return ( - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderYielded && - injectedProfilingHooks.markRenderYielded(), - 0 - ); - markRenderStopped(); + if (null !== workInProgress) return 0; workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -11586,7 +11585,7 @@ function performUnitOfWork(unitOfWork) { 0 !== (unitOfWork.mode & 2) ? (startProfilerTimer(unitOfWork), (current = beginWork(current, unitOfWork, entangledRenderLanes)), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = beginWork(current, unitOfWork, entangledRenderLanes)); unitOfWork.memoizedProps = unitOfWork.pendingProps; null === current @@ -11628,7 +11627,7 @@ function replaySuspendedUnitOfWork(unitOfWork) { resetWorkInProgress(next, entangledRenderLanes)), (current = beginWork(current, next, entangledRenderLanes)); } - isProfilingMode && stopProfilerTimerIfRunningAndRecordDelta(next, !0); + isProfilingMode && stopProfilerTimerIfRunningAndRecordDuration(next); next = current; unitOfWork.memoizedProps = unitOfWork.pendingProps; null === next ? completeUnitOfWork(unitOfWork) : (workInProgress = next); @@ -11683,11 +11682,10 @@ function completeUnitOfWork(unitOfWork) { } var current = completedWork.alternate; unitOfWork = completedWork.return; - 0 === (completedWork.mode & 2) - ? (current = completeWork(current, completedWork, entangledRenderLanes)) - : (startProfilerTimer(completedWork), - (current = completeWork(current, completedWork, entangledRenderLanes)), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = completeWork(current, completedWork, entangledRenderLanes); + 0 !== (completedWork.mode & 2) && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -11710,7 +11708,7 @@ function unwindUnitOfWork(unitOfWork, skipSiblings) { return; } if (0 !== (unitOfWork.mode & 2)) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -11776,10 +11774,7 @@ function commitRootImpl( if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(327)); var finishedWork = root.finishedWork, lanes = root.finishedLanes; - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStarted && - injectedProfilingHooks.markCommitStarted(lanes); - if (null === finishedWork) return markCommitStopped(), null; + if (null === finishedWork) return null; root.finishedWork = null; root.finishedLanes = 0; if (finishedWork === root.current) throw Error(formatProdErrorMessage(177)); @@ -11800,7 +11795,8 @@ function commitRootImpl( root === workInProgressRoot && ((workInProgress = workInProgressRoot = null), (workInProgressRootRenderLanes = 0)); - (0 === (finishedWork.subtreeFlags & 10256) && + (0 === finishedWork.actualDuration && + 0 === (finishedWork.subtreeFlags & 10256) && 0 === (finishedWork.flags & 10256)) || rootDoesHavePassiveEffects || ((rootDoesHavePassiveEffects = !0), @@ -11821,17 +11817,11 @@ function commitRootImpl( commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markLayoutEffectsStarted && - injectedProfilingHooks.markLayoutEffectsStarted(lanes), commitLayoutEffects(finishedWork, root, lanes), - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markLayoutEffectsStopped && - injectedProfilingHooks.markLayoutEffectsStopped(), requestPaint(), (executionContext = updatedLanes), (ReactDOMSharedInternals.p = spawnedLane), @@ -11868,7 +11858,6 @@ function commitRootImpl( : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))) : (nestedUpdateCount = 0); flushSyncWorkAcrossRoots_impl(0, !1); - markCommitStopped(); return null; } function releaseRootPooledCache(root, remainingLanes) { @@ -11891,69 +11880,34 @@ function flushPassiveEffects() { if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + renderPriority = pendingPassiveTransitions; pendingPassiveTransitions = null; - renderPriority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if (0 !== (executionContext & 6)) throw Error(formatProdErrorMessage(331)); - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStarted && - injectedProfilingHooks.markPassiveEffectsStarted(lanes); + reusableComponentDevToolDetails.track = + lanes & 63 + ? "Blocking" + : lanes & 4194240 + ? "Transition" + : lanes & 62914560 + ? "Suspense" + : lanes & 2080374784 + ? "Idle" + : "Other"; var prevExecutionContext = executionContext; executionContext |= 4; - commitPassiveUnmountOnFiber(renderPriority.current); + commitPassiveUnmountOnFiber(root.current); commitPassiveMountOnFiber( - renderPriority, - renderPriority.current, + root, + root.current, lanes, - transitions + renderPriority, + completeTime ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if (executionContext & 4 && 0 !== (finishedWork.flags & 4)) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$129 = commitTime, - phase = null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$129 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStopped && - injectedProfilingHooks.markPassiveEffectsStopped(); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); if ( @@ -11961,9 +11915,9 @@ function flushPassiveEffects() { "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, renderPriority); + injectedHook.onPostCommitFiberRoot(rendererID, root); } catch (err) {} - var stateNode = renderPriority.current.stateNode; + var stateNode = root.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -11977,15 +11931,6 @@ function flushPassiveEffects() { } return !1; } -function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); -} function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -12219,12 +12164,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -12388,20 +12333,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1489 = 0; - i$jscomp$inline_1489 < simpleEventPluginEvents.length; - i$jscomp$inline_1489++ + var i$jscomp$inline_1454 = 0; + i$jscomp$inline_1454 < simpleEventPluginEvents.length; + i$jscomp$inline_1454++ ) { - var eventName$jscomp$inline_1490 = - simpleEventPluginEvents[i$jscomp$inline_1489], - domEventName$jscomp$inline_1491 = - eventName$jscomp$inline_1490.toLowerCase(), - capitalizedEvent$jscomp$inline_1492 = - eventName$jscomp$inline_1490[0].toUpperCase() + - eventName$jscomp$inline_1490.slice(1); + var eventName$jscomp$inline_1455 = + simpleEventPluginEvents[i$jscomp$inline_1454], + domEventName$jscomp$inline_1456 = + eventName$jscomp$inline_1455.toLowerCase(), + capitalizedEvent$jscomp$inline_1457 = + eventName$jscomp$inline_1455[0].toUpperCase() + + eventName$jscomp$inline_1455.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1491, - "on" + capitalizedEvent$jscomp$inline_1492 + domEventName$jscomp$inline_1456, + "on" + capitalizedEvent$jscomp$inline_1457 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -15079,7 +15024,7 @@ function insertStylesheetIntoRoot(root, resource) { ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -15227,9 +15172,6 @@ function updateContainerImpl( parentComponent, callback ) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderScheduled && - injectedProfilingHooks.markRenderScheduled(lane); parentComponent = getContextForSubtree(parentComponent); null === container.context ? (container.context = parentComponent) @@ -15861,16 +15803,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1738 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1701 = React.version; if ( - "19.0.0-experimental-206df66e-20240912" !== - isomorphicReactPackageVersion$jscomp$inline_1738 + "19.0.0-experimental-f2df5694-20240916" !== + isomorphicReactPackageVersion$jscomp$inline_1701 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1738, - "19.0.0-experimental-206df66e-20240912" + isomorphicReactPackageVersion$jscomp$inline_1701, + "19.0.0-experimental-f2df5694-20240916" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15890,40 +15832,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_1745 = { +var internals$jscomp$inline_2126 = { bundleType: 0, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912", - getLaneLabelMap: function () { - for ( - var map = new Map(), lane = 1, index$280 = 0; - 31 > index$280; - index$280++ - ) { - var label = getLabelForLane(lane); - map.set(lane, label); - lane *= 2; - } - return map; - }, - injectProfilingHooks: function (profilingHooks) { - injectedProfilingHooks = profilingHooks; - } + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2164 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2127 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2164.isDisabled && - hook$jscomp$inline_2164.supportsFiber + !hook$jscomp$inline_2127.isDisabled && + hook$jscomp$inline_2127.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2164.inject( - internals$jscomp$inline_1745 + (rendererID = hook$jscomp$inline_2127.inject( + internals$jscomp$inline_2126 )), - (injectedHook = hook$jscomp$inline_2164); + (injectedHook = hook$jscomp$inline_2127); } catch (err) {} } function noop() {} @@ -16176,7 +16103,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; "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 96bfb24fcd815..774daf7f6d3c5 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 @@ -9290,5 +9290,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js index ff15989e57f51..25e974d318ee0 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js @@ -6054,4 +6054,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js index 4c3d17465268b..4be5165b99873 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js @@ -9290,5 +9290,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js index 990989c85983f..c46af5f93f575 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js @@ -6146,4 +6146,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js index bd2744a10dd2b..bdac0417b2b56 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js @@ -8190,11 +8190,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -9974,5 +9974,5 @@ startWork(request); }); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js index a29441832bd3b..8feb9000f857a 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js @@ -6585,12 +6585,12 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== isomorphicReactPackageVersion) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion, - "19.0.0-experimental-206df66e-20240912" + "19.0.0-experimental-f2df5694-20240916" ) ); } @@ -6845,4 +6845,4 @@ exports.resumeAndPrerender = function (children, postponedState, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js index 28049f1168f3e..2c786151762bb 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js @@ -6067,13 +6067,13 @@ function addToReplayParent(node, parentKeyPath, trackedPostpones) { } var isomorphicReactPackageVersion$jscomp$inline_783 = React.version; if ( - "19.0.0-experimental-206df66e-20240912" !== + "19.0.0-experimental-f2df5694-20240916" !== isomorphicReactPackageVersion$jscomp$inline_783 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_783 + - "\n - react-dom: 19.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6161,4 +6161,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js index af5bb8558b606..7a617eafc57de 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js @@ -8213,11 +8213,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -10004,5 +10004,5 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js index 42be2d2634028..8bb3bb9482824 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js @@ -6693,11 +6693,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6962,4 +6962,4 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js index c4e5607e1a21b..016dbf7871133 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js @@ -8071,11 +8071,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); } function createDrainHandler(destination, request) { @@ -9848,5 +9848,5 @@ } }; }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js index e72f4e362b1d3..7ffad4ead2ad9 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js @@ -6566,11 +6566,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6821,4 +6821,4 @@ exports.resumeToPipeableStream = function (children, postponedState, options) { } }; }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js index 3596cf636f945..63ba55893f88e 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js @@ -352,16 +352,16 @@ } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -965,73 +965,10 @@ )); } } - function injectProfilingHooks(profilingHooks) { - injectedProfilingHooks = profilingHooks; - } - function markCommitStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStopped && - injectedProfilingHooks.markCommitStopped(); - } - function markComponentRenderStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStarted && - injectedProfilingHooks.markComponentRenderStarted(fiber); - } - function markComponentRenderStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentRenderStopped && - injectedProfilingHooks.markComponentRenderStopped(); - } - function markComponentLayoutEffectUnmountStarted(fiber) { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStarted && - injectedProfilingHooks.markComponentLayoutEffectUnmountStarted(fiber); - } - function markComponentLayoutEffectUnmountStopped() { - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectUnmountStopped && - injectedProfilingHooks.markComponentLayoutEffectUnmountStopped(); - } - function markRenderStarted(lanes) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStarted && - injectedProfilingHooks.markRenderStarted(lanes); - } - function markRenderStopped() { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderStopped && - injectedProfilingHooks.markRenderStopped(); - } - function markStateUpdateScheduled(fiber, lane) { - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markStateUpdateScheduled && - injectedProfilingHooks.markStateUpdateScheduled(fiber, lane); - } function clz32Fallback(x) { x >>>= 0; return 0 === x ? 32 : (31 - ((log(x) / LN2) | 0)) | 0; } - function getLabelForLane(lane) { - if (lane & 1) return "SyncHydrationLane"; - if (lane & 2) return "Sync"; - if (lane & 4) return "InputContinuousHydration"; - if (lane & 8) return "InputContinuous"; - if (lane & 16) return "DefaultHydration"; - if (lane & 32) return "Default"; - if (lane & 64) return "TransitionHydration"; - if (lane & 4194176) return "Transition"; - if (lane & 62914560) return "Retry"; - if (lane & 67108864) return "SelectiveHydration"; - if (lane & 134217728) return "IdleHydration"; - if (lane & 268435456) return "Idle"; - if (lane & 536870912) return "Offscreen"; - if (lane & 1073741824) return "Deferred"; - } function getHighestPriorityLanes(lanes) { var pendingSyncLanes = lanes & 42; if (0 !== pendingSyncLanes) return pendingSyncLanes; @@ -3668,23 +3605,42 @@ : !1 : !1; } - function getActiveElementDeep() { + function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmp48757776$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmp48757776$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmp48757776$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmp48757776$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmp48757776$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmp48757776$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmp48757776$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmp48757776$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmp48757776$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3700,103 +3656,98 @@ "true" === elem.contentEditable) ); } - function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; + function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { if ( null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) + hasSelectionCapabilities(containerInfo) ) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = - priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && - priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } function constructSelectEvent( @@ -4069,11 +4020,18 @@ profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } - function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { + function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } + } + function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -6678,8 +6636,8 @@ try { (currentTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, currentTransition); - } catch (error$3) { - onActionError(actionQueue, node, error$3); + } catch (error$4) { + onActionError(actionQueue, node, error$4); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -7343,7 +7301,6 @@ queue, JSCompiler_OptimizeArgumentsArray_p0 ))); - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p0); } function dispatchSetState( fiber, @@ -7407,7 +7364,6 @@ JSCompiler_OptimizeArgumentsArray_p1 )); } - markStateUpdateScheduled(fiber, JSCompiler_OptimizeArgumentsArray_p1); } function dispatchOptimisticSetState( fiber, @@ -7441,7 +7397,6 @@ )), null !== throwIfDuringRender && scheduleUpdateOnFiber(throwIfDuringRender, fiber, 2); - markStateUpdateScheduled(fiber, 2); } function isRenderPhaseUpdate(fiber) { var alternate = fiber.alternate; @@ -7664,9 +7619,9 @@ var onUncaughtError = root.onUncaughtError; onUncaughtError(error, { componentStack: errorInfo.stack }); } - } catch (e$4) { + } catch (e$5) { setTimeout(function () { - throw e$4; + throw e$5; }); } } @@ -7681,9 +7636,9 @@ componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$5) { + } catch (e$6) { setTimeout(function () { - throw e$5; + throw e$6; }); } } @@ -7982,7 +7937,6 @@ "ref" !== key && (propsWithoutRef[key] = nextProps[key]); } else propsWithoutRef = nextProps; prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); nextProps = renderWithHooks( current, workInProgress, @@ -7992,7 +7946,6 @@ renderLanes ); key = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8238,7 +8191,6 @@ componentName )))); prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); Component = renderWithHooks( current, workInProgress, @@ -8248,7 +8200,6 @@ renderLanes ); nextProps = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8268,7 +8219,6 @@ renderLanes ) { prepareToReadContext(workInProgress); - markComponentRenderStarted(workInProgress); hookTypesUpdateIndexDev = -1; ignorePreviousDependencies = null !== current && current.type !== workInProgress.type; @@ -8281,7 +8231,6 @@ ); finishRenderingHooks(current, workInProgress); Component = checkDidRenderIdHook(); - markComponentRenderStopped(); if (null !== current && !didReceiveUpdate) return ( bailoutHooks(current, workInProgress, renderLanes), @@ -8797,18 +8746,16 @@ current = workInProgress; if (state && "function" !== typeof Component.getDerivedStateFromError) (Component = null), (profilerStartTime = -1); - else { - markComponentRenderStarted(workInProgress); - Component = callRenderInDEV(lane); - if (workInProgress.mode & StrictLegacyMode) { - setIsStrictModeForDevtools(!0); - try { - callRenderInDEV(lane); - } finally { - setIsStrictModeForDevtools(!1); - } + else if ( + ((Component = callRenderInDEV(lane)), + workInProgress.mode & StrictLegacyMode) + ) { + setIsStrictModeForDevtools(!0); + try { + callRenderInDEV(lane); + } finally { + setIsStrictModeForDevtools(!1); } - markComponentRenderStopped(); } workInProgress.flags |= 1; null !== current$jscomp$0 && state @@ -8899,33 +8846,33 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_componentStack_2320; - var JSCompiler_object_inline_stack_2319 = workInProgress.pendingProps; + var JSCompiler_object_inline_componentStack_2275; + var JSCompiler_object_inline_stack_2274 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_message_2317 = !1; + var JSCompiler_object_inline_message_2272 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_componentStack_2320 = didSuspend) || - (JSCompiler_object_inline_componentStack_2320 = + (JSCompiler_object_inline_componentStack_2275 = didSuspend) || + (JSCompiler_object_inline_componentStack_2275 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_componentStack_2320 && - ((JSCompiler_object_inline_message_2317 = !0), + JSCompiler_object_inline_componentStack_2275 && + ((JSCompiler_object_inline_message_2272 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_componentStack_2320 = + JSCompiler_object_inline_componentStack_2275 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_message_2317 + JSCompiler_object_inline_message_2272 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_digest_2318 = nextHydratableInstance; + var JSCompiler_object_inline_digest_2273 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2318)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_digest_2273)) { c: { - var instance = JSCompiler_object_inline_digest_2318; + var instance = JSCompiler_object_inline_digest_2273; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8966,19 +8913,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_digest_2318 + JSCompiler_object_inline_digest_2273 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_digest_2318 = workInProgress.memoizedState; + JSCompiler_object_inline_digest_2273 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_digest_2318 && - ((JSCompiler_object_inline_digest_2318 = - JSCompiler_object_inline_digest_2318.dehydrated), - null !== JSCompiler_object_inline_digest_2318) + null !== JSCompiler_object_inline_digest_2273 && + ((JSCompiler_object_inline_digest_2273 = + JSCompiler_object_inline_digest_2273.dehydrated), + null !== JSCompiler_object_inline_digest_2273) ) return ( - JSCompiler_object_inline_digest_2318.data === + JSCompiler_object_inline_digest_2273.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8986,68 +8933,68 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_digest_2318 = - JSCompiler_object_inline_stack_2319.children; - JSCompiler_temp = JSCompiler_object_inline_stack_2319.fallback; - if (JSCompiler_object_inline_message_2317) + JSCompiler_object_inline_digest_2273 = + JSCompiler_object_inline_stack_2274.children; + JSCompiler_temp = JSCompiler_object_inline_stack_2274.fallback; + if (JSCompiler_object_inline_message_2272) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2319 = + (JSCompiler_object_inline_stack_2274 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2318, + JSCompiler_object_inline_digest_2273, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2317 = workInProgress.child), - (JSCompiler_object_inline_message_2317.memoizedState = + (JSCompiler_object_inline_message_2272 = workInProgress.child), + (JSCompiler_object_inline_message_2272.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2317.childLanes = + (JSCompiler_object_inline_message_2272.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2320, + JSCompiler_object_inline_componentStack_2275, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2319 + JSCompiler_object_inline_stack_2274 ); if ( "number" === - typeof JSCompiler_object_inline_stack_2319.unstable_expectedLoadTime + typeof JSCompiler_object_inline_stack_2274.unstable_expectedLoadTime ) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_stack_2319 = + (JSCompiler_object_inline_stack_2274 = mountSuspenseFallbackChildren( workInProgress, - JSCompiler_object_inline_digest_2318, + JSCompiler_object_inline_digest_2273, JSCompiler_temp, renderLanes )), - (JSCompiler_object_inline_message_2317 = workInProgress.child), - (JSCompiler_object_inline_message_2317.memoizedState = + (JSCompiler_object_inline_message_2272 = workInProgress.child), + (JSCompiler_object_inline_message_2272.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_message_2317.childLanes = + (JSCompiler_object_inline_message_2272.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2320, + JSCompiler_object_inline_componentStack_2275, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress.lanes = 4194304), - JSCompiler_object_inline_stack_2319 + JSCompiler_object_inline_stack_2274 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_digest_2318 + JSCompiler_object_inline_digest_2273 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_digest_2318 = prevState.dehydrated), - null !== JSCompiler_object_inline_digest_2318) + ((JSCompiler_object_inline_digest_2273 = prevState.dehydrated), + null !== JSCompiler_object_inline_digest_2273) ) { if (didSuspend) workInProgress.flags & 256 @@ -9064,94 +9011,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2317 = - JSCompiler_object_inline_stack_2319.fallback), - (JSCompiler_object_inline_digest_2318 = workInProgress.mode), - (JSCompiler_object_inline_stack_2319 = + (JSCompiler_object_inline_message_2272 = + JSCompiler_object_inline_stack_2274.fallback), + (JSCompiler_object_inline_digest_2273 = workInProgress.mode), + (JSCompiler_object_inline_stack_2274 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2319.children + children: JSCompiler_object_inline_stack_2274.children }, - JSCompiler_object_inline_digest_2318 + JSCompiler_object_inline_digest_2273 )), - (JSCompiler_object_inline_message_2317 = + (JSCompiler_object_inline_message_2272 = createFiberFromFragment( - JSCompiler_object_inline_message_2317, - JSCompiler_object_inline_digest_2318, + JSCompiler_object_inline_message_2272, + JSCompiler_object_inline_digest_2273, renderLanes, null )), - (JSCompiler_object_inline_message_2317.flags |= 2), - (JSCompiler_object_inline_stack_2319.return = workInProgress), - (JSCompiler_object_inline_message_2317.return = workInProgress), - (JSCompiler_object_inline_stack_2319.sibling = - JSCompiler_object_inline_message_2317), - (workInProgress.child = JSCompiler_object_inline_stack_2319), + (JSCompiler_object_inline_message_2272.flags |= 2), + (JSCompiler_object_inline_stack_2274.return = workInProgress), + (JSCompiler_object_inline_message_2272.return = workInProgress), + (JSCompiler_object_inline_stack_2274.sibling = + JSCompiler_object_inline_message_2272), + (workInProgress.child = JSCompiler_object_inline_stack_2274), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2319 = workInProgress.child), - (JSCompiler_object_inline_stack_2319.memoizedState = + (JSCompiler_object_inline_stack_2274 = workInProgress.child), + (JSCompiler_object_inline_stack_2274.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2319.childLanes = + (JSCompiler_object_inline_stack_2274.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2320, + JSCompiler_object_inline_componentStack_2275, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - (workInProgress = JSCompiler_object_inline_message_2317)); + (workInProgress = JSCompiler_object_inline_message_2272)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_digest_2318.data === + JSCompiler_object_inline_digest_2273.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_componentStack_2320 = - JSCompiler_object_inline_digest_2318.nextSibling && - JSCompiler_object_inline_digest_2318.nextSibling.dataset; - if (JSCompiler_object_inline_componentStack_2320) { - JSCompiler_temp = JSCompiler_object_inline_componentStack_2320.dgst; - var message = JSCompiler_object_inline_componentStack_2320.msg; - instance = JSCompiler_object_inline_componentStack_2320.stck; + JSCompiler_object_inline_componentStack_2275 = + JSCompiler_object_inline_digest_2273.nextSibling && + JSCompiler_object_inline_digest_2273.nextSibling.dataset; + if (JSCompiler_object_inline_componentStack_2275) { + JSCompiler_temp = JSCompiler_object_inline_componentStack_2275.dgst; + var message = JSCompiler_object_inline_componentStack_2275.msg; + instance = JSCompiler_object_inline_componentStack_2275.stck; var componentStack = - JSCompiler_object_inline_componentStack_2320.cstck; + JSCompiler_object_inline_componentStack_2275.cstck; } - JSCompiler_object_inline_message_2317 = message; - JSCompiler_object_inline_digest_2318 = JSCompiler_temp; - JSCompiler_object_inline_stack_2319 = instance; - JSCompiler_object_inline_componentStack_2320 = componentStack; - "POSTPONE" !== JSCompiler_object_inline_digest_2318 && - ((JSCompiler_object_inline_message_2317 = - JSCompiler_object_inline_message_2317 - ? Error(JSCompiler_object_inline_message_2317) + JSCompiler_object_inline_message_2272 = message; + JSCompiler_object_inline_digest_2273 = JSCompiler_temp; + JSCompiler_object_inline_stack_2274 = instance; + JSCompiler_object_inline_componentStack_2275 = componentStack; + "POSTPONE" !== JSCompiler_object_inline_digest_2273 && + ((JSCompiler_object_inline_message_2272 = + JSCompiler_object_inline_message_2272 + ? Error(JSCompiler_object_inline_message_2272) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." )), - (JSCompiler_object_inline_message_2317.stack = - JSCompiler_object_inline_stack_2319 || ""), - (JSCompiler_object_inline_message_2317.digest = - JSCompiler_object_inline_digest_2318), - (JSCompiler_object_inline_componentStack_2320 = - void 0 === JSCompiler_object_inline_componentStack_2320 + (JSCompiler_object_inline_message_2272.stack = + JSCompiler_object_inline_stack_2274 || ""), + (JSCompiler_object_inline_message_2272.digest = + JSCompiler_object_inline_digest_2273), + (JSCompiler_object_inline_componentStack_2275 = + void 0 === JSCompiler_object_inline_componentStack_2275 ? null - : JSCompiler_object_inline_componentStack_2320), - "string" === typeof JSCompiler_object_inline_componentStack_2320 && + : JSCompiler_object_inline_componentStack_2275), + "string" === typeof JSCompiler_object_inline_componentStack_2275 && CapturedStacks.set( - JSCompiler_object_inline_message_2317, - JSCompiler_object_inline_componentStack_2320 + JSCompiler_object_inline_message_2272, + JSCompiler_object_inline_componentStack_2275 ), queueHydrationError({ - value: JSCompiler_object_inline_message_2317, + value: JSCompiler_object_inline_message_2272, source: null, - stack: JSCompiler_object_inline_componentStack_2320 + stack: JSCompiler_object_inline_componentStack_2275 })); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9166,25 +9113,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_componentStack_2320 = + (JSCompiler_object_inline_componentStack_2275 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_componentStack_2320) + didReceiveUpdate || JSCompiler_object_inline_componentStack_2275) ) { - JSCompiler_object_inline_componentStack_2320 = workInProgressRoot; - if (null !== JSCompiler_object_inline_componentStack_2320) { - JSCompiler_object_inline_stack_2319 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2319 & 42)) - JSCompiler_object_inline_stack_2319 = 1; + JSCompiler_object_inline_componentStack_2275 = workInProgressRoot; + if (null !== JSCompiler_object_inline_componentStack_2275) { + JSCompiler_object_inline_stack_2274 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2274 & 42)) + JSCompiler_object_inline_stack_2274 = 1; else - switch (JSCompiler_object_inline_stack_2319) { + switch (JSCompiler_object_inline_stack_2274) { case 2: - JSCompiler_object_inline_stack_2319 = 1; + JSCompiler_object_inline_stack_2274 = 1; break; case 8: - JSCompiler_object_inline_stack_2319 = 4; + JSCompiler_object_inline_stack_2274 = 4; break; case 32: - JSCompiler_object_inline_stack_2319 = 16; + JSCompiler_object_inline_stack_2274 = 16; break; case 128: case 256: @@ -9205,40 +9152,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2319 = 64; + JSCompiler_object_inline_stack_2274 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2319 = 134217728; + JSCompiler_object_inline_stack_2274 = 134217728; break; default: - JSCompiler_object_inline_stack_2319 = 0; + JSCompiler_object_inline_stack_2274 = 0; } - JSCompiler_object_inline_stack_2319 = + JSCompiler_object_inline_stack_2274 = 0 !== - (JSCompiler_object_inline_stack_2319 & - (JSCompiler_object_inline_componentStack_2320.suspendedLanes | + (JSCompiler_object_inline_stack_2274 & + (JSCompiler_object_inline_componentStack_2275.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2319; + : JSCompiler_object_inline_stack_2274; if ( - 0 !== JSCompiler_object_inline_stack_2319 && - JSCompiler_object_inline_stack_2319 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2274 && + JSCompiler_object_inline_stack_2274 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2319), + ((prevState.retryLane = JSCompiler_object_inline_stack_2274), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2319 + JSCompiler_object_inline_stack_2274 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_componentStack_2320, + JSCompiler_object_inline_componentStack_2275, current, - JSCompiler_object_inline_stack_2319 + JSCompiler_object_inline_stack_2274 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_digest_2318.data === + JSCompiler_object_inline_digest_2273.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -9246,7 +9193,7 @@ renderLanes ); } else - JSCompiler_object_inline_digest_2318.data === + JSCompiler_object_inline_digest_2273.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -9254,12 +9201,12 @@ null, current )), - (JSCompiler_object_inline_digest_2318._reactRetry = + (JSCompiler_object_inline_digest_2273._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_digest_2318.nextSibling + JSCompiler_object_inline_digest_2273.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9277,54 +9224,54 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2319.children + JSCompiler_object_inline_stack_2274.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_message_2317) + if (JSCompiler_object_inline_message_2272) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_message_2317 = - JSCompiler_object_inline_stack_2319.fallback), - (JSCompiler_object_inline_digest_2318 = workInProgress.mode), + (JSCompiler_object_inline_message_2272 = + JSCompiler_object_inline_stack_2274.fallback), + (JSCompiler_object_inline_digest_2273 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2319 = createWorkInProgress( + (JSCompiler_object_inline_stack_2274 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2319.children + children: JSCompiler_object_inline_stack_2274.children } )), - (JSCompiler_object_inline_stack_2319.subtreeFlags = + (JSCompiler_object_inline_stack_2274.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_message_2317 = createWorkInProgress( + ? (JSCompiler_object_inline_message_2272 = createWorkInProgress( instance, - JSCompiler_object_inline_message_2317 + JSCompiler_object_inline_message_2272 )) - : ((JSCompiler_object_inline_message_2317 = createFiberFromFragment( - JSCompiler_object_inline_message_2317, - JSCompiler_object_inline_digest_2318, + : ((JSCompiler_object_inline_message_2272 = createFiberFromFragment( + JSCompiler_object_inline_message_2272, + JSCompiler_object_inline_digest_2273, renderLanes, null )), - (JSCompiler_object_inline_message_2317.flags |= 2)), - (JSCompiler_object_inline_message_2317.return = workInProgress), - (JSCompiler_object_inline_stack_2319.return = workInProgress), - (JSCompiler_object_inline_stack_2319.sibling = - JSCompiler_object_inline_message_2317), - (workInProgress.child = JSCompiler_object_inline_stack_2319), - (JSCompiler_object_inline_stack_2319 = - JSCompiler_object_inline_message_2317), - (JSCompiler_object_inline_message_2317 = workInProgress.child), - (JSCompiler_object_inline_digest_2318 = current.child.memoizedState), - null === JSCompiler_object_inline_digest_2318 - ? (JSCompiler_object_inline_digest_2318 = + (JSCompiler_object_inline_message_2272.flags |= 2)), + (JSCompiler_object_inline_message_2272.return = workInProgress), + (JSCompiler_object_inline_stack_2274.return = workInProgress), + (JSCompiler_object_inline_stack_2274.sibling = + JSCompiler_object_inline_message_2272), + (workInProgress.child = JSCompiler_object_inline_stack_2274), + (JSCompiler_object_inline_stack_2274 = + JSCompiler_object_inline_message_2272), + (JSCompiler_object_inline_message_2272 = workInProgress.child), + (JSCompiler_object_inline_digest_2273 = current.child.memoizedState), + null === JSCompiler_object_inline_digest_2273 + ? (JSCompiler_object_inline_digest_2273 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_digest_2318.cachePool), + JSCompiler_object_inline_digest_2273.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9332,38 +9279,38 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_digest_2318 = { + (JSCompiler_object_inline_digest_2273 = { baseLanes: - JSCompiler_object_inline_digest_2318.baseLanes | renderLanes, + JSCompiler_object_inline_digest_2273.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_message_2317.memoizedState = - JSCompiler_object_inline_digest_2318), - (JSCompiler_object_inline_message_2317.childLanes = + (JSCompiler_object_inline_message_2272.memoizedState = + JSCompiler_object_inline_digest_2273), + (JSCompiler_object_inline_message_2272.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_componentStack_2320, + JSCompiler_object_inline_componentStack_2275, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2319 + JSCompiler_object_inline_stack_2274 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2319.children + children: JSCompiler_object_inline_stack_2274.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_componentStack_2320 = + ((JSCompiler_object_inline_componentStack_2275 = workInProgress.deletions), - null === JSCompiler_object_inline_componentStack_2320 + null === JSCompiler_object_inline_componentStack_2275 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_componentStack_2320.push(current)); + : JSCompiler_object_inline_componentStack_2275.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9712,6 +9659,7 @@ case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -10298,6 +10246,7 @@ case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), (returnFiber.effectDuration = 0), (returnFiber.passiveEffectDuration = 0), @@ -10339,13 +10288,11 @@ ), prepareToReadContext(workInProgress), (prevSibling = readContext(prevSibling)), - markComponentRenderStarted(workInProgress), (returnFiber = callComponentInDEV( returnFiber, prevSibling, void 0 )), - markComponentRenderStopped(), (workInProgress.flags |= 1), reconcileChildren( current, @@ -10984,21 +10931,7 @@ do { if ( (updateQueue.tag & flags) === flags && - ((flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStarted && - injectedProfilingHooks.markComponentPassiveEffectMountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStarted && - injectedProfilingHooks.markComponentLayoutEffectMountStarted( - finishedWork - ), - (lastEffect = void 0), + ((lastEffect = void 0), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), (lastEffect = runWithFiberInDEV( @@ -11008,16 +10941,6 @@ )), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectMountStopped && - injectedProfilingHooks.markComponentPassiveEffectMountStopped() - : (flags & Layout) !== NoFlags && - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentLayoutEffectMountStopped && - injectedProfilingHooks.markComponentLayoutEffectMountStopped(), void 0 !== lastEffect && "function" !== typeof lastEffect) ) { var hookName = void 0; @@ -11075,15 +10998,6 @@ destroy = inst.destroy; void 0 !== destroy && ((inst.destroy = void 0), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStarted && - injectedProfilingHooks.markComponentPassiveEffectUnmountStarted( - finishedWork - ) - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStarted(finishedWork), (flags & Insertion) !== NoFlags && (isRunningInsertionEffect = !0), runWithFiberInDEV( @@ -11094,14 +11008,7 @@ destroy ), (flags & Insertion) !== NoFlags && - (isRunningInsertionEffect = !1), - (flags & Passive) !== NoFlags - ? null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentPassiveEffectUnmountStopped && - injectedProfilingHooks.markComponentPassiveEffectUnmountStopped() - : (flags & Layout) !== NoFlags && - markComponentLayoutEffectUnmountStopped()); + (isRunningInsertionEffect = !1)); } updateQueue = updateQueue.next; } while (updateQueue !== firstEffect); @@ -11302,20 +11209,21 @@ recordLayoutEffectDuration(current); } else runWithFiberInDEV(current, ref, null); - } catch (error$6) { - captureCommitPhaseError(current, nearestMountedAncestor, error$6); + } catch (error$7) { + captureCommitPhaseError(current, nearestMountedAncestor, error$7); } else ref.current = null; } function commitProfiler(finishedWork, current, commitTime, effectDuration) { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit; _finishedWork$memoize = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof _finishedWork$memoize && _finishedWork$memoize( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -11350,6 +11258,25 @@ captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + function commitProfilerPostCommitImpl( + finishedWork, + current, + commitTime, + passiveEffectDuration + ) { + var _finishedWork$memoize2 = finishedWork.memoizedProps; + finishedWork = _finishedWork$memoize2.id; + _finishedWork$memoize2 = _finishedWork$memoize2.onPostCommit; + current = null === current ? "mount" : "update"; + currentUpdateIsNested && (current = "nested-update"); + "function" === typeof _finishedWork$memoize2 && + _finishedWork$memoize2( + finishedWork, + current, + passiveEffectDuration, + commitTime + ); + } function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -11505,8 +11432,9 @@ ); } function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -11528,7 +11456,7 @@ selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$2) { + } catch (e$3) { JSCompiler_temp = null; break a; } @@ -11787,7 +11715,6 @@ a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12007,41 +11934,39 @@ ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - var tag = prevHostParentIsContainer.tag, - inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - ((tag & Insertion) !== NoFlags - ? ((inst.destroy = void 0), + var _tag = prevHostParentIsContainer.tag, + _inst = prevHostParentIsContainer.inst, + _destroy = _inst.destroy; + void 0 !== _destroy && + ((_tag & Insertion) !== NoFlags + ? ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )) - : (tag & Layout) !== NoFlags && - (markComponentLayoutEffectUnmountStarted(deletedFiber), - shouldProfile(deletedFiber) + : (_tag & Layout) !== NoFlags && + (shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), - (inst.destroy = void 0), + (_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy ), recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), + : ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy - )), - markComponentLayoutEffectUnmountStopped())); + _destroy + )))); prevHostParentIsContainer = prevHostParentIsContainer.next; } while (prevHostParentIsContainer !== prevHostParent); } @@ -12835,7 +12760,6 @@ commitTime, includeWorkInProgressEffects ), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12922,25 +12846,47 @@ root, parentFiber, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - if (parentFiber.subtreeFlags & 10256) - for (parentFiber = parentFiber.child; null !== parentFiber; ) + if ( + parentFiber.subtreeFlags & 10256 || + (0 !== parentFiber.actualDuration && + (null === parentFiber.alternate || + parentFiber.alternate.child !== parentFiber.child)) + ) + for (parentFiber = parentFiber.child; null !== parentFiber; ) { + var nextSibling = parentFiber.sibling; commitPassiveMountOnFiber( root, parentFiber, committedLanes, - committedTransitions - ), - (parentFiber = parentFiber.sibling); + committedTransitions, + null !== nextSibling ? nextSibling.actualStartTime : endTime + ); + parentFiber = nextSibling; + } } function commitPassiveMountOnFiber( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) { - var flags = finishedWork.flags; + if ( + (finishedWork.mode & ProfileMode) !== NoMode && + 0 < finishedWork.actualStartTime + ) { + var startTime = finishedWork.actualStartTime, + name = getComponentNameFromFiber(finishedWork); + null !== name && + supportsUserTiming && + ((reusableComponentOptions.start = startTime), + (reusableComponentOptions.end = endTime), + performance.measure(name, reusableComponentOptions)); + } + startTime = finishedWork.flags; switch (finishedWork.tag) { case 0: case 11: @@ -12949,9 +12895,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitHookPassiveMountEffects(finishedWork, Passive | HasEffect); break; case 3: @@ -12959,9 +12906,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && ((finishedRoot = null), null !== finishedWork.alternate && (finishedRoot = finishedWork.alternate.memoizedState.cache), @@ -12970,30 +12918,68 @@ (retainCache(finishedWork), null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions, + endTime + ); + if (startTime & 2048 && executionContext & CommitContext) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + runWithFiberInDEV( + finishedWork, + commitProfilerPostCommitImpl, + finishedWork, + finishedWork.alternate, + commitTime, + finishedRoot + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: - var _instance = finishedWork.stateNode; + name = finishedWork.stateNode; null !== finishedWork.memoizedState - ? _instance._visibility & OffscreenPassiveEffectsConnected + ? name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) : recursivelyTraverseAtomicPassiveEffects( finishedRoot, finishedWork ) - : _instance._visibility & OffscreenPassiveEffectsConnected + : name._visibility & OffscreenPassiveEffectsConnected ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ) - : ((_instance._visibility |= OffscreenPassiveEffectsConnected), + : ((name._visibility |= OffscreenPassiveEffectsConnected), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -13001,7 +12987,7 @@ committedTransitions, 0 !== (finishedWork.subtreeFlags & 10256) )); - flags & 2048 && + startTime & 2048 && commitOffscreenPassiveMountEffects( finishedWork.alternate, finishedWork @@ -13012,9 +12998,10 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); - flags & 2048 && + startTime & 2048 && commitCachePassiveMountEffect(finishedWork.alternate, finishedWork); break; default: @@ -13022,7 +13009,8 @@ finishedRoot, finishedWork, committedLanes, - committedTransitions + committedTransitions, + endTime ); } } @@ -13377,9 +13365,9 @@ this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; this._debugTask = this._debugStack = this._debugOwner = @@ -13418,8 +13406,8 @@ (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -14819,6 +14807,7 @@ } a: { renderWasConcurrent = root; + completeTime = now(); switch (didTimeout) { case RootInProgress: case RootFatalErrored: @@ -15098,6 +15087,7 @@ ensureRootIsScheduled(root), null ); + completeTime = now(); root.finishedWork = root.current.alternate; root.finishedLanes = lanes; commitRoot( @@ -15206,42 +15196,14 @@ : SuspendedOnError); workInProgressThrownValue = thrownValue; var erroredWork = workInProgress; - if (null === erroredWork) - (workInProgressRootExitStatus = RootFatalErrored), + null === erroredWork + ? ((workInProgressRootExitStatus = RootFatalErrored), logUncaughtError( root, createCapturedValueAtFiber(thrownValue, root.current) - ); - else - switch ( - (erroredWork.mode & ProfileMode && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), - markComponentRenderStopped(), - workInProgressSuspendedReason) - ) { - case SuspendedOnError: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentErrored && - injectedProfilingHooks.markComponentErrored( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - break; - case SuspendedOnData: - case SuspendedOnImmediate: - case SuspendedOnDeprecatedThrowPromise: - case SuspendedAndReadyToContinue: - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markComponentSuspended && - injectedProfilingHooks.markComponentSuspended( - erroredWork, - thrownValue, - workInProgressRootRenderLanes - ); - } + )) + : erroredWork.mode & ProfileMode && + stopProfilerTimerIfRunningAndRecordDuration(erroredWork); } function shouldRemainOnPreviousScreen() { var handler = suspenseHandlerStackCursor.current; @@ -15304,7 +15266,6 @@ workInProgressTransitions = null; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); lanes = !1; a: do try { @@ -15338,8 +15299,8 @@ } workLoopSync(); break; - } catch (thrownValue$8) { - handleThrow(root, thrownValue$8); + } catch (thrownValue$9) { + handleThrow(root, thrownValue$9); } while (1); lanes && root.shellSuspendCounter++; @@ -15351,7 +15312,6 @@ throw Error( "Cannot commit an incomplete root. This error is likely caused by a bug in React. Please file an issue." ); - markRenderStopped(); workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15380,7 +15340,6 @@ workInProgressRootRenderTargetTime = now$1() + RENDER_TIMEOUT_MS; prepareFreshStack(root, lanes); } - markRenderStarted(lanes); a: do try { if ( @@ -15499,22 +15458,15 @@ ? workLoopSync() : workLoopConcurrent(); break; - } catch (thrownValue$9) { - handleThrow(root, thrownValue$9); + } catch (thrownValue$10) { + handleThrow(root, thrownValue$10); } while (1); resetContextDependencies(); ReactSharedInternals.H = prevDispatcher; ReactSharedInternals.A = prevAsyncDispatcher; executionContext = prevExecutionContext; - if (null !== workInProgress) - return ( - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderYielded && - injectedProfilingHooks.markRenderYielded(), - RootInProgress - ); - markRenderStopped(); + if (null !== workInProgress) return RootInProgress; workInProgressRoot = null; workInProgressRootRenderLanes = 0; finishQueueingConcurrentUpdates(); @@ -15535,7 +15487,7 @@ unitOfWork, entangledRenderLanes )), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = runWithFiberInDEV( unitOfWork, beginWork, @@ -15588,7 +15540,7 @@ (current = beginWork(current, unitOfWork, entangledRenderLanes)); } isProfilingMode && - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0); + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork); return current; } function throwAndUnwindWorkLoop(root, unitOfWork, thrownValue) { @@ -15641,23 +15593,16 @@ } var current = completedWork.alternate; unitOfWork = completedWork.return; - (completedWork.mode & ProfileMode) === NoMode - ? (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )) - : (startProfilerTimer(completedWork), - (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = runWithFiberInDEV( + completedWork, + completeWork, + current, + completedWork, + entangledRenderLanes + ); + (completedWork.mode & ProfileMode) !== NoMode && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -15681,7 +15626,7 @@ return; } if ((unitOfWork.mode & ProfileMode) !== NoMode) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -15752,10 +15697,7 @@ throw Error("Should not already be working."); var finishedWork = root.finishedWork, lanes = root.finishedLanes; - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markCommitStarted && - injectedProfilingHooks.markCommitStarted(lanes); - if (null === finishedWork) return markCommitStopped(), null; + if (null === finishedWork) return null; 0 === lanes && console.error( "root.finishedLanes should not be empty during a commit. This is a bug in React." @@ -15783,7 +15725,8 @@ root === workInProgressRoot && ((workInProgress = workInProgressRoot = null), (workInProgressRootRenderLanes = 0)); - (0 === (finishedWork.subtreeFlags & 10256) && + (0 === finishedWork.actualDuration && + 0 === (finishedWork.subtreeFlags & 10256) && 0 === (finishedWork.flags & 10256)) || rootDoesHavePassiveEffects || ((rootDoesHavePassiveEffects = !0), @@ -15804,19 +15747,11 @@ commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStarted && - injectedProfilingHooks.markLayoutEffectsStarted(lanes), commitLayoutEffects(finishedWork, root, lanes), - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markLayoutEffectsStopped && - injectedProfilingHooks.markLayoutEffectsStopped(), requestPaint(), (executionContext = updatedLanes), (ReactDOMSharedInternals.p = spawnedLane), @@ -15861,7 +15796,6 @@ : ((nestedUpdateCount = 0), (rootWithNestedUpdates = root))) : (nestedUpdateCount = 0); flushSyncWorkAcrossRoots_impl(0, !1); - markCommitStopped(); return null; } function makeErrorInfo(componentStack) { @@ -15899,10 +15833,10 @@ if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + priority = pendingPassiveTransitions; pendingPassiveTransitions = null; - priority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root$jscomp$0 = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if ( @@ -15912,75 +15846,36 @@ throw Error( "Cannot flush passive effects while already rendering." ); + reusableComponentDevToolDetails.track = + lanes & 63 + ? "Blocking" + : lanes & 4194240 + ? "Transition" + : lanes & 62914560 + ? "Suspense" + : lanes & 2080374784 + ? "Idle" + : "Other"; isFlushingPassiveEffects = !0; didScheduleUpdateDuringPassiveEffects = !1; - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStarted && - injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(priority.current); + commitPassiveUnmountOnFiber(root$jscomp$0.current); commitPassiveMountOnFiber( - priority, - priority.current, + root$jscomp$0, + root$jscomp$0.current, lanes, - transitions + priority, + completeTime ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if ( - executionContext & CommitContext && - 0 !== (finishedWork.flags & 4) - ) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$jscomp$0 = commitTime, - phase = - null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$jscomp$0 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markPassiveEffectsStopped && - injectedProfilingHooks.markPassiveEffectsStopped(); - commitDoubleInvokeEffectsInDEV(priority); + commitDoubleInvokeEffectsInDEV(root$jscomp$0); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects - ? priority === rootWithPassiveNestedUpdates + ? root$jscomp$0 === rootWithPassiveNestedUpdates ? nestedPassiveUpdateCount++ : ((nestedPassiveUpdateCount = 0), - (rootWithPassiveNestedUpdates = priority)) + (rootWithPassiveNestedUpdates = root$jscomp$0)) : (nestedPassiveUpdateCount = 0); didScheduleUpdateDuringPassiveEffects = isFlushingPassiveEffects = !1; @@ -15989,7 +15884,7 @@ "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, priority); + injectedHook.onPostCommitFiberRoot(rendererID, root$jscomp$0); } catch (err) { hasLoggedError || ((hasLoggedError = !0), @@ -15998,7 +15893,7 @@ err )); } - var stateNode = priority.current.stateNode; + var stateNode = root$jscomp$0.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -16012,15 +15907,6 @@ } return !1; } - function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); - } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -20638,7 +20524,7 @@ ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -20799,9 +20685,6 @@ err )); } - null !== injectedProfilingHooks && - "function" === typeof injectedProfilingHooks.markRenderScheduled && - injectedProfilingHooks.markRenderScheduled(lane); parentComponent = getContextForSubtree(parentComponent); null === container.context ? (container.context = parentComponent) @@ -20850,14 +20733,6 @@ function getCurrentFiberForDevTools() { return current; } - function getLaneLabelMap() { - for (var map = new Map(), lane = 1, index = 0; 31 > index; index++) { - var label = getLabelForLane(lane); - map.set(lane, label); - lane *= 2; - } - return map; - } function dispatchDiscreteEvent( domEventName, eventSystemFlags, @@ -21518,7 +21393,6 @@ unstable_setDisableYieldValue = Scheduler.unstable_setDisableYieldValue, rendererID = null, injectedHook = null, - injectedProfilingHooks = null, hasLoggedError = !1, isDevToolsPresent = "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__, clz32 = Math.clz32 ? Math.clz32 : clz32Fallback, @@ -22779,12 +22653,27 @@ StrictEffectsMode = 16, NoStrictPassiveEffectsMode = 64, now = Scheduler.unstable_now, + completeTime = 0, commitTime = 0, layoutEffectStartTime = -1, profilerStartTime = -1, passiveEffectStartTime = -1, currentUpdateIsNested = !1, nestedUpdateScheduled = !1, + supportsUserTiming = + "undefined" !== typeof performance && + "function" === typeof performance.measure, + reusableComponentDevToolDetails = { + dataType: "track-entry", + color: "primary", + track: "Blocking", + trackGroup: "Components \u269b" + }, + reusableComponentOptions = { + start: -0, + end: -0, + detail: { devtools: reusableComponentDevToolDetails } + }, ReactStrictModeWarnings = { recordUnsafeLifecycleWarnings: function () {}, flushPendingUnsafeLifecycleWarnings: function () {}, @@ -24407,7 +24296,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueReplaceState: function (inst, payload, callback) { inst = inst._reactInternals; @@ -24422,7 +24310,6 @@ null !== payload && (scheduleUpdateOnFiber(payload, inst, lane), entangleTransitions(payload, inst, lane)); - markStateUpdateScheduled(inst, lane); }, enqueueForceUpdate: function (inst, callback) { inst = inst._reactInternals; @@ -24436,10 +24323,6 @@ null !== callback && (scheduleUpdateOnFiber(callback, inst, lane), entangleTransitions(callback, inst, lane)); - null !== injectedProfilingHooks && - "function" === - typeof injectedProfilingHooks.markForceUpdateScheduled && - injectedProfilingHooks.markForceUpdateScheduled(inst, lane); } }, reportGlobalError = @@ -24524,7 +24407,7 @@ var nonExtensibleObject = Object.preventExtensions({}); new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); - } catch (e$7) { + } catch (e$8) { hasBadMapPolyfill = !0; } var DefaultAsyncDispatcher = { @@ -24602,7 +24485,6 @@ rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, NESTED_UPDATE_LIMIT = 50, @@ -25158,11 +25040,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-f2df5694-20240916" !== 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.0.0-experimental-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -25199,11 +25081,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912" + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25218,8 +25100,6 @@ internals.scheduleRoot = scheduleRoot; internals.setRefreshHandler = setRefreshHandler; internals.getCurrentFiber = getCurrentFiberForDevTools; - internals.getLaneLabelMap = getLaneLabelMap; - internals.injectProfilingHooks = injectProfilingHooks; return injectInternals(internals); })() && canUseDOM && @@ -25513,5 +25393,5 @@ } }; }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js index 76f176afd309f..d4f1662dc10ec 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js @@ -166,16 +166,16 @@ function describeNativeComponentFrame(fn, construct) { } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -364,36 +364,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$2 = parentA.child; child$2; ) { - if (child$2 === a) { + for (var didFindChild = !1, child$3 = parentA.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) { - for (child$2 = parentB.child; child$2; ) { - if (child$2 === a) { + for (child$3 = parentB.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) throw Error(formatProdErrorMessage(189)); } @@ -721,18 +721,18 @@ function markRootFinished( 0 < remainingLanes; ) { - var index$7 = 31 - clz32(remainingLanes), - lane = 1 << index$7; - entanglements[index$7] = 0; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = hiddenUpdates[index$7]; + var index$8 = 31 - clz32(remainingLanes), + lane = 1 << index$8; + entanglements[index$8] = 0; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = hiddenUpdates[index$8]; if (null !== hiddenUpdatesForLane) for ( - hiddenUpdates[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + hiddenUpdates[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -536870913); } remainingLanes &= ~lane; @@ -757,10 +757,10 @@ function markSpawnedDeferredLane(root, spawnedLane, entangledLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -996,8 +996,8 @@ function setValueForAttribute(node, name, value) { node.removeAttribute(name); return; case "boolean": - var prefix$10 = name.toLowerCase().slice(0, 5); - if ("data-" !== prefix$10 && "aria-" !== prefix$10) { + var prefix$11 = name.toLowerCase().slice(0, 5); + if ("data-" !== prefix$11 && "aria-" !== prefix$11) { node.removeAttribute(name); return; } @@ -1330,15 +1330,15 @@ function setValueForStyles(node, styles, prevStyles) { : "float" === styleName ? (node.cssFloat = "") : (node[styleName] = "")); - for (var styleName$16 in styles) - (styleName = styles[styleName$16]), - styles.hasOwnProperty(styleName$16) && - prevStyles[styleName$16] !== styleName && - setValueForStyle(node, styleName$16, styleName); - } else for (var styleName$17 in styles) - styles.hasOwnProperty(styleName$17) && - setValueForStyle(node, styleName$17, styles[styleName$17]); + (styleName = styles[styleName$17]), + styles.hasOwnProperty(styleName$17) && + prevStyles[styleName$17] !== styleName && + setValueForStyle(node, styleName$17, styleName); + } else + for (var styleName$18 in styles) + styles.hasOwnProperty(styleName$18) && + setValueForStyle(node, styleName$18, styles[styleName$18]); } function isCustomElement(tagName) { if (-1 === tagName.indexOf("-")) return !1; @@ -2067,19 +2067,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$284; + var JSCompiler_inline_result$jscomp$285; if (canUseDOM) { - var isSupported$jscomp$inline_423 = "oninput" in document; - if (!isSupported$jscomp$inline_423) { - var element$jscomp$inline_424 = document.createElement("div"); - element$jscomp$inline_424.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_423 = - "function" === typeof element$jscomp$inline_424.oninput; + var isSupported$jscomp$inline_424 = "oninput" in document; + if (!isSupported$jscomp$inline_424) { + var element$jscomp$inline_425 = document.createElement("div"); + element$jscomp$inline_425.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_424 = + "function" === typeof element$jscomp$inline_425.oninput; } - JSCompiler_inline_result$jscomp$284 = isSupported$jscomp$inline_423; - } else JSCompiler_inline_result$jscomp$284 = !1; + JSCompiler_inline_result$jscomp$285 = isSupported$jscomp$inline_424; + } else JSCompiler_inline_result$jscomp$285 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$284 && + JSCompiler_inline_result$jscomp$285 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2193,23 +2193,42 @@ function containsNode(outerNode, innerNode) { : !1 : !1; } -function getActiveElementDeep() { +function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm1493587283$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm1493587283$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm1493587283$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm1493587283$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm1493587283$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm1493587283$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm1493587283$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm1493587283$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm1493587283$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2225,101 +2244,95 @@ function hasSelectionCapabilities(elem) { "true" === elem.contentEditable) ); } -function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; +function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { - if ( - null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) - ) + if (null !== priorSelectionRange && hasSelectionCapabilities(containerInfo)) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } var skipSelectionChangeEvent = @@ -4019,7 +4032,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$55 = !1; + didReadFromEntangledAsyncAction$56 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -4040,11 +4053,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$55 = !0); + (didReadFromEntangledAsyncAction$56 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$55 = !0); + (didReadFromEntangledAsyncAction$56 = !0); continue; } else (updateLane = { @@ -4090,7 +4103,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$55 && + didReadFromEntangledAsyncAction$56 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4288,8 +4301,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$61) { - onActionError(actionQueue, node, error$61); + } catch (error$62) { + onActionError(actionQueue, node, error$62); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4726,14 +4739,14 @@ function refreshCache(fiber, seedKey, seedValue) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$64 = enqueueUpdate(provider, fiber, lane); - null !== root$64 && - (scheduleUpdateOnFiber(root$64, provider, lane), - entangleTransitions(root$64, provider, lane)); + var root$65 = enqueueUpdate(provider, fiber, lane); + null !== root$65 && + (scheduleUpdateOnFiber(root$65, provider, lane), + entangleTransitions(root$65, provider, lane)); provider = createCache(); null !== seedKey && void 0 !== seedKey && - null !== root$64 && + null !== root$65 && provider.data.set(seedKey, seedValue); fiber.payload = { cache: provider }; return; @@ -5256,9 +5269,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$68 in Component) - void 0 === newProps[propName$68] && - (newProps[propName$68] = Component[propName$68]); + for (var propName$69 in Component) + void 0 === newProps[propName$69] && + (newProps[propName$69] = Component[propName$69]); } return newProps; } @@ -5304,9 +5317,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$69) { + } catch (e$70) { setTimeout(function () { - throw e$69; + throw e$70; }); } } @@ -5317,9 +5330,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$70) { + } catch (e$71) { setTimeout(function () { - throw e$70; + throw e$71; }); } } @@ -7774,8 +7787,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$115) { - captureCommitPhaseError(current, nearestMountedAncestor, error$115); + } catch (error$116) { + captureCommitPhaseError(current, nearestMountedAncestor, error$116); } else ref.current = null; } @@ -7892,8 +7905,9 @@ var offscreenSubtreeIsHidden = !1, nextEffect = null, shouldFireAfterActiveInstanceBlur = !1; function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -7915,7 +7929,7 @@ function commitBeforeMutationEffects(root, firstChild) { selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$20) { + } catch (e$21) { JSCompiler_temp = null; break a; } @@ -8090,11 +8104,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$114) { + } catch (error$115) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$114 + error$115 ); } } @@ -8265,7 +8279,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$123 = hostParentIsContainer; + var prevHostParentIsContainer$124 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8273,7 +8287,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$123; + hostParentIsContainer = prevHostParentIsContainer$124; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8341,18 +8355,18 @@ function commitDeletionEffectsOnFiber( ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - prevHostParentIsContainer$123 = prevHostParentIsContainer.tag; + prevHostParentIsContainer$124 = prevHostParentIsContainer.tag; var inst = prevHostParentIsContainer.inst, destroy = inst.destroy; void 0 !== destroy && - (0 !== (prevHostParentIsContainer$123 & 2) + (0 !== (prevHostParentIsContainer$124 & 2) ? ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, nearestMountedAncestor, destroy )) - : 0 !== (prevHostParentIsContainer$123 & 4) && + : 0 !== (prevHostParentIsContainer$124 & 4) && ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, @@ -8923,21 +8937,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$116 = JSCompiler_inline_result.stateNode; + var parent$117 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$116, ""), + (setTextContent(parent$117, ""), (JSCompiler_inline_result.flags &= -33)); - var before$117 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$117, parent$116); + var before$118 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$118, parent$117); break; case 3: case 4: - var parent$118 = JSCompiler_inline_result.stateNode.containerInfo, - before$119 = getHostSibling(finishedWork); + var parent$119 = JSCompiler_inline_result.stateNode.containerInfo, + before$120 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$119, - parent$118 + before$120, + parent$119 ); break; default: @@ -9204,6 +9218,14 @@ function commitPassiveMountOnFiber( (finishedWork.refCount++, null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + break; case 23: break; case 22: @@ -9832,14 +9854,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$136 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$136 = lastTailNode), + for (var lastTailNode$137 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$137 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$136 + null === lastTailNode$137 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$136.sibling = null); + : (lastTailNode$137.sibling = null); } } function bubbleProperties(completedWork) { @@ -9849,19 +9871,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$137 = completedWork.child; null !== child$137; ) - (newChildLanes |= child$137.lanes | child$137.childLanes), - (subtreeFlags |= child$137.subtreeFlags & 31457280), - (subtreeFlags |= child$137.flags & 31457280), - (child$137.return = completedWork), - (child$137 = child$137.sibling); + for (var child$138 = completedWork.child; null !== child$138; ) + (newChildLanes |= child$138.lanes | child$138.childLanes), + (subtreeFlags |= child$138.subtreeFlags & 31457280), + (subtreeFlags |= child$138.flags & 31457280), + (child$138.return = completedWork), + (child$138 = child$138.sibling); else - for (child$137 = completedWork.child; null !== child$137; ) - (newChildLanes |= child$137.lanes | child$137.childLanes), - (subtreeFlags |= child$137.subtreeFlags), - (subtreeFlags |= child$137.flags), - (child$137.return = completedWork), - (child$137 = child$137.sibling); + for (child$138 = completedWork.child; null !== child$138; ) + (newChildLanes |= child$138.lanes | child$138.childLanes), + (subtreeFlags |= child$138.subtreeFlags), + (subtreeFlags |= child$138.flags), + (child$138.return = completedWork), + (child$138 = child$138.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -10138,11 +10160,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$149 = null; + var cache$150 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$149 = newProps.memoizedState.cachePool.pool); - cache$149 !== type && (newProps.flags |= 2048); + (cache$150 = newProps.memoizedState.cachePool.pool); + cache$150 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -10167,8 +10189,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$149 = type.rendering; - if (null === cache$149) + cache$150 = type.rendering; + if (null === cache$150) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -10176,11 +10198,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$149 = findFirstSuspended(current); - if (null !== cache$149) { + cache$150 = findFirstSuspended(current); + if (null !== cache$150) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$149.updateQueue; + current = cache$150.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -10205,7 +10227,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$149)), null !== current)) { + if (((current = findFirstSuspended(cache$150)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -10215,7 +10237,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$149.alternate && + !cache$150.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -10228,13 +10250,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$149.sibling = workInProgress.child), - (workInProgress.child = cache$149)) + ? ((cache$150.sibling = workInProgress.child), + (workInProgress.child = cache$150)) : ((current = type.last), null !== current - ? (current.sibling = cache$149) - : (workInProgress.child = cache$149), - (type.last = cache$149)); + ? (current.sibling = cache$150) + : (workInProgress.child = cache$150), + (type.last = cache$150)); } if (null !== type.tail) return ( @@ -10940,9 +10962,9 @@ function markRootSuspended( didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes); didSkipSuspendedSiblings = root.expirationTimes; for (var lanes = suspendedLanes; 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6; - didSkipSuspendedSiblings[index$6] = -1; + var index$7 = 31 - clz32(lanes), + lane = 1 << index$7; + didSkipSuspendedSiblings[index$7] = -1; lanes &= ~lane; } 0 !== spawnedLane && @@ -11055,9 +11077,9 @@ function prepareFreshStack(root, lanes) { 0 < allEntangledLanes; ) { - var index$4 = 31 - clz32(allEntangledLanes), - lane = 1 << index$4; - lanes |= root[index$4]; + var index$5 = 31 - clz32(allEntangledLanes), + lane = 1 << index$5; + lanes |= root[index$5]; allEntangledLanes &= ~lane; } entangledRenderLanes = lanes; @@ -11168,8 +11190,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$165) { - handleThrow(root, thrownValue$165); + } catch (thrownValue$166) { + handleThrow(root, thrownValue$166); } while (1); lanes && root.shellSuspendCounter++; @@ -11278,8 +11300,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$167) { - handleThrow(root, thrownValue$167); + } catch (thrownValue$168) { + handleThrow(root, thrownValue$168); } while (1); resetContextDependencies(); @@ -11513,7 +11535,7 @@ function commitRootImpl( (executionContext |= 4), commitBeforeMutationEffects(root, finishedWork), commitMutationEffectsOnFiber(finishedWork, root), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -11562,7 +11584,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$171 = rootWithPendingPassiveEffects, + var root$172 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11601,7 +11623,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$171, remainingLanes); + releaseRootPooledCache(root$172, remainingLanes); } } return !1; @@ -11760,14 +11782,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$173 = firstScheduledRoot; null !== root$173; ) { + for (var root$174 = firstScheduledRoot; null !== root$174; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$173.pendingLanes; + var pendingLanes = root$174.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$173.suspendedLanes, - pingedLanes = root$173.pingedLanes; + var suspendedLanes = root$174.suspendedLanes, + pingedLanes = root$174.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11781,17 +11803,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$174, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$173, - root$173 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$174, + root$174 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$173, JSCompiler_inline_result)); - root$173 = root$173.next; + performSyncWorkOnRoot(root$174, JSCompiler_inline_result)); + root$174 = root$174.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -11832,12 +11854,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -12001,20 +12023,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1429 = 0; - i$jscomp$inline_1429 < simpleEventPluginEvents.length; - i$jscomp$inline_1429++ + var i$jscomp$inline_1430 = 0; + i$jscomp$inline_1430 < simpleEventPluginEvents.length; + i$jscomp$inline_1430++ ) { - var eventName$jscomp$inline_1430 = - simpleEventPluginEvents[i$jscomp$inline_1429], - domEventName$jscomp$inline_1431 = - eventName$jscomp$inline_1430.toLowerCase(), - capitalizedEvent$jscomp$inline_1432 = - eventName$jscomp$inline_1430[0].toUpperCase() + - eventName$jscomp$inline_1430.slice(1); + var eventName$jscomp$inline_1431 = + simpleEventPluginEvents[i$jscomp$inline_1430], + domEventName$jscomp$inline_1432 = + eventName$jscomp$inline_1431.toLowerCase(), + capitalizedEvent$jscomp$inline_1433 = + eventName$jscomp$inline_1431[0].toUpperCase() + + eventName$jscomp$inline_1431.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1431, - "on" + capitalizedEvent$jscomp$inline_1432 + domEventName$jscomp$inline_1432, + "on" + capitalizedEvent$jscomp$inline_1433 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -13197,34 +13219,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$187 = props[hasSrc]; - if (null != propValue$187) + var propValue$188 = props[hasSrc]; + if (null != propValue$188) switch (hasSrc) { case "name": - hasSrcSet = propValue$187; + hasSrcSet = propValue$188; break; case "type": - propValue = propValue$187; + propValue = propValue$188; break; case "checked": - checked = propValue$187; + checked = propValue$188; break; case "defaultChecked": - defaultChecked = propValue$187; + defaultChecked = propValue$188; break; case "value": - propKey = propValue$187; + propKey = propValue$188; break; case "defaultValue": - defaultValue = propValue$187; + defaultValue = propValue$188; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$187) + if (null != propValue$188) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$187, props, null); + setProp(domElement, tag, hasSrc, propValue$188, props, null); } } initInput( @@ -13361,14 +13383,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$187 in props) - props.hasOwnProperty(propValue$187) && - ((hasSrc = props[propValue$187]), + for (propValue$188 in props) + props.hasOwnProperty(propValue$188) && + ((hasSrc = props[propValue$188]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$187, + propValue$188, hasSrc, props, void 0 @@ -13416,14 +13438,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$204 in nextProps) { - var propKey = nextProps[propKey$204]; - lastProp = lastProps[propKey$204]; + for (var propKey$205 in nextProps) { + var propKey = nextProps[propKey$205]; + lastProp = lastProps[propKey$205]; if ( - nextProps.hasOwnProperty(propKey$204) && + nextProps.hasOwnProperty(propKey$205) && (null != propKey || null != lastProp) ) - switch (propKey$204) { + switch (propKey$205) { case "type": type = propKey; break; @@ -13452,7 +13474,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$204, + propKey$205, propKey, nextProps, lastProp @@ -13471,7 +13493,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$204 = null; + propKey = value = defaultValue = propKey$205 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13502,7 +13524,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$204 = type; + propKey$205 = type; break; case "defaultValue": defaultValue = type; @@ -13523,15 +13545,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$204 - ? updateOptions(domElement, !!lastProps, propKey$204, !1) + null != propKey$205 + ? updateOptions(domElement, !!lastProps, propKey$205, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$204 = null; + propKey = propKey$205 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13555,7 +13577,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$204 = name; + propKey$205 = name; break; case "defaultValue": propKey = name; @@ -13569,17 +13591,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$204, propKey); + updateTextarea(domElement, propKey$205, propKey); return; case "option": - for (var propKey$220 in lastProps) + for (var propKey$221 in lastProps) if ( - ((propKey$204 = lastProps[propKey$220]), - lastProps.hasOwnProperty(propKey$220) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$220)) + ((propKey$205 = lastProps[propKey$221]), + lastProps.hasOwnProperty(propKey$221) && + null != propKey$205 && + !nextProps.hasOwnProperty(propKey$221)) ) - switch (propKey$220) { + switch (propKey$221) { case "selected": domElement.selected = !1; break; @@ -13587,33 +13609,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$220, + propKey$221, null, nextProps, - propKey$204 + propKey$205 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$204 = nextProps[lastDefaultValue]), + ((propKey$205 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$204 !== propKey && - (null != propKey$204 || null != propKey)) + propKey$205 !== propKey && + (null != propKey$205 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$204 && - "function" !== typeof propKey$204 && - "symbol" !== typeof propKey$204; + propKey$205 && + "function" !== typeof propKey$205 && + "symbol" !== typeof propKey$205; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$204, + propKey$205, nextProps, propKey ); @@ -13634,24 +13656,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$225 in lastProps) - (propKey$204 = lastProps[propKey$225]), - lastProps.hasOwnProperty(propKey$225) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$225) && - setProp(domElement, tag, propKey$225, null, nextProps, propKey$204); + for (var propKey$226 in lastProps) + (propKey$205 = lastProps[propKey$226]), + lastProps.hasOwnProperty(propKey$226) && + null != propKey$205 && + !nextProps.hasOwnProperty(propKey$226) && + setProp(domElement, tag, propKey$226, null, nextProps, propKey$205); for (checked in nextProps) if ( - ((propKey$204 = nextProps[checked]), + ((propKey$205 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$204 !== propKey && - (null != propKey$204 || null != propKey)) + propKey$205 !== propKey && + (null != propKey$205 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$204) + if (null != propKey$205) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13659,7 +13681,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$204, + propKey$205, nextProps, propKey ); @@ -13667,49 +13689,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$230 in lastProps) - (propKey$204 = lastProps[propKey$230]), - lastProps.hasOwnProperty(propKey$230) && - void 0 !== propKey$204 && - !nextProps.hasOwnProperty(propKey$230) && + for (var propKey$231 in lastProps) + (propKey$205 = lastProps[propKey$231]), + lastProps.hasOwnProperty(propKey$231) && + void 0 !== propKey$205 && + !nextProps.hasOwnProperty(propKey$231) && setPropOnCustomElement( domElement, tag, - propKey$230, + propKey$231, void 0, nextProps, - propKey$204 + propKey$205 ); for (defaultChecked in nextProps) - (propKey$204 = nextProps[defaultChecked]), + (propKey$205 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$204 === propKey || - (void 0 === propKey$204 && void 0 === propKey) || + propKey$205 === propKey || + (void 0 === propKey$205 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$204, + propKey$205, nextProps, propKey ); return; } } - for (var propKey$235 in lastProps) - (propKey$204 = lastProps[propKey$235]), - lastProps.hasOwnProperty(propKey$235) && - null != propKey$204 && - !nextProps.hasOwnProperty(propKey$235) && - setProp(domElement, tag, propKey$235, null, nextProps, propKey$204); + for (var propKey$236 in lastProps) + (propKey$205 = lastProps[propKey$236]), + lastProps.hasOwnProperty(propKey$236) && + null != propKey$205 && + !nextProps.hasOwnProperty(propKey$236) && + setProp(domElement, tag, propKey$236, null, nextProps, propKey$205); for (lastProp in nextProps) - (propKey$204 = nextProps[lastProp]), + (propKey$205 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$204 === propKey || - (null == propKey$204 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$204, nextProps, propKey); + propKey$205 === propKey || + (null == propKey$205 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$205, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -14311,26 +14333,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$243 = getResourcesFromRoot( + var styles$244 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$244 = styles$243.get(type); - resource$244 || + resource$245 = styles$244.get(type); + resource$245 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$244 = { + (resource$245 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$243.set(type, resource$244), - (styles$243 = JSCompiler_inline_result.querySelector( + styles$244.set(type, resource$245), + (styles$244 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$243._p && - ((resource$244.instance = styles$243), - (resource$244.state.loading = 5)), + !styles$244._p && + ((resource$245.instance = styles$244), + (resource$245.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -14343,16 +14365,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$243 || + styles$244 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$244.state + resource$245.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$244; + return resource$245; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -14449,37 +14471,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$249 = hoistableRoot.querySelector( + var instance$250 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$249) + if (instance$250) return ( (resource.state.loading |= 4), - (resource.instance = instance$249), - markNodeAsHoistable(instance$249), - instance$249 + (resource.instance = instance$250), + markNodeAsHoistable(instance$250), + instance$250 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$249 = ( + instance$250 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$249); - var linkInstance = instance$249; + markNodeAsHoistable(instance$250); + var linkInstance = instance$250; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$249, "link", instance); + setInitialProperties(instance$250, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$249, props.precedence, hoistableRoot); - return (resource.instance = instance$249); + insertStylesheet(instance$250, props.precedence, hoistableRoot); + return (resource.instance = instance$250); case "script": - instance$249 = getScriptKey(props.src); + instance$250 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$249) + getScriptSelectorFromKey(instance$250) )) ) return ( @@ -14488,7 +14510,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$249))) + if ((styleProps = preloadPropsMap.get(instance$250))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -14749,7 +14771,7 @@ function insertStylesheetIntoRoot(root, resource) { ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -15512,16 +15534,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1676 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1677 = React.version; if ( - "19.0.0-experimental-206df66e-20240912" !== - isomorphicReactPackageVersion$jscomp$inline_1676 + "19.0.0-experimental-f2df5694-20240916" !== + isomorphicReactPackageVersion$jscomp$inline_1677 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1676, - "19.0.0-experimental-206df66e-20240912" + isomorphicReactPackageVersion$jscomp$inline_1677, + "19.0.0-experimental-f2df5694-20240916" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15541,25 +15563,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2119 = { +var internals$jscomp$inline_2121 = { bundleType: 0, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912" + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2120 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2122 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2120.isDisabled && - hook$jscomp$inline_2120.supportsFiber + !hook$jscomp$inline_2122.isDisabled && + hook$jscomp$inline_2122.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2120.inject( - internals$jscomp$inline_2119 + (rendererID = hook$jscomp$inline_2122.inject( + internals$jscomp$inline_2121 )), - (injectedHook = hook$jscomp$inline_2120); + (injectedHook = hook$jscomp$inline_2122); } catch (err) {} } exports.createComponentSelector = function (component) { @@ -15802,4 +15824,4 @@ exports.observeVisibleRects = function ( } }; }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js index e3ed2d34ebc2b..47f368aada3f9 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; "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.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js index 625868c9c26c2..8178fc898c6d5 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js index 06889de8c230d..a879a658c482e 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js index 6213bc45c8fe3..1f79950db7065 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom-experimental/package.json b/packages/next/src/compiled/react-dom-experimental/package.json index 2c17fcb06f5b9..0141f80235815 100644 --- a/packages/next/src/compiled/react-dom-experimental/package.json +++ b/packages/next/src/compiled/react-dom-experimental/package.json @@ -72,10 +72,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.0.0-experimental-206df66e-20240912" + "scheduler": "0.0.0-experimental-f2df5694-20240916" }, "peerDependencies": { - "react": "0.0.0-experimental-206df66e-20240912" + "react": "0.0.0-experimental-f2df5694-20240916" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js index 865eb6e3c0650..94534a730498f 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js @@ -352,16 +352,16 @@ } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -3530,23 +3530,42 @@ : !1 : !1; } - function getActiveElementDeep() { + function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm331993506$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm331993506$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm331993506$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm331993506$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm331993506$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm331993506$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm331993506$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm331993506$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm331993506$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3562,103 +3581,98 @@ "true" === elem.contentEditable) ); } - function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; + function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { if ( null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) + hasSelectionCapabilities(containerInfo) ) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = - priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && - priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } function constructSelectEvent( @@ -3931,11 +3945,18 @@ profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } - function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { + function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } + } + function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -6477,8 +6498,8 @@ try { (currentTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, currentTransition); - } catch (error$3) { - onActionError(actionQueue, node, error$3); + } catch (error$4) { + onActionError(actionQueue, node, error$4); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -7429,9 +7450,9 @@ var onUncaughtError = root.onUncaughtError; onUncaughtError(error, { componentStack: errorInfo.stack }); } - } catch (e$4) { + } catch (e$5) { setTimeout(function () { - throw e$4; + throw e$5; }); } } @@ -7446,9 +7467,9 @@ componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$5) { + } catch (e$6) { setTimeout(function () { - throw e$5; + throw e$6; }); } } @@ -8636,32 +8657,32 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_digest_2293; - var JSCompiler_object_inline_stack_2294 = workInProgress.pendingProps; + var JSCompiler_object_inline_digest_2287; + var JSCompiler_object_inline_stack_2288 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_componentStack_2295 = !1; + var JSCompiler_object_inline_componentStack_2289 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_digest_2293 = didSuspend) || - (JSCompiler_object_inline_digest_2293 = + (JSCompiler_object_inline_digest_2287 = didSuspend) || + (JSCompiler_object_inline_digest_2287 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_digest_2293 && - ((JSCompiler_object_inline_componentStack_2295 = !0), + JSCompiler_object_inline_digest_2287 && + ((JSCompiler_object_inline_componentStack_2289 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_digest_2293 = 0 !== (workInProgress.flags & 32); + JSCompiler_object_inline_digest_2287 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_componentStack_2295 + JSCompiler_object_inline_componentStack_2289 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_message_2292 = nextHydratableInstance; + var JSCompiler_object_inline_message_2286 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2292)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2286)) { c: { - var instance = JSCompiler_object_inline_message_2292; + var instance = JSCompiler_object_inline_message_2286; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8702,19 +8723,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_message_2292 + JSCompiler_object_inline_message_2286 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_message_2292 = workInProgress.memoizedState; + JSCompiler_object_inline_message_2286 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_message_2292 && - ((JSCompiler_object_inline_message_2292 = - JSCompiler_object_inline_message_2292.dehydrated), - null !== JSCompiler_object_inline_message_2292) + null !== JSCompiler_object_inline_message_2286 && + ((JSCompiler_object_inline_message_2286 = + JSCompiler_object_inline_message_2286.dehydrated), + null !== JSCompiler_object_inline_message_2286) ) return ( - JSCompiler_object_inline_message_2292.data === + JSCompiler_object_inline_message_2286.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8722,58 +8743,58 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_message_2292 = - JSCompiler_object_inline_stack_2294.children; - JSCompiler_object_inline_stack_2294 = - JSCompiler_object_inline_stack_2294.fallback; - if (JSCompiler_object_inline_componentStack_2295) + JSCompiler_object_inline_message_2286 = + JSCompiler_object_inline_stack_2288.children; + JSCompiler_object_inline_stack_2288 = + JSCompiler_object_inline_stack_2288.fallback; + if (JSCompiler_object_inline_componentStack_2289) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2295 = + (JSCompiler_object_inline_componentStack_2289 = workInProgress.mode), - (JSCompiler_object_inline_message_2292 = + (JSCompiler_object_inline_message_2286 = mountWorkInProgressOffscreenFiber( { mode: "hidden", - children: JSCompiler_object_inline_message_2292 + children: JSCompiler_object_inline_message_2286 }, - JSCompiler_object_inline_componentStack_2295 + JSCompiler_object_inline_componentStack_2289 )), - (JSCompiler_object_inline_stack_2294 = createFiberFromFragment( - JSCompiler_object_inline_stack_2294, - JSCompiler_object_inline_componentStack_2295, + (JSCompiler_object_inline_stack_2288 = createFiberFromFragment( + JSCompiler_object_inline_stack_2288, + JSCompiler_object_inline_componentStack_2289, renderLanes, null )), - (JSCompiler_object_inline_message_2292.return = workInProgress), - (JSCompiler_object_inline_stack_2294.return = workInProgress), - (JSCompiler_object_inline_message_2292.sibling = - JSCompiler_object_inline_stack_2294), - (workInProgress.child = JSCompiler_object_inline_message_2292), - (JSCompiler_object_inline_componentStack_2295 = + (JSCompiler_object_inline_message_2286.return = workInProgress), + (JSCompiler_object_inline_stack_2288.return = workInProgress), + (JSCompiler_object_inline_message_2286.sibling = + JSCompiler_object_inline_stack_2288), + (workInProgress.child = JSCompiler_object_inline_message_2286), + (JSCompiler_object_inline_componentStack_2289 = workInProgress.child), - (JSCompiler_object_inline_componentStack_2295.memoizedState = + (JSCompiler_object_inline_componentStack_2289.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_componentStack_2295.childLanes = + (JSCompiler_object_inline_componentStack_2289.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2293, + JSCompiler_object_inline_digest_2287, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2294 + JSCompiler_object_inline_stack_2288 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_message_2292 + JSCompiler_object_inline_message_2286 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_message_2292 = prevState.dehydrated), - null !== JSCompiler_object_inline_message_2292) + ((JSCompiler_object_inline_message_2286 = prevState.dehydrated), + null !== JSCompiler_object_inline_message_2286) ) { if (didSuspend) workInProgress.flags & 256 @@ -8790,94 +8811,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2295 = - JSCompiler_object_inline_stack_2294.fallback), - (JSCompiler_object_inline_message_2292 = workInProgress.mode), - (JSCompiler_object_inline_stack_2294 = + (JSCompiler_object_inline_componentStack_2289 = + JSCompiler_object_inline_stack_2288.fallback), + (JSCompiler_object_inline_message_2286 = workInProgress.mode), + (JSCompiler_object_inline_stack_2288 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2294.children + children: JSCompiler_object_inline_stack_2288.children }, - JSCompiler_object_inline_message_2292 + JSCompiler_object_inline_message_2286 )), - (JSCompiler_object_inline_componentStack_2295 = + (JSCompiler_object_inline_componentStack_2289 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2295, - JSCompiler_object_inline_message_2292, + JSCompiler_object_inline_componentStack_2289, + JSCompiler_object_inline_message_2286, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2295.flags |= 2), - (JSCompiler_object_inline_stack_2294.return = workInProgress), - (JSCompiler_object_inline_componentStack_2295.return = + (JSCompiler_object_inline_componentStack_2289.flags |= 2), + (JSCompiler_object_inline_stack_2288.return = workInProgress), + (JSCompiler_object_inline_componentStack_2289.return = workInProgress), - (JSCompiler_object_inline_stack_2294.sibling = - JSCompiler_object_inline_componentStack_2295), - (workInProgress.child = JSCompiler_object_inline_stack_2294), + (JSCompiler_object_inline_stack_2288.sibling = + JSCompiler_object_inline_componentStack_2289), + (workInProgress.child = JSCompiler_object_inline_stack_2288), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2294 = workInProgress.child), - (JSCompiler_object_inline_stack_2294.memoizedState = + (JSCompiler_object_inline_stack_2288 = workInProgress.child), + (JSCompiler_object_inline_stack_2288.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2294.childLanes = + (JSCompiler_object_inline_stack_2288.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2293, + JSCompiler_object_inline_digest_2287, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress = - JSCompiler_object_inline_componentStack_2295)); + JSCompiler_object_inline_componentStack_2289)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_message_2292.data === + JSCompiler_object_inline_message_2286.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_digest_2293 = - JSCompiler_object_inline_message_2292.nextSibling && - JSCompiler_object_inline_message_2292.nextSibling.dataset; - if (JSCompiler_object_inline_digest_2293) { - JSCompiler_temp = JSCompiler_object_inline_digest_2293.dgst; - var message = JSCompiler_object_inline_digest_2293.msg; - instance = JSCompiler_object_inline_digest_2293.stck; - var componentStack = JSCompiler_object_inline_digest_2293.cstck; + JSCompiler_object_inline_digest_2287 = + JSCompiler_object_inline_message_2286.nextSibling && + JSCompiler_object_inline_message_2286.nextSibling.dataset; + if (JSCompiler_object_inline_digest_2287) { + JSCompiler_temp = JSCompiler_object_inline_digest_2287.dgst; + var message = JSCompiler_object_inline_digest_2287.msg; + instance = JSCompiler_object_inline_digest_2287.stck; + var componentStack = JSCompiler_object_inline_digest_2287.cstck; } - JSCompiler_object_inline_message_2292 = message; - JSCompiler_object_inline_digest_2293 = JSCompiler_temp; - JSCompiler_object_inline_stack_2294 = instance; - JSCompiler_object_inline_componentStack_2295 = componentStack; - JSCompiler_object_inline_message_2292 = - JSCompiler_object_inline_message_2292 - ? Error(JSCompiler_object_inline_message_2292) + JSCompiler_object_inline_message_2286 = message; + JSCompiler_object_inline_digest_2287 = JSCompiler_temp; + JSCompiler_object_inline_stack_2288 = instance; + JSCompiler_object_inline_componentStack_2289 = componentStack; + JSCompiler_object_inline_message_2286 = + JSCompiler_object_inline_message_2286 + ? Error(JSCompiler_object_inline_message_2286) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." ); - JSCompiler_object_inline_message_2292.stack = - JSCompiler_object_inline_stack_2294 || ""; - JSCompiler_object_inline_message_2292.digest = - JSCompiler_object_inline_digest_2293; - JSCompiler_object_inline_digest_2293 = - void 0 === JSCompiler_object_inline_componentStack_2295 + JSCompiler_object_inline_message_2286.stack = + JSCompiler_object_inline_stack_2288 || ""; + JSCompiler_object_inline_message_2286.digest = + JSCompiler_object_inline_digest_2287; + JSCompiler_object_inline_digest_2287 = + void 0 === JSCompiler_object_inline_componentStack_2289 ? null - : JSCompiler_object_inline_componentStack_2295; - "string" === typeof JSCompiler_object_inline_digest_2293 && + : JSCompiler_object_inline_componentStack_2289; + "string" === typeof JSCompiler_object_inline_digest_2287 && CapturedStacks.set( - JSCompiler_object_inline_message_2292, - JSCompiler_object_inline_digest_2293 + JSCompiler_object_inline_message_2286, + JSCompiler_object_inline_digest_2287 ); queueHydrationError({ - value: JSCompiler_object_inline_message_2292, + value: JSCompiler_object_inline_message_2286, source: null, - stack: JSCompiler_object_inline_digest_2293 + stack: JSCompiler_object_inline_digest_2287 }); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8892,25 +8913,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_digest_2293 = + (JSCompiler_object_inline_digest_2287 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_digest_2293) + didReceiveUpdate || JSCompiler_object_inline_digest_2287) ) { - JSCompiler_object_inline_digest_2293 = workInProgressRoot; - if (null !== JSCompiler_object_inline_digest_2293) { - JSCompiler_object_inline_stack_2294 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2294 & 42)) - JSCompiler_object_inline_stack_2294 = 1; + JSCompiler_object_inline_digest_2287 = workInProgressRoot; + if (null !== JSCompiler_object_inline_digest_2287) { + JSCompiler_object_inline_stack_2288 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2288 & 42)) + JSCompiler_object_inline_stack_2288 = 1; else - switch (JSCompiler_object_inline_stack_2294) { + switch (JSCompiler_object_inline_stack_2288) { case 2: - JSCompiler_object_inline_stack_2294 = 1; + JSCompiler_object_inline_stack_2288 = 1; break; case 8: - JSCompiler_object_inline_stack_2294 = 4; + JSCompiler_object_inline_stack_2288 = 4; break; case 32: - JSCompiler_object_inline_stack_2294 = 16; + JSCompiler_object_inline_stack_2288 = 16; break; case 128: case 256: @@ -8931,40 +8952,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2294 = 64; + JSCompiler_object_inline_stack_2288 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2294 = 134217728; + JSCompiler_object_inline_stack_2288 = 134217728; break; default: - JSCompiler_object_inline_stack_2294 = 0; + JSCompiler_object_inline_stack_2288 = 0; } - JSCompiler_object_inline_stack_2294 = + JSCompiler_object_inline_stack_2288 = 0 !== - (JSCompiler_object_inline_stack_2294 & - (JSCompiler_object_inline_digest_2293.suspendedLanes | + (JSCompiler_object_inline_stack_2288 & + (JSCompiler_object_inline_digest_2287.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2294; + : JSCompiler_object_inline_stack_2288; if ( - 0 !== JSCompiler_object_inline_stack_2294 && - JSCompiler_object_inline_stack_2294 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2288 && + JSCompiler_object_inline_stack_2288 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2294), + ((prevState.retryLane = JSCompiler_object_inline_stack_2288), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2294 + JSCompiler_object_inline_stack_2288 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_digest_2293, + JSCompiler_object_inline_digest_2287, current, - JSCompiler_object_inline_stack_2294 + JSCompiler_object_inline_stack_2288 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_message_2292.data === + JSCompiler_object_inline_message_2286.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8972,7 +8993,7 @@ renderLanes ); } else - JSCompiler_object_inline_message_2292.data === + JSCompiler_object_inline_message_2286.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -8980,12 +9001,12 @@ null, current )), - (JSCompiler_object_inline_message_2292._reactRetry = + (JSCompiler_object_inline_message_2286._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2292.nextSibling + JSCompiler_object_inline_message_2286.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9003,57 +9024,57 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2294.children + JSCompiler_object_inline_stack_2288.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_componentStack_2295) + if (JSCompiler_object_inline_componentStack_2289) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2295 = - JSCompiler_object_inline_stack_2294.fallback), - (JSCompiler_object_inline_message_2292 = workInProgress.mode), + (JSCompiler_object_inline_componentStack_2289 = + JSCompiler_object_inline_stack_2288.fallback), + (JSCompiler_object_inline_message_2286 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2294 = createWorkInProgress( + (JSCompiler_object_inline_stack_2288 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2294.children + children: JSCompiler_object_inline_stack_2288.children } )), - (JSCompiler_object_inline_stack_2294.subtreeFlags = + (JSCompiler_object_inline_stack_2288.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_componentStack_2295 = + ? (JSCompiler_object_inline_componentStack_2289 = createWorkInProgress( instance, - JSCompiler_object_inline_componentStack_2295 + JSCompiler_object_inline_componentStack_2289 )) - : ((JSCompiler_object_inline_componentStack_2295 = + : ((JSCompiler_object_inline_componentStack_2289 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2295, - JSCompiler_object_inline_message_2292, + JSCompiler_object_inline_componentStack_2289, + JSCompiler_object_inline_message_2286, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2295.flags |= 2)), - (JSCompiler_object_inline_componentStack_2295.return = + (JSCompiler_object_inline_componentStack_2289.flags |= 2)), + (JSCompiler_object_inline_componentStack_2289.return = workInProgress), - (JSCompiler_object_inline_stack_2294.return = workInProgress), - (JSCompiler_object_inline_stack_2294.sibling = - JSCompiler_object_inline_componentStack_2295), - (workInProgress.child = JSCompiler_object_inline_stack_2294), - (JSCompiler_object_inline_stack_2294 = - JSCompiler_object_inline_componentStack_2295), - (JSCompiler_object_inline_componentStack_2295 = workInProgress.child), - (JSCompiler_object_inline_message_2292 = current.child.memoizedState), - null === JSCompiler_object_inline_message_2292 - ? (JSCompiler_object_inline_message_2292 = + (JSCompiler_object_inline_stack_2288.return = workInProgress), + (JSCompiler_object_inline_stack_2288.sibling = + JSCompiler_object_inline_componentStack_2289), + (workInProgress.child = JSCompiler_object_inline_stack_2288), + (JSCompiler_object_inline_stack_2288 = + JSCompiler_object_inline_componentStack_2289), + (JSCompiler_object_inline_componentStack_2289 = workInProgress.child), + (JSCompiler_object_inline_message_2286 = current.child.memoizedState), + null === JSCompiler_object_inline_message_2286 + ? (JSCompiler_object_inline_message_2286 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_message_2292.cachePool), + JSCompiler_object_inline_message_2286.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9061,37 +9082,37 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_message_2292 = { + (JSCompiler_object_inline_message_2286 = { baseLanes: - JSCompiler_object_inline_message_2292.baseLanes | renderLanes, + JSCompiler_object_inline_message_2286.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_componentStack_2295.memoizedState = - JSCompiler_object_inline_message_2292), - (JSCompiler_object_inline_componentStack_2295.childLanes = + (JSCompiler_object_inline_componentStack_2289.memoizedState = + JSCompiler_object_inline_message_2286), + (JSCompiler_object_inline_componentStack_2289.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2293, + JSCompiler_object_inline_digest_2287, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2294 + JSCompiler_object_inline_stack_2288 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2294.children + children: JSCompiler_object_inline_stack_2288.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_digest_2293 = workInProgress.deletions), - null === JSCompiler_object_inline_digest_2293 + ((JSCompiler_object_inline_digest_2287 = workInProgress.deletions), + null === JSCompiler_object_inline_digest_2287 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_digest_2293.push(current)); + : JSCompiler_object_inline_digest_2287.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9417,6 +9438,7 @@ case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -10001,6 +10023,7 @@ case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), (returnFiber.effectDuration = 0), (returnFiber.passiveEffectDuration = 0), @@ -11005,20 +11028,21 @@ recordLayoutEffectDuration(current); } else runWithFiberInDEV(current, ref, null); - } catch (error$6) { - captureCommitPhaseError(current, nearestMountedAncestor, error$6); + } catch (error$7) { + captureCommitPhaseError(current, nearestMountedAncestor, error$7); } else ref.current = null; } function commitProfiler(finishedWork, current, commitTime, effectDuration) { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit; _finishedWork$memoize = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof _finishedWork$memoize && _finishedWork$memoize( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -11053,6 +11077,25 @@ captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + function commitProfilerPostCommitImpl( + finishedWork, + current, + commitTime, + passiveEffectDuration + ) { + var _finishedWork$memoize2 = finishedWork.memoizedProps; + finishedWork = _finishedWork$memoize2.id; + _finishedWork$memoize2 = _finishedWork$memoize2.onPostCommit; + current = null === current ? "mount" : "update"; + currentUpdateIsNested && (current = "nested-update"); + "function" === typeof _finishedWork$memoize2 && + _finishedWork$memoize2( + finishedWork, + current, + passiveEffectDuration, + commitTime + ); + } function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -11208,8 +11251,9 @@ ); } function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -11231,7 +11275,7 @@ selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$2) { + } catch (e$3) { JSCompiler_temp = null; break a; } @@ -11477,7 +11521,6 @@ a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -11697,39 +11740,39 @@ ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - var tag = prevHostParentIsContainer.tag, - inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - ((tag & Insertion) !== NoFlags - ? ((inst.destroy = void 0), + var _tag = prevHostParentIsContainer.tag, + _inst = prevHostParentIsContainer.inst, + _destroy = _inst.destroy; + void 0 !== _destroy && + ((_tag & Insertion) !== NoFlags + ? ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )) - : (tag & Layout) !== NoFlags && + : (_tag & Layout) !== NoFlags && (markComponentLayoutEffectUnmountStarted(deletedFiber), shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), - (inst.destroy = void 0), + (_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy ), recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), + : ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )), markComponentLayoutEffectUnmountStopped())); prevHostParentIsContainer = prevHostParentIsContainer.next; @@ -12525,7 +12568,6 @@ commitTime, includeWorkInProgressEffects ), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12660,6 +12702,41 @@ (retainCache(finishedWork), null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + if (flags & 2048 && executionContext & CommitContext) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + runWithFiberInDEV( + finishedWork, + commitProfilerPostCommitImpl, + finishedWork, + finishedWork.alternate, + commitTime, + finishedRoot + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: @@ -13067,9 +13144,9 @@ this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; this._debugOwner = this._debugInfo = null; this._debugNeedsRemount = !1; this._debugHookTypes = null; @@ -13102,8 +13179,8 @@ (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -14715,7 +14792,7 @@ else switch ( (erroredWork.mode & ProfileMode && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), + stopProfilerTimerIfRunningAndRecordDuration(erroredWork), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -14833,8 +14910,8 @@ } workLoopSync(); break; - } catch (thrownValue$8) { - handleThrow(root, thrownValue$8); + } catch (thrownValue$9) { + handleThrow(root, thrownValue$9); } while (1); lanes && root.shellSuspendCounter++; @@ -14994,8 +15071,8 @@ ? workLoopSync() : workLoopConcurrent(); break; - } catch (thrownValue$9) { - handleThrow(root, thrownValue$9); + } catch (thrownValue$10) { + handleThrow(root, thrownValue$10); } while (1); resetContextDependencies(); @@ -15030,7 +15107,7 @@ unitOfWork, entangledRenderLanes )), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = runWithFiberInDEV( unitOfWork, beginWork, @@ -15083,7 +15160,7 @@ (current = beginWork(current, unitOfWork, entangledRenderLanes)); } isProfilingMode && - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0); + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork); return current; } function throwAndUnwindWorkLoop(root, unitOfWork, thrownValue) { @@ -15136,23 +15213,16 @@ } var current = completedWork.alternate; unitOfWork = completedWork.return; - (completedWork.mode & ProfileMode) === NoMode - ? (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )) - : (startProfilerTimer(completedWork), - (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = runWithFiberInDEV( + completedWork, + completeWork, + current, + completedWork, + entangledRenderLanes + ); + (completedWork.mode & ProfileMode) !== NoMode && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -15176,7 +15246,7 @@ return; } if ((unitOfWork.mode & ProfileMode) !== NoMode) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -15299,7 +15369,7 @@ commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -15394,10 +15464,10 @@ if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + priority = pendingPassiveTransitions; pendingPassiveTransitions = null; - priority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root$jscomp$0 = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if ( @@ -15415,67 +15485,25 @@ injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(priority.current); + commitPassiveUnmountOnFiber(root$jscomp$0.current); commitPassiveMountOnFiber( - priority, - priority.current, + root$jscomp$0, + root$jscomp$0.current, lanes, - transitions + priority ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if ( - executionContext & CommitContext && - 0 !== (finishedWork.flags & 4) - ) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$jscomp$0 = commitTime, - phase = - null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$jscomp$0 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markPassiveEffectsStopped && injectedProfilingHooks.markPassiveEffectsStopped(); - commitDoubleInvokeEffectsInDEV(priority); + commitDoubleInvokeEffectsInDEV(root$jscomp$0); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects - ? priority === rootWithPassiveNestedUpdates + ? root$jscomp$0 === rootWithPassiveNestedUpdates ? nestedPassiveUpdateCount++ : ((nestedPassiveUpdateCount = 0), - (rootWithPassiveNestedUpdates = priority)) + (rootWithPassiveNestedUpdates = root$jscomp$0)) : (nestedPassiveUpdateCount = 0); didScheduleUpdateDuringPassiveEffects = isFlushingPassiveEffects = !1; @@ -15484,7 +15512,7 @@ "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, priority); + injectedHook.onPostCommitFiberRoot(rendererID, root$jscomp$0); } catch (err) { hasLoggedError || ((hasLoggedError = !0), @@ -15493,7 +15521,7 @@ err )); } - var stateNode = priority.current.stateNode; + var stateNode = root$jscomp$0.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -15507,15 +15535,6 @@ } return !1; } - function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); - } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -20057,7 +20076,7 @@ ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -23891,7 +23910,7 @@ var nonExtensibleObject = Object.preventExtensions({}); new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); - } catch (e$7) { + } catch (e$8) { hasBadMapPolyfill = !0; } var DefaultAsyncDispatcher = { @@ -23964,7 +23983,6 @@ rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, NESTED_UPDATE_LIMIT = 50, @@ -24520,11 +24538,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-f2df5694-20240916" !== 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.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24561,11 +24579,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-206df66e-20240912" + reconcilerVersion: "19.0.0-rc-f2df5694-20240916" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24709,7 +24727,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js index 42c3639047b74..95543d1e57a13 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js @@ -164,16 +164,16 @@ function describeNativeComponentFrame(fn, construct) { } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -362,36 +362,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$2 = parentA.child; child$2; ) { - if (child$2 === a) { + for (var didFindChild = !1, child$3 = parentA.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) { - for (child$2 = parentB.child; child$2; ) { - if (child$2 === a) { + for (child$3 = parentB.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) throw Error(formatProdErrorMessage(189)); } @@ -719,18 +719,18 @@ function markRootFinished( 0 < remainingLanes; ) { - var index$7 = 31 - clz32(remainingLanes), - lane = 1 << index$7; - entanglements[index$7] = 0; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = hiddenUpdates[index$7]; + var index$8 = 31 - clz32(remainingLanes), + lane = 1 << index$8; + entanglements[index$8] = 0; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = hiddenUpdates[index$8]; if (null !== hiddenUpdatesForLane) for ( - hiddenUpdates[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + hiddenUpdates[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -536870913); } remainingLanes &= ~lane; @@ -755,10 +755,10 @@ function markSpawnedDeferredLane(root, spawnedLane, entangledLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } @@ -908,8 +908,8 @@ function setValueForAttribute(node, name, value) { node.removeAttribute(name); return; case "boolean": - var prefix$10 = name.toLowerCase().slice(0, 5); - if ("data-" !== prefix$10 && "aria-" !== prefix$10) { + var prefix$11 = name.toLowerCase().slice(0, 5); + if ("data-" !== prefix$11 && "aria-" !== prefix$11) { node.removeAttribute(name); return; } @@ -1242,15 +1242,15 @@ function setValueForStyles(node, styles, prevStyles) { : "float" === styleName ? (node.cssFloat = "") : (node[styleName] = "")); - for (var styleName$16 in styles) - (styleName = styles[styleName$16]), - styles.hasOwnProperty(styleName$16) && - prevStyles[styleName$16] !== styleName && - setValueForStyle(node, styleName$16, styleName); - } else for (var styleName$17 in styles) - styles.hasOwnProperty(styleName$17) && - setValueForStyle(node, styleName$17, styles[styleName$17]); + (styleName = styles[styleName$17]), + styles.hasOwnProperty(styleName$17) && + prevStyles[styleName$17] !== styleName && + setValueForStyle(node, styleName$17, styleName); + } else + for (var styleName$18 in styles) + styles.hasOwnProperty(styleName$18) && + setValueForStyle(node, styleName$18, styles[styleName$18]); } function isCustomElement(tagName) { if (-1 === tagName.indexOf("-")) return !1; @@ -1979,19 +1979,19 @@ function getTargetInstForChangeEvent(domEventName, targetInst) { } var isInputEventSupported = !1; if (canUseDOM) { - var JSCompiler_inline_result$jscomp$280; + var JSCompiler_inline_result$jscomp$281; if (canUseDOM) { - var isSupported$jscomp$inline_416 = "oninput" in document; - if (!isSupported$jscomp$inline_416) { - var element$jscomp$inline_417 = document.createElement("div"); - element$jscomp$inline_417.setAttribute("oninput", "return;"); - isSupported$jscomp$inline_416 = - "function" === typeof element$jscomp$inline_417.oninput; + var isSupported$jscomp$inline_417 = "oninput" in document; + if (!isSupported$jscomp$inline_417) { + var element$jscomp$inline_418 = document.createElement("div"); + element$jscomp$inline_418.setAttribute("oninput", "return;"); + isSupported$jscomp$inline_417 = + "function" === typeof element$jscomp$inline_418.oninput; } - JSCompiler_inline_result$jscomp$280 = isSupported$jscomp$inline_416; - } else JSCompiler_inline_result$jscomp$280 = !1; + JSCompiler_inline_result$jscomp$281 = isSupported$jscomp$inline_417; + } else JSCompiler_inline_result$jscomp$281 = !1; isInputEventSupported = - JSCompiler_inline_result$jscomp$280 && + JSCompiler_inline_result$jscomp$281 && (!document.documentMode || 9 < document.documentMode); } function stopWatchingForValueChange() { @@ -2105,23 +2105,37 @@ function containsNode(outerNode, innerNode) { : !1 : !1; } -function getActiveElementDeep() { +function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmp1506603491$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmp1506603491$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmp1506603491$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmp1506603491$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp1506603491$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmp1506603491$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmp1506603491$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmp1506603491$1 = getActiveElement(containerInfo.document); } - return element; + return $jscomp$optchain$tmp1506603491$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2137,101 +2151,95 @@ function hasSelectionCapabilities(elem) { "true" === elem.contentEditable) ); } -function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; +function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { - if ( - null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) - ) + if (null !== priorSelectionRange && hasSelectionCapabilities(containerInfo)) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } var skipSelectionChangeEvent = @@ -3893,7 +3901,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$54 = !1; + didReadFromEntangledAsyncAction$55 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -3914,11 +3922,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$54 = !0); + (didReadFromEntangledAsyncAction$55 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$54 = !0); + (didReadFromEntangledAsyncAction$55 = !0); continue; } else (updateLane = { @@ -3964,7 +3972,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$54 && + didReadFromEntangledAsyncAction$55 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4162,8 +4170,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$60) { - onActionError(actionQueue, node, error$60); + } catch (error$61) { + onActionError(actionQueue, node, error$61); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4578,10 +4586,10 @@ function refreshCache(fiber) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$63 = enqueueUpdate(provider, fiber, lane); - null !== root$63 && - (scheduleUpdateOnFiber(root$63, provider, lane), - entangleTransitions(root$63, provider, lane)); + var root$64 = enqueueUpdate(provider, fiber, lane); + null !== root$64 && + (scheduleUpdateOnFiber(root$64, provider, lane), + entangleTransitions(root$64, provider, lane)); provider = { cache: createCache() }; fiber.payload = provider; return; @@ -5092,9 +5100,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$67 in Component) - void 0 === newProps[propName$67] && - (newProps[propName$67] = Component[propName$67]); + for (var propName$68 in Component) + void 0 === newProps[propName$68] && + (newProps[propName$68] = Component[propName$68]); } return newProps; } @@ -5140,9 +5148,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$68) { + } catch (e$69) { setTimeout(function () { - throw e$68; + throw e$69; }); } } @@ -5153,9 +5161,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$69) { + } catch (e$70) { setTimeout(function () { - throw e$69; + throw e$70; }); } } @@ -7544,8 +7552,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { else if ("function" === typeof ref) try { ref(null); - } catch (error$112) { - captureCommitPhaseError(current, nearestMountedAncestor, error$112); + } catch (error$113) { + captureCommitPhaseError(current, nearestMountedAncestor, error$113); } else ref.current = null; } @@ -7662,8 +7670,9 @@ var offscreenSubtreeIsHidden = !1, nextEffect = null, shouldFireAfterActiveInstanceBlur = !1; function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -7685,7 +7694,7 @@ function commitBeforeMutationEffects(root, firstChild) { selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$20) { + } catch (e$21) { JSCompiler_temp = null; break a; } @@ -7847,11 +7856,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$111) { + } catch (error$112) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$111 + error$112 ); } } @@ -8022,7 +8031,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$120 = hostParentIsContainer; + var prevHostParentIsContainer$121 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8030,7 +8039,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$120; + hostParentIsContainer = prevHostParentIsContainer$121; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8098,18 +8107,18 @@ function commitDeletionEffectsOnFiber( ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - prevHostParentIsContainer$120 = prevHostParentIsContainer.tag; + prevHostParentIsContainer$121 = prevHostParentIsContainer.tag; var inst = prevHostParentIsContainer.inst, destroy = inst.destroy; void 0 !== destroy && - (0 !== (prevHostParentIsContainer$120 & 2) + (0 !== (prevHostParentIsContainer$121 & 2) ? ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, nearestMountedAncestor, destroy )) - : 0 !== (prevHostParentIsContainer$120 & 4) && + : 0 !== (prevHostParentIsContainer$121 & 4) && ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, @@ -8680,21 +8689,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$113 = JSCompiler_inline_result.stateNode; + var parent$114 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$113, ""), + (setTextContent(parent$114, ""), (JSCompiler_inline_result.flags &= -33)); - var before$114 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$114, parent$113); + var before$115 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$115, parent$114); break; case 3: case 4: - var parent$115 = JSCompiler_inline_result.stateNode.containerInfo, - before$116 = getHostSibling(finishedWork); + var parent$116 = JSCompiler_inline_result.stateNode.containerInfo, + before$117 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$116, - parent$115 + before$117, + parent$116 ); break; default: @@ -8961,6 +8970,14 @@ function commitPassiveMountOnFiber( (finishedWork.refCount++, null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + break; case 23: break; case 22: @@ -9589,14 +9606,14 @@ function cutOffTailIfNeeded(renderState, hasRenderedATailFallback) { break; case "collapsed": lastTailNode = renderState.tail; - for (var lastTailNode$133 = null; null !== lastTailNode; ) - null !== lastTailNode.alternate && (lastTailNode$133 = lastTailNode), + for (var lastTailNode$134 = null; null !== lastTailNode; ) + null !== lastTailNode.alternate && (lastTailNode$134 = lastTailNode), (lastTailNode = lastTailNode.sibling); - null === lastTailNode$133 + null === lastTailNode$134 ? hasRenderedATailFallback || null === renderState.tail ? (renderState.tail = null) : (renderState.tail.sibling = null) - : (lastTailNode$133.sibling = null); + : (lastTailNode$134.sibling = null); } } function bubbleProperties(completedWork) { @@ -9606,19 +9623,19 @@ function bubbleProperties(completedWork) { newChildLanes = 0, subtreeFlags = 0; if (didBailout) - for (var child$134 = completedWork.child; null !== child$134; ) - (newChildLanes |= child$134.lanes | child$134.childLanes), - (subtreeFlags |= child$134.subtreeFlags & 31457280), - (subtreeFlags |= child$134.flags & 31457280), - (child$134.return = completedWork), - (child$134 = child$134.sibling); + for (var child$135 = completedWork.child; null !== child$135; ) + (newChildLanes |= child$135.lanes | child$135.childLanes), + (subtreeFlags |= child$135.subtreeFlags & 31457280), + (subtreeFlags |= child$135.flags & 31457280), + (child$135.return = completedWork), + (child$135 = child$135.sibling); else - for (child$134 = completedWork.child; null !== child$134; ) - (newChildLanes |= child$134.lanes | child$134.childLanes), - (subtreeFlags |= child$134.subtreeFlags), - (subtreeFlags |= child$134.flags), - (child$134.return = completedWork), - (child$134 = child$134.sibling); + for (child$135 = completedWork.child; null !== child$135; ) + (newChildLanes |= child$135.lanes | child$135.childLanes), + (subtreeFlags |= child$135.subtreeFlags), + (subtreeFlags |= child$135.flags), + (child$135.return = completedWork), + (child$135 = child$135.sibling); completedWork.subtreeFlags |= subtreeFlags; completedWork.childLanes = newChildLanes; return didBailout; @@ -9895,11 +9912,11 @@ function completeWork(current, workInProgress, renderLanes) { null !== newProps.alternate.memoizedState && null !== newProps.alternate.memoizedState.cachePool && (type = newProps.alternate.memoizedState.cachePool.pool); - var cache$146 = null; + var cache$147 = null; null !== newProps.memoizedState && null !== newProps.memoizedState.cachePool && - (cache$146 = newProps.memoizedState.cachePool.pool); - cache$146 !== type && (newProps.flags |= 2048); + (cache$147 = newProps.memoizedState.cachePool.pool); + cache$147 !== type && (newProps.flags |= 2048); } renderLanes !== current && renderLanes && @@ -9924,8 +9941,8 @@ function completeWork(current, workInProgress, renderLanes) { type = workInProgress.memoizedState; if (null === type) return bubbleProperties(workInProgress), null; newProps = 0 !== (workInProgress.flags & 128); - cache$146 = type.rendering; - if (null === cache$146) + cache$147 = type.rendering; + if (null === cache$147) if (newProps) cutOffTailIfNeeded(type, !1); else { if ( @@ -9933,11 +9950,11 @@ function completeWork(current, workInProgress, renderLanes) { (null !== current && 0 !== (current.flags & 128)) ) for (current = workInProgress.child; null !== current; ) { - cache$146 = findFirstSuspended(current); - if (null !== cache$146) { + cache$147 = findFirstSuspended(current); + if (null !== cache$147) { workInProgress.flags |= 128; cutOffTailIfNeeded(type, !1); - current = cache$146.updateQueue; + current = cache$147.updateQueue; workInProgress.updateQueue = current; scheduleRetryEffect(workInProgress, current); workInProgress.subtreeFlags = 0; @@ -9962,7 +9979,7 @@ function completeWork(current, workInProgress, renderLanes) { } else { if (!newProps) - if (((current = findFirstSuspended(cache$146)), null !== current)) { + if (((current = findFirstSuspended(cache$147)), null !== current)) { if ( ((workInProgress.flags |= 128), (newProps = !0), @@ -9972,7 +9989,7 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !0), null === type.tail && "hidden" === type.tailMode && - !cache$146.alternate && + !cache$147.alternate && !isHydrating) ) return bubbleProperties(workInProgress), null; @@ -9985,13 +10002,13 @@ function completeWork(current, workInProgress, renderLanes) { cutOffTailIfNeeded(type, !1), (workInProgress.lanes = 4194304)); type.isBackwards - ? ((cache$146.sibling = workInProgress.child), - (workInProgress.child = cache$146)) + ? ((cache$147.sibling = workInProgress.child), + (workInProgress.child = cache$147)) : ((current = type.last), null !== current - ? (current.sibling = cache$146) - : (workInProgress.child = cache$146), - (type.last = cache$146)); + ? (current.sibling = cache$147) + : (workInProgress.child = cache$147), + (type.last = cache$147)); } if (null !== type.tail) return ( @@ -10511,9 +10528,9 @@ function markRootSuspended( didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes); didSkipSuspendedSiblings = root.expirationTimes; for (var lanes = suspendedLanes; 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6; - didSkipSuspendedSiblings[index$6] = -1; + var index$7 = 31 - clz32(lanes), + lane = 1 << index$7; + didSkipSuspendedSiblings[index$7] = -1; lanes &= ~lane; } 0 !== spawnedLane && @@ -10626,9 +10643,9 @@ function prepareFreshStack(root, lanes) { 0 < allEntangledLanes; ) { - var index$4 = 31 - clz32(allEntangledLanes), - lane = 1 << index$4; - lanes |= root[index$4]; + var index$5 = 31 - clz32(allEntangledLanes), + lane = 1 << index$5; + lanes |= root[index$5]; allEntangledLanes &= ~lane; } entangledRenderLanes = lanes; @@ -10734,8 +10751,8 @@ function renderRootSync(root, lanes) { } workLoopSync(); break; - } catch (thrownValue$161) { - handleThrow(root, thrownValue$161); + } catch (thrownValue$162) { + handleThrow(root, thrownValue$162); } while (1); lanes && root.shellSuspendCounter++; @@ -10844,8 +10861,8 @@ function renderRootConcurrent(root, lanes) { } workLoopConcurrent(); break; - } catch (thrownValue$163) { - handleThrow(root, thrownValue$163); + } catch (thrownValue$164) { + handleThrow(root, thrownValue$164); } while (1); resetContextDependencies(); @@ -11079,7 +11096,7 @@ function commitRootImpl( (executionContext |= 4), commitBeforeMutationEffects(root, finishedWork), commitMutationEffectsOnFiber(finishedWork, root), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -11128,7 +11145,7 @@ function releaseRootPooledCache(root, remainingLanes) { } function flushPassiveEffects() { if (null !== rootWithPendingPassiveEffects) { - var root$167 = rootWithPendingPassiveEffects, + var root$168 = rootWithPendingPassiveEffects, remainingLanes = pendingPassiveEffectsRemainingLanes; pendingPassiveEffectsRemainingLanes = 0; var renderPriority = lanesToEventPriority(pendingPassiveEffectsLanes), @@ -11167,7 +11184,7 @@ function flushPassiveEffects() { } finally { (ReactDOMSharedInternals.p = previousPriority), (ReactSharedInternals.T = prevTransition), - releaseRootPooledCache(root$167, remainingLanes); + releaseRootPooledCache(root$168, remainingLanes); } } return !1; @@ -11326,14 +11343,14 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { isFlushingWork = !0; do { var didPerformSomeWork = !1; - for (var root$169 = firstScheduledRoot; null !== root$169; ) { + for (var root$170 = firstScheduledRoot; null !== root$170; ) { if (!onlyLegacy) if (0 !== syncTransitionLanes) { - var pendingLanes = root$169.pendingLanes; + var pendingLanes = root$170.pendingLanes; if (0 === pendingLanes) var JSCompiler_inline_result = 0; else { - var suspendedLanes = root$169.suspendedLanes, - pingedLanes = root$169.pingedLanes; + var suspendedLanes = root$170.suspendedLanes, + pingedLanes = root$170.pingedLanes; JSCompiler_inline_result = (1 << (31 - clz32(42 | syncTransitionLanes) + 1)) - 1; JSCompiler_inline_result &= @@ -11347,17 +11364,17 @@ function flushSyncWorkAcrossRoots_impl(syncTransitionLanes, onlyLegacy) { } 0 !== JSCompiler_inline_result && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$169, JSCompiler_inline_result)); + performSyncWorkOnRoot(root$170, JSCompiler_inline_result)); } else (JSCompiler_inline_result = workInProgressRootRenderLanes), (JSCompiler_inline_result = getNextLanes( - root$169, - root$169 === workInProgressRoot ? JSCompiler_inline_result : 0 + root$170, + root$170 === workInProgressRoot ? JSCompiler_inline_result : 0 )), 0 !== (JSCompiler_inline_result & 3) && ((didPerformSomeWork = !0), - performSyncWorkOnRoot(root$169, JSCompiler_inline_result)); - root$169 = root$169.next; + performSyncWorkOnRoot(root$170, JSCompiler_inline_result)); + root$170 = root$170.next; } } while (didPerformSomeWork); isFlushingWork = !1; @@ -11398,12 +11415,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -11567,20 +11584,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1407 = 0; - i$jscomp$inline_1407 < simpleEventPluginEvents.length; - i$jscomp$inline_1407++ + var i$jscomp$inline_1408 = 0; + i$jscomp$inline_1408 < simpleEventPluginEvents.length; + i$jscomp$inline_1408++ ) { - var eventName$jscomp$inline_1408 = - simpleEventPluginEvents[i$jscomp$inline_1407], - domEventName$jscomp$inline_1409 = - eventName$jscomp$inline_1408.toLowerCase(), - capitalizedEvent$jscomp$inline_1410 = - eventName$jscomp$inline_1408[0].toUpperCase() + - eventName$jscomp$inline_1408.slice(1); + var eventName$jscomp$inline_1409 = + simpleEventPluginEvents[i$jscomp$inline_1408], + domEventName$jscomp$inline_1410 = + eventName$jscomp$inline_1409.toLowerCase(), + capitalizedEvent$jscomp$inline_1411 = + eventName$jscomp$inline_1409[0].toUpperCase() + + eventName$jscomp$inline_1409.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1409, - "on" + capitalizedEvent$jscomp$inline_1410 + domEventName$jscomp$inline_1410, + "on" + capitalizedEvent$jscomp$inline_1411 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -12763,34 +12780,34 @@ function setInitialProperties(domElement, tag, props) { defaultChecked = null; for (hasSrc in props) if (props.hasOwnProperty(hasSrc)) { - var propValue$183 = props[hasSrc]; - if (null != propValue$183) + var propValue$184 = props[hasSrc]; + if (null != propValue$184) switch (hasSrc) { case "name": - hasSrcSet = propValue$183; + hasSrcSet = propValue$184; break; case "type": - propValue = propValue$183; + propValue = propValue$184; break; case "checked": - checked = propValue$183; + checked = propValue$184; break; case "defaultChecked": - defaultChecked = propValue$183; + defaultChecked = propValue$184; break; case "value": - propKey = propValue$183; + propKey = propValue$184; break; case "defaultValue": - defaultValue = propValue$183; + defaultValue = propValue$184; break; case "children": case "dangerouslySetInnerHTML": - if (null != propValue$183) + if (null != propValue$184) throw Error(formatProdErrorMessage(137, tag)); break; default: - setProp(domElement, tag, hasSrc, propValue$183, props, null); + setProp(domElement, tag, hasSrc, propValue$184, props, null); } } initInput( @@ -12927,14 +12944,14 @@ function setInitialProperties(domElement, tag, props) { return; default: if (isCustomElement(tag)) { - for (propValue$183 in props) - props.hasOwnProperty(propValue$183) && - ((hasSrc = props[propValue$183]), + for (propValue$184 in props) + props.hasOwnProperty(propValue$184) && + ((hasSrc = props[propValue$184]), void 0 !== hasSrc && setPropOnCustomElement( domElement, tag, - propValue$183, + propValue$184, hasSrc, props, void 0 @@ -12982,14 +12999,14 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp(domElement, tag, propKey, null, nextProps, lastProp); } } - for (var propKey$200 in nextProps) { - var propKey = nextProps[propKey$200]; - lastProp = lastProps[propKey$200]; + for (var propKey$201 in nextProps) { + var propKey = nextProps[propKey$201]; + lastProp = lastProps[propKey$201]; if ( - nextProps.hasOwnProperty(propKey$200) && + nextProps.hasOwnProperty(propKey$201) && (null != propKey || null != lastProp) ) - switch (propKey$200) { + switch (propKey$201) { case "type": type = propKey; break; @@ -13018,7 +13035,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$200, + propKey$201, propKey, nextProps, lastProp @@ -13037,7 +13054,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ); return; case "select": - propKey = value = defaultValue = propKey$200 = null; + propKey = value = defaultValue = propKey$201 = null; for (type in lastProps) if ( ((lastDefaultValue = lastProps[type]), @@ -13068,7 +13085,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (name) { case "value": - propKey$200 = type; + propKey$201 = type; break; case "defaultValue": defaultValue = type; @@ -13089,15 +13106,15 @@ function updateProperties(domElement, tag, lastProps, nextProps) { tag = defaultValue; lastProps = value; nextProps = propKey; - null != propKey$200 - ? updateOptions(domElement, !!lastProps, propKey$200, !1) + null != propKey$201 + ? updateOptions(domElement, !!lastProps, propKey$201, !1) : !!nextProps !== !!lastProps && (null != tag ? updateOptions(domElement, !!lastProps, tag, !0) : updateOptions(domElement, !!lastProps, lastProps ? [] : "", !1)); return; case "textarea": - propKey = propKey$200 = null; + propKey = propKey$201 = null; for (defaultValue in lastProps) if ( ((name = lastProps[defaultValue]), @@ -13121,7 +13138,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { ) switch (value) { case "value": - propKey$200 = name; + propKey$201 = name; break; case "defaultValue": propKey = name; @@ -13135,17 +13152,17 @@ function updateProperties(domElement, tag, lastProps, nextProps) { name !== type && setProp(domElement, tag, value, name, nextProps, type); } - updateTextarea(domElement, propKey$200, propKey); + updateTextarea(domElement, propKey$201, propKey); return; case "option": - for (var propKey$216 in lastProps) + for (var propKey$217 in lastProps) if ( - ((propKey$200 = lastProps[propKey$216]), - lastProps.hasOwnProperty(propKey$216) && - null != propKey$200 && - !nextProps.hasOwnProperty(propKey$216)) + ((propKey$201 = lastProps[propKey$217]), + lastProps.hasOwnProperty(propKey$217) && + null != propKey$201 && + !nextProps.hasOwnProperty(propKey$217)) ) - switch (propKey$216) { + switch (propKey$217) { case "selected": domElement.selected = !1; break; @@ -13153,33 +13170,33 @@ function updateProperties(domElement, tag, lastProps, nextProps) { setProp( domElement, tag, - propKey$216, + propKey$217, null, nextProps, - propKey$200 + propKey$201 ); } for (lastDefaultValue in nextProps) if ( - ((propKey$200 = nextProps[lastDefaultValue]), + ((propKey$201 = nextProps[lastDefaultValue]), (propKey = lastProps[lastDefaultValue]), nextProps.hasOwnProperty(lastDefaultValue) && - propKey$200 !== propKey && - (null != propKey$200 || null != propKey)) + propKey$201 !== propKey && + (null != propKey$201 || null != propKey)) ) switch (lastDefaultValue) { case "selected": domElement.selected = - propKey$200 && - "function" !== typeof propKey$200 && - "symbol" !== typeof propKey$200; + propKey$201 && + "function" !== typeof propKey$201 && + "symbol" !== typeof propKey$201; break; default: setProp( domElement, tag, lastDefaultValue, - propKey$200, + propKey$201, nextProps, propKey ); @@ -13200,24 +13217,24 @@ function updateProperties(domElement, tag, lastProps, nextProps) { case "track": case "wbr": case "menuitem": - for (var propKey$221 in lastProps) - (propKey$200 = lastProps[propKey$221]), - lastProps.hasOwnProperty(propKey$221) && - null != propKey$200 && - !nextProps.hasOwnProperty(propKey$221) && - setProp(domElement, tag, propKey$221, null, nextProps, propKey$200); + for (var propKey$222 in lastProps) + (propKey$201 = lastProps[propKey$222]), + lastProps.hasOwnProperty(propKey$222) && + null != propKey$201 && + !nextProps.hasOwnProperty(propKey$222) && + setProp(domElement, tag, propKey$222, null, nextProps, propKey$201); for (checked in nextProps) if ( - ((propKey$200 = nextProps[checked]), + ((propKey$201 = nextProps[checked]), (propKey = lastProps[checked]), nextProps.hasOwnProperty(checked) && - propKey$200 !== propKey && - (null != propKey$200 || null != propKey)) + propKey$201 !== propKey && + (null != propKey$201 || null != propKey)) ) switch (checked) { case "children": case "dangerouslySetInnerHTML": - if (null != propKey$200) + if (null != propKey$201) throw Error(formatProdErrorMessage(137, tag)); break; default: @@ -13225,7 +13242,7 @@ function updateProperties(domElement, tag, lastProps, nextProps) { domElement, tag, checked, - propKey$200, + propKey$201, nextProps, propKey ); @@ -13233,49 +13250,49 @@ function updateProperties(domElement, tag, lastProps, nextProps) { return; default: if (isCustomElement(tag)) { - for (var propKey$226 in lastProps) - (propKey$200 = lastProps[propKey$226]), - lastProps.hasOwnProperty(propKey$226) && - void 0 !== propKey$200 && - !nextProps.hasOwnProperty(propKey$226) && + for (var propKey$227 in lastProps) + (propKey$201 = lastProps[propKey$227]), + lastProps.hasOwnProperty(propKey$227) && + void 0 !== propKey$201 && + !nextProps.hasOwnProperty(propKey$227) && setPropOnCustomElement( domElement, tag, - propKey$226, + propKey$227, void 0, nextProps, - propKey$200 + propKey$201 ); for (defaultChecked in nextProps) - (propKey$200 = nextProps[defaultChecked]), + (propKey$201 = nextProps[defaultChecked]), (propKey = lastProps[defaultChecked]), !nextProps.hasOwnProperty(defaultChecked) || - propKey$200 === propKey || - (void 0 === propKey$200 && void 0 === propKey) || + propKey$201 === propKey || + (void 0 === propKey$201 && void 0 === propKey) || setPropOnCustomElement( domElement, tag, defaultChecked, - propKey$200, + propKey$201, nextProps, propKey ); return; } } - for (var propKey$231 in lastProps) - (propKey$200 = lastProps[propKey$231]), - lastProps.hasOwnProperty(propKey$231) && - null != propKey$200 && - !nextProps.hasOwnProperty(propKey$231) && - setProp(domElement, tag, propKey$231, null, nextProps, propKey$200); + for (var propKey$232 in lastProps) + (propKey$201 = lastProps[propKey$232]), + lastProps.hasOwnProperty(propKey$232) && + null != propKey$201 && + !nextProps.hasOwnProperty(propKey$232) && + setProp(domElement, tag, propKey$232, null, nextProps, propKey$201); for (lastProp in nextProps) - (propKey$200 = nextProps[lastProp]), + (propKey$201 = nextProps[lastProp]), (propKey = lastProps[lastProp]), !nextProps.hasOwnProperty(lastProp) || - propKey$200 === propKey || - (null == propKey$200 && null == propKey) || - setProp(domElement, tag, lastProp, propKey$200, nextProps, propKey); + propKey$201 === propKey || + (null == propKey$201 && null == propKey) || + setProp(domElement, tag, lastProp, propKey$201, nextProps, propKey); } var eventsEnabled = null, selectionInformation = null; @@ -13820,26 +13837,26 @@ function getResource(type, currentProps, pendingProps, currentResource) { "string" === typeof pendingProps.precedence ) { type = getStyleKey(pendingProps.href); - var styles$239 = getResourcesFromRoot( + var styles$240 = getResourcesFromRoot( JSCompiler_inline_result ).hoistableStyles, - resource$240 = styles$239.get(type); - resource$240 || + resource$241 = styles$240.get(type); + resource$241 || ((JSCompiler_inline_result = JSCompiler_inline_result.ownerDocument || JSCompiler_inline_result), - (resource$240 = { + (resource$241 = { type: "stylesheet", instance: null, count: 0, state: { loading: 0, preload: null } }), - styles$239.set(type, resource$240), - (styles$239 = JSCompiler_inline_result.querySelector( + styles$240.set(type, resource$241), + (styles$240 = JSCompiler_inline_result.querySelector( getStylesheetSelectorFromKey(type) )) && - !styles$239._p && - ((resource$240.instance = styles$239), - (resource$240.state.loading = 5)), + !styles$240._p && + ((resource$241.instance = styles$240), + (resource$241.state.loading = 5)), preloadPropsMap.has(type) || ((pendingProps = { rel: "preload", @@ -13852,16 +13869,16 @@ function getResource(type, currentProps, pendingProps, currentResource) { referrerPolicy: pendingProps.referrerPolicy }), preloadPropsMap.set(type, pendingProps), - styles$239 || + styles$240 || preloadStylesheet( JSCompiler_inline_result, type, pendingProps, - resource$240.state + resource$241.state ))); if (currentProps && null === currentResource) throw Error(formatProdErrorMessage(528, "")); - return resource$240; + return resource$241; } if (currentProps && null !== currentResource) throw Error(formatProdErrorMessage(529, "")); @@ -13958,37 +13975,37 @@ function acquireResource(hoistableRoot, resource, props) { return (resource.instance = instance); case "stylesheet": styleProps = getStyleKey(props.href); - var instance$245 = hoistableRoot.querySelector( + var instance$246 = hoistableRoot.querySelector( getStylesheetSelectorFromKey(styleProps) ); - if (instance$245) + if (instance$246) return ( (resource.state.loading |= 4), - (resource.instance = instance$245), - markNodeAsHoistable(instance$245), - instance$245 + (resource.instance = instance$246), + markNodeAsHoistable(instance$246), + instance$246 ); instance = stylesheetPropsFromRawProps(props); (styleProps = preloadPropsMap.get(styleProps)) && adoptPreloadPropsForStylesheet(instance, styleProps); - instance$245 = ( + instance$246 = ( hoistableRoot.ownerDocument || hoistableRoot ).createElement("link"); - markNodeAsHoistable(instance$245); - var linkInstance = instance$245; + markNodeAsHoistable(instance$246); + var linkInstance = instance$246; linkInstance._p = new Promise(function (resolve, reject) { linkInstance.onload = resolve; linkInstance.onerror = reject; }); - setInitialProperties(instance$245, "link", instance); + setInitialProperties(instance$246, "link", instance); resource.state.loading |= 4; - insertStylesheet(instance$245, props.precedence, hoistableRoot); - return (resource.instance = instance$245); + insertStylesheet(instance$246, props.precedence, hoistableRoot); + return (resource.instance = instance$246); case "script": - instance$245 = getScriptKey(props.src); + instance$246 = getScriptKey(props.src); if ( (styleProps = hoistableRoot.querySelector( - getScriptSelectorFromKey(instance$245) + getScriptSelectorFromKey(instance$246) )) ) return ( @@ -13997,7 +14014,7 @@ function acquireResource(hoistableRoot, resource, props) { styleProps ); instance = props; - if ((styleProps = preloadPropsMap.get(instance$245))) + if ((styleProps = preloadPropsMap.get(instance$246))) (instance = assign({}, props)), adoptPreloadPropsForScript(instance, styleProps); hoistableRoot = hoistableRoot.ownerDocument || hoistableRoot; @@ -14258,7 +14275,7 @@ function insertStylesheetIntoRoot(root, resource) { ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -15021,16 +15038,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1654 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1655 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== - isomorphicReactPackageVersion$jscomp$inline_1654 + "19.0.0-rc-f2df5694-20240916" !== + isomorphicReactPackageVersion$jscomp$inline_1655 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1654, - "19.0.0-rc-206df66e-20240912" + isomorphicReactPackageVersion$jscomp$inline_1655, + "19.0.0-rc-f2df5694-20240916" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15050,25 +15067,25 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_2098 = { +var internals$jscomp$inline_2100 = { bundleType: 0, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-206df66e-20240912" + reconcilerVersion: "19.0.0-rc-f2df5694-20240916" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2099 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2101 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2099.isDisabled && - hook$jscomp$inline_2099.supportsFiber + !hook$jscomp$inline_2101.isDisabled && + hook$jscomp$inline_2101.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2099.inject( - internals$jscomp$inline_2098 + (rendererID = hook$jscomp$inline_2101.inject( + internals$jscomp$inline_2100 )), - (injectedHook = hook$jscomp$inline_2099); + (injectedHook = hook$jscomp$inline_2101); } catch (err) {} } exports.createRoot = function (container, options) { @@ -15160,4 +15177,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js index f89c43f04798f..729de58712042 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js @@ -352,16 +352,16 @@ } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -3538,23 +3538,44 @@ : !1 : !1; } - function getActiveElementDeep() { + function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmpm1551840534$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmpm1551840534$1 = + containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmpm1551840534$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmpm1551840534$1 = getActiveElement( + containerInfo.document + ); + $jscomp$optchain$tmpm1551840534$1 instanceof + containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmpm1551840534$1.contentWindow.location + .href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmpm1551840534$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmpm1551840534$1 = getActiveElement( + containerInfo.document + ); } - return element; + return $jscomp$optchain$tmpm1551840534$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -3570,103 +3591,98 @@ "true" === elem.contentEditable) ); } - function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; + function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { if ( null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) + hasSelectionCapabilities(containerInfo) ) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = - priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && - priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } function constructSelectEvent( @@ -3939,11 +3955,18 @@ profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } - function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { + function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } + } + function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -6485,8 +6508,8 @@ try { (currentTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, currentTransition); - } catch (error$3) { - onActionError(actionQueue, node, error$3); + } catch (error$4) { + onActionError(actionQueue, node, error$4); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -7437,9 +7460,9 @@ var onUncaughtError = root.onUncaughtError; onUncaughtError(error, { componentStack: errorInfo.stack }); } - } catch (e$4) { + } catch (e$5) { setTimeout(function () { - throw e$4; + throw e$5; }); } } @@ -7454,9 +7477,9 @@ componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$5) { + } catch (e$6) { setTimeout(function () { - throw e$5; + throw e$6; }); } } @@ -8644,32 +8667,32 @@ return current; } function updateSuspenseComponent(current, workInProgress, renderLanes) { - var JSCompiler_object_inline_digest_2298; - var JSCompiler_object_inline_stack_2299 = workInProgress.pendingProps; + var JSCompiler_object_inline_digest_2292; + var JSCompiler_object_inline_stack_2293 = workInProgress.pendingProps; shouldSuspendImpl(workInProgress) && (workInProgress.flags |= 128); - var JSCompiler_object_inline_componentStack_2300 = !1; + var JSCompiler_object_inline_componentStack_2294 = !1; var didSuspend = 0 !== (workInProgress.flags & 128); - (JSCompiler_object_inline_digest_2298 = didSuspend) || - (JSCompiler_object_inline_digest_2298 = + (JSCompiler_object_inline_digest_2292 = didSuspend) || + (JSCompiler_object_inline_digest_2292 = null !== current && null === current.memoizedState ? !1 : 0 !== (suspenseStackCursor.current & ForceSuspenseFallback)); - JSCompiler_object_inline_digest_2298 && - ((JSCompiler_object_inline_componentStack_2300 = !0), + JSCompiler_object_inline_digest_2292 && + ((JSCompiler_object_inline_componentStack_2294 = !0), (workInProgress.flags &= -129)); - JSCompiler_object_inline_digest_2298 = 0 !== (workInProgress.flags & 32); + JSCompiler_object_inline_digest_2292 = 0 !== (workInProgress.flags & 32); workInProgress.flags &= -33; if (null === current) { if (isHydrating) { - JSCompiler_object_inline_componentStack_2300 + JSCompiler_object_inline_componentStack_2294 ? pushPrimaryTreeSuspenseHandler(workInProgress) : reuseSuspenseHandlerOnStack(workInProgress); if (isHydrating) { - var JSCompiler_object_inline_message_2297 = nextHydratableInstance; + var JSCompiler_object_inline_message_2291 = nextHydratableInstance; var JSCompiler_temp; - if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2297)) { + if (!(JSCompiler_temp = !JSCompiler_object_inline_message_2291)) { c: { - var instance = JSCompiler_object_inline_message_2297; + var instance = JSCompiler_object_inline_message_2291; for ( JSCompiler_temp = rootOrSingletonContext; 8 !== instance.nodeType; @@ -8710,19 +8733,19 @@ JSCompiler_temp && (warnNonHydratedInstance( workInProgress, - JSCompiler_object_inline_message_2297 + JSCompiler_object_inline_message_2291 ), throwOnHydrationMismatch(workInProgress)); } - JSCompiler_object_inline_message_2297 = workInProgress.memoizedState; + JSCompiler_object_inline_message_2291 = workInProgress.memoizedState; if ( - null !== JSCompiler_object_inline_message_2297 && - ((JSCompiler_object_inline_message_2297 = - JSCompiler_object_inline_message_2297.dehydrated), - null !== JSCompiler_object_inline_message_2297) + null !== JSCompiler_object_inline_message_2291 && + ((JSCompiler_object_inline_message_2291 = + JSCompiler_object_inline_message_2291.dehydrated), + null !== JSCompiler_object_inline_message_2291) ) return ( - JSCompiler_object_inline_message_2297.data === + JSCompiler_object_inline_message_2291.data === SUSPENSE_FALLBACK_START_DATA ? (workInProgress.lanes = 16) : (workInProgress.lanes = 536870912), @@ -8730,58 +8753,58 @@ ); popSuspenseHandler(workInProgress); } - JSCompiler_object_inline_message_2297 = - JSCompiler_object_inline_stack_2299.children; - JSCompiler_object_inline_stack_2299 = - JSCompiler_object_inline_stack_2299.fallback; - if (JSCompiler_object_inline_componentStack_2300) + JSCompiler_object_inline_message_2291 = + JSCompiler_object_inline_stack_2293.children; + JSCompiler_object_inline_stack_2293 = + JSCompiler_object_inline_stack_2293.fallback; + if (JSCompiler_object_inline_componentStack_2294) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2300 = + (JSCompiler_object_inline_componentStack_2294 = workInProgress.mode), - (JSCompiler_object_inline_message_2297 = + (JSCompiler_object_inline_message_2291 = mountWorkInProgressOffscreenFiber( { mode: "hidden", - children: JSCompiler_object_inline_message_2297 + children: JSCompiler_object_inline_message_2291 }, - JSCompiler_object_inline_componentStack_2300 + JSCompiler_object_inline_componentStack_2294 )), - (JSCompiler_object_inline_stack_2299 = createFiberFromFragment( - JSCompiler_object_inline_stack_2299, - JSCompiler_object_inline_componentStack_2300, + (JSCompiler_object_inline_stack_2293 = createFiberFromFragment( + JSCompiler_object_inline_stack_2293, + JSCompiler_object_inline_componentStack_2294, renderLanes, null )), - (JSCompiler_object_inline_message_2297.return = workInProgress), - (JSCompiler_object_inline_stack_2299.return = workInProgress), - (JSCompiler_object_inline_message_2297.sibling = - JSCompiler_object_inline_stack_2299), - (workInProgress.child = JSCompiler_object_inline_message_2297), - (JSCompiler_object_inline_componentStack_2300 = + (JSCompiler_object_inline_message_2291.return = workInProgress), + (JSCompiler_object_inline_stack_2293.return = workInProgress), + (JSCompiler_object_inline_message_2291.sibling = + JSCompiler_object_inline_stack_2293), + (workInProgress.child = JSCompiler_object_inline_message_2291), + (JSCompiler_object_inline_componentStack_2294 = workInProgress.child), - (JSCompiler_object_inline_componentStack_2300.memoizedState = + (JSCompiler_object_inline_componentStack_2294.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_componentStack_2300.childLanes = + (JSCompiler_object_inline_componentStack_2294.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2298, + JSCompiler_object_inline_digest_2292, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2299 + JSCompiler_object_inline_stack_2293 ); pushPrimaryTreeSuspenseHandler(workInProgress); return mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_message_2297 + JSCompiler_object_inline_message_2291 ); } var prevState = current.memoizedState; if ( null !== prevState && - ((JSCompiler_object_inline_message_2297 = prevState.dehydrated), - null !== JSCompiler_object_inline_message_2297) + ((JSCompiler_object_inline_message_2291 = prevState.dehydrated), + null !== JSCompiler_object_inline_message_2291) ) { if (didSuspend) workInProgress.flags & 256 @@ -8798,94 +8821,94 @@ (workInProgress.flags |= 128), (workInProgress = null)) : (reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2300 = - JSCompiler_object_inline_stack_2299.fallback), - (JSCompiler_object_inline_message_2297 = workInProgress.mode), - (JSCompiler_object_inline_stack_2299 = + (JSCompiler_object_inline_componentStack_2294 = + JSCompiler_object_inline_stack_2293.fallback), + (JSCompiler_object_inline_message_2291 = workInProgress.mode), + (JSCompiler_object_inline_stack_2293 = mountWorkInProgressOffscreenFiber( { mode: "visible", - children: JSCompiler_object_inline_stack_2299.children + children: JSCompiler_object_inline_stack_2293.children }, - JSCompiler_object_inline_message_2297 + JSCompiler_object_inline_message_2291 )), - (JSCompiler_object_inline_componentStack_2300 = + (JSCompiler_object_inline_componentStack_2294 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2300, - JSCompiler_object_inline_message_2297, + JSCompiler_object_inline_componentStack_2294, + JSCompiler_object_inline_message_2291, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2300.flags |= 2), - (JSCompiler_object_inline_stack_2299.return = workInProgress), - (JSCompiler_object_inline_componentStack_2300.return = + (JSCompiler_object_inline_componentStack_2294.flags |= 2), + (JSCompiler_object_inline_stack_2293.return = workInProgress), + (JSCompiler_object_inline_componentStack_2294.return = workInProgress), - (JSCompiler_object_inline_stack_2299.sibling = - JSCompiler_object_inline_componentStack_2300), - (workInProgress.child = JSCompiler_object_inline_stack_2299), + (JSCompiler_object_inline_stack_2293.sibling = + JSCompiler_object_inline_componentStack_2294), + (workInProgress.child = JSCompiler_object_inline_stack_2293), reconcileChildFibers( workInProgress, current.child, null, renderLanes ), - (JSCompiler_object_inline_stack_2299 = workInProgress.child), - (JSCompiler_object_inline_stack_2299.memoizedState = + (JSCompiler_object_inline_stack_2293 = workInProgress.child), + (JSCompiler_object_inline_stack_2293.memoizedState = mountSuspenseOffscreenState(renderLanes)), - (JSCompiler_object_inline_stack_2299.childLanes = + (JSCompiler_object_inline_stack_2293.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2298, + JSCompiler_object_inline_digest_2292, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), (workInProgress = - JSCompiler_object_inline_componentStack_2300)); + JSCompiler_object_inline_componentStack_2294)); else if ( (pushPrimaryTreeSuspenseHandler(workInProgress), isHydrating && console.error( "We should not be hydrating here. This is a bug in React. Please file a bug." ), - JSCompiler_object_inline_message_2297.data === + JSCompiler_object_inline_message_2291.data === SUSPENSE_FALLBACK_START_DATA) ) { - JSCompiler_object_inline_digest_2298 = - JSCompiler_object_inline_message_2297.nextSibling && - JSCompiler_object_inline_message_2297.nextSibling.dataset; - if (JSCompiler_object_inline_digest_2298) { - JSCompiler_temp = JSCompiler_object_inline_digest_2298.dgst; - var message = JSCompiler_object_inline_digest_2298.msg; - instance = JSCompiler_object_inline_digest_2298.stck; - var componentStack = JSCompiler_object_inline_digest_2298.cstck; + JSCompiler_object_inline_digest_2292 = + JSCompiler_object_inline_message_2291.nextSibling && + JSCompiler_object_inline_message_2291.nextSibling.dataset; + if (JSCompiler_object_inline_digest_2292) { + JSCompiler_temp = JSCompiler_object_inline_digest_2292.dgst; + var message = JSCompiler_object_inline_digest_2292.msg; + instance = JSCompiler_object_inline_digest_2292.stck; + var componentStack = JSCompiler_object_inline_digest_2292.cstck; } - JSCompiler_object_inline_message_2297 = message; - JSCompiler_object_inline_digest_2298 = JSCompiler_temp; - JSCompiler_object_inline_stack_2299 = instance; - JSCompiler_object_inline_componentStack_2300 = componentStack; - JSCompiler_object_inline_message_2297 = - JSCompiler_object_inline_message_2297 - ? Error(JSCompiler_object_inline_message_2297) + JSCompiler_object_inline_message_2291 = message; + JSCompiler_object_inline_digest_2292 = JSCompiler_temp; + JSCompiler_object_inline_stack_2293 = instance; + JSCompiler_object_inline_componentStack_2294 = componentStack; + JSCompiler_object_inline_message_2291 = + JSCompiler_object_inline_message_2291 + ? Error(JSCompiler_object_inline_message_2291) : Error( "The server could not finish this Suspense boundary, likely due to an error during server rendering. Switched to client rendering." ); - JSCompiler_object_inline_message_2297.stack = - JSCompiler_object_inline_stack_2299 || ""; - JSCompiler_object_inline_message_2297.digest = - JSCompiler_object_inline_digest_2298; - JSCompiler_object_inline_digest_2298 = - void 0 === JSCompiler_object_inline_componentStack_2300 + JSCompiler_object_inline_message_2291.stack = + JSCompiler_object_inline_stack_2293 || ""; + JSCompiler_object_inline_message_2291.digest = + JSCompiler_object_inline_digest_2292; + JSCompiler_object_inline_digest_2292 = + void 0 === JSCompiler_object_inline_componentStack_2294 ? null - : JSCompiler_object_inline_componentStack_2300; - "string" === typeof JSCompiler_object_inline_digest_2298 && + : JSCompiler_object_inline_componentStack_2294; + "string" === typeof JSCompiler_object_inline_digest_2292 && CapturedStacks.set( - JSCompiler_object_inline_message_2297, - JSCompiler_object_inline_digest_2298 + JSCompiler_object_inline_message_2291, + JSCompiler_object_inline_digest_2292 ); queueHydrationError({ - value: JSCompiler_object_inline_message_2297, + value: JSCompiler_object_inline_message_2291, source: null, - stack: JSCompiler_object_inline_digest_2298 + stack: JSCompiler_object_inline_digest_2292 }); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8900,25 +8923,25 @@ renderLanes, !1 ), - (JSCompiler_object_inline_digest_2298 = + (JSCompiler_object_inline_digest_2292 = 0 !== (renderLanes & current.childLanes)), - didReceiveUpdate || JSCompiler_object_inline_digest_2298) + didReceiveUpdate || JSCompiler_object_inline_digest_2292) ) { - JSCompiler_object_inline_digest_2298 = workInProgressRoot; - if (null !== JSCompiler_object_inline_digest_2298) { - JSCompiler_object_inline_stack_2299 = renderLanes & -renderLanes; - if (0 !== (JSCompiler_object_inline_stack_2299 & 42)) - JSCompiler_object_inline_stack_2299 = 1; + JSCompiler_object_inline_digest_2292 = workInProgressRoot; + if (null !== JSCompiler_object_inline_digest_2292) { + JSCompiler_object_inline_stack_2293 = renderLanes & -renderLanes; + if (0 !== (JSCompiler_object_inline_stack_2293 & 42)) + JSCompiler_object_inline_stack_2293 = 1; else - switch (JSCompiler_object_inline_stack_2299) { + switch (JSCompiler_object_inline_stack_2293) { case 2: - JSCompiler_object_inline_stack_2299 = 1; + JSCompiler_object_inline_stack_2293 = 1; break; case 8: - JSCompiler_object_inline_stack_2299 = 4; + JSCompiler_object_inline_stack_2293 = 4; break; case 32: - JSCompiler_object_inline_stack_2299 = 16; + JSCompiler_object_inline_stack_2293 = 16; break; case 128: case 256: @@ -8939,40 +8962,40 @@ case 8388608: case 16777216: case 33554432: - JSCompiler_object_inline_stack_2299 = 64; + JSCompiler_object_inline_stack_2293 = 64; break; case 268435456: - JSCompiler_object_inline_stack_2299 = 134217728; + JSCompiler_object_inline_stack_2293 = 134217728; break; default: - JSCompiler_object_inline_stack_2299 = 0; + JSCompiler_object_inline_stack_2293 = 0; } - JSCompiler_object_inline_stack_2299 = + JSCompiler_object_inline_stack_2293 = 0 !== - (JSCompiler_object_inline_stack_2299 & - (JSCompiler_object_inline_digest_2298.suspendedLanes | + (JSCompiler_object_inline_stack_2293 & + (JSCompiler_object_inline_digest_2292.suspendedLanes | renderLanes)) ? 0 - : JSCompiler_object_inline_stack_2299; + : JSCompiler_object_inline_stack_2293; if ( - 0 !== JSCompiler_object_inline_stack_2299 && - JSCompiler_object_inline_stack_2299 !== prevState.retryLane + 0 !== JSCompiler_object_inline_stack_2293 && + JSCompiler_object_inline_stack_2293 !== prevState.retryLane ) throw ( - ((prevState.retryLane = JSCompiler_object_inline_stack_2299), + ((prevState.retryLane = JSCompiler_object_inline_stack_2293), enqueueConcurrentRenderForLane( current, - JSCompiler_object_inline_stack_2299 + JSCompiler_object_inline_stack_2293 ), scheduleUpdateOnFiber( - JSCompiler_object_inline_digest_2298, + JSCompiler_object_inline_digest_2292, current, - JSCompiler_object_inline_stack_2299 + JSCompiler_object_inline_stack_2293 ), SelectiveHydrationException) ); } - JSCompiler_object_inline_message_2297.data === + JSCompiler_object_inline_message_2291.data === SUSPENSE_PENDING_START_DATA || renderDidSuspendDelayIfPossible(); workInProgress = retrySuspenseComponentWithoutHydrating( current, @@ -8980,7 +9003,7 @@ renderLanes ); } else - JSCompiler_object_inline_message_2297.data === + JSCompiler_object_inline_message_2291.data === SUSPENSE_PENDING_START_DATA ? ((workInProgress.flags |= 128), (workInProgress.child = current.child), @@ -8988,12 +9011,12 @@ null, current )), - (JSCompiler_object_inline_message_2297._reactRetry = + (JSCompiler_object_inline_message_2291._reactRetry = workInProgress), (workInProgress = null)) : ((current = prevState.treeContext), (nextHydratableInstance = getNextHydratable( - JSCompiler_object_inline_message_2297.nextSibling + JSCompiler_object_inline_message_2291.nextSibling )), (hydrationParentFiber = workInProgress), (isHydrating = !0), @@ -9011,57 +9034,57 @@ (treeContextProvider = workInProgress)), (workInProgress = mountSuspensePrimaryChildren( workInProgress, - JSCompiler_object_inline_stack_2299.children + JSCompiler_object_inline_stack_2293.children )), (workInProgress.flags |= 4096)); return workInProgress; } - if (JSCompiler_object_inline_componentStack_2300) + if (JSCompiler_object_inline_componentStack_2294) return ( reuseSuspenseHandlerOnStack(workInProgress), - (JSCompiler_object_inline_componentStack_2300 = - JSCompiler_object_inline_stack_2299.fallback), - (JSCompiler_object_inline_message_2297 = workInProgress.mode), + (JSCompiler_object_inline_componentStack_2294 = + JSCompiler_object_inline_stack_2293.fallback), + (JSCompiler_object_inline_message_2291 = workInProgress.mode), (JSCompiler_temp = current.child), (instance = JSCompiler_temp.sibling), - (JSCompiler_object_inline_stack_2299 = createWorkInProgress( + (JSCompiler_object_inline_stack_2293 = createWorkInProgress( JSCompiler_temp, { mode: "hidden", - children: JSCompiler_object_inline_stack_2299.children + children: JSCompiler_object_inline_stack_2293.children } )), - (JSCompiler_object_inline_stack_2299.subtreeFlags = + (JSCompiler_object_inline_stack_2293.subtreeFlags = JSCompiler_temp.subtreeFlags & 31457280), null !== instance - ? (JSCompiler_object_inline_componentStack_2300 = + ? (JSCompiler_object_inline_componentStack_2294 = createWorkInProgress( instance, - JSCompiler_object_inline_componentStack_2300 + JSCompiler_object_inline_componentStack_2294 )) - : ((JSCompiler_object_inline_componentStack_2300 = + : ((JSCompiler_object_inline_componentStack_2294 = createFiberFromFragment( - JSCompiler_object_inline_componentStack_2300, - JSCompiler_object_inline_message_2297, + JSCompiler_object_inline_componentStack_2294, + JSCompiler_object_inline_message_2291, renderLanes, null )), - (JSCompiler_object_inline_componentStack_2300.flags |= 2)), - (JSCompiler_object_inline_componentStack_2300.return = + (JSCompiler_object_inline_componentStack_2294.flags |= 2)), + (JSCompiler_object_inline_componentStack_2294.return = workInProgress), - (JSCompiler_object_inline_stack_2299.return = workInProgress), - (JSCompiler_object_inline_stack_2299.sibling = - JSCompiler_object_inline_componentStack_2300), - (workInProgress.child = JSCompiler_object_inline_stack_2299), - (JSCompiler_object_inline_stack_2299 = - JSCompiler_object_inline_componentStack_2300), - (JSCompiler_object_inline_componentStack_2300 = workInProgress.child), - (JSCompiler_object_inline_message_2297 = current.child.memoizedState), - null === JSCompiler_object_inline_message_2297 - ? (JSCompiler_object_inline_message_2297 = + (JSCompiler_object_inline_stack_2293.return = workInProgress), + (JSCompiler_object_inline_stack_2293.sibling = + JSCompiler_object_inline_componentStack_2294), + (workInProgress.child = JSCompiler_object_inline_stack_2293), + (JSCompiler_object_inline_stack_2293 = + JSCompiler_object_inline_componentStack_2294), + (JSCompiler_object_inline_componentStack_2294 = workInProgress.child), + (JSCompiler_object_inline_message_2291 = current.child.memoizedState), + null === JSCompiler_object_inline_message_2291 + ? (JSCompiler_object_inline_message_2291 = mountSuspenseOffscreenState(renderLanes)) : ((JSCompiler_temp = - JSCompiler_object_inline_message_2297.cachePool), + JSCompiler_object_inline_message_2291.cachePool), null !== JSCompiler_temp ? ((instance = CacheContext._currentValue), (JSCompiler_temp = @@ -9069,37 +9092,37 @@ ? { parent: instance, pool: instance } : JSCompiler_temp)) : (JSCompiler_temp = getSuspendedCache()), - (JSCompiler_object_inline_message_2297 = { + (JSCompiler_object_inline_message_2291 = { baseLanes: - JSCompiler_object_inline_message_2297.baseLanes | renderLanes, + JSCompiler_object_inline_message_2291.baseLanes | renderLanes, cachePool: JSCompiler_temp })), - (JSCompiler_object_inline_componentStack_2300.memoizedState = - JSCompiler_object_inline_message_2297), - (JSCompiler_object_inline_componentStack_2300.childLanes = + (JSCompiler_object_inline_componentStack_2294.memoizedState = + JSCompiler_object_inline_message_2291), + (JSCompiler_object_inline_componentStack_2294.childLanes = getRemainingWorkInPrimaryTree( current, - JSCompiler_object_inline_digest_2298, + JSCompiler_object_inline_digest_2292, renderLanes )), (workInProgress.memoizedState = SUSPENDED_MARKER), - JSCompiler_object_inline_stack_2299 + JSCompiler_object_inline_stack_2293 ); pushPrimaryTreeSuspenseHandler(workInProgress); renderLanes = current.child; current = renderLanes.sibling; renderLanes = createWorkInProgress(renderLanes, { mode: "visible", - children: JSCompiler_object_inline_stack_2299.children + children: JSCompiler_object_inline_stack_2293.children }); renderLanes.return = workInProgress; renderLanes.sibling = null; null !== current && - ((JSCompiler_object_inline_digest_2298 = workInProgress.deletions), - null === JSCompiler_object_inline_digest_2298 + ((JSCompiler_object_inline_digest_2292 = workInProgress.deletions), + null === JSCompiler_object_inline_digest_2292 ? ((workInProgress.deletions = [current]), (workInProgress.flags |= 16)) - : JSCompiler_object_inline_digest_2298.push(current)); + : JSCompiler_object_inline_digest_2292.push(current)); workInProgress.child = renderLanes; workInProgress.memoizedState = null; return renderLanes; @@ -9425,6 +9448,7 @@ case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -10009,6 +10033,7 @@ case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (returnFiber = workInProgress.stateNode), (returnFiber.effectDuration = 0), (returnFiber.passiveEffectDuration = 0), @@ -11013,20 +11038,21 @@ recordLayoutEffectDuration(current); } else runWithFiberInDEV(current, ref, null); - } catch (error$6) { - captureCommitPhaseError(current, nearestMountedAncestor, error$6); + } catch (error$7) { + captureCommitPhaseError(current, nearestMountedAncestor, error$7); } else ref.current = null; } function commitProfiler(finishedWork, current, commitTime, effectDuration) { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit; _finishedWork$memoize = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof _finishedWork$memoize && _finishedWork$memoize( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -11061,6 +11087,25 @@ captureCommitPhaseError(finishedWork, finishedWork.return, error); } } + function commitProfilerPostCommitImpl( + finishedWork, + current, + commitTime, + passiveEffectDuration + ) { + var _finishedWork$memoize2 = finishedWork.memoizedProps; + finishedWork = _finishedWork$memoize2.id; + _finishedWork$memoize2 = _finishedWork$memoize2.onPostCommit; + current = null === current ? "mount" : "update"; + currentUpdateIsNested && (current = "nested-update"); + "function" === typeof _finishedWork$memoize2 && + _finishedWork$memoize2( + finishedWork, + current, + passiveEffectDuration, + commitTime + ); + } function commitHostMount(finishedWork) { var type = finishedWork.type, props = finishedWork.memoizedProps, @@ -11216,8 +11261,9 @@ ); } function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -11239,7 +11285,7 @@ selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$2) { + } catch (e$3) { JSCompiler_temp = null; break a; } @@ -11485,7 +11531,6 @@ a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -11705,39 +11750,39 @@ ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - var tag = prevHostParentIsContainer.tag, - inst = prevHostParentIsContainer.inst, - destroy = inst.destroy; - void 0 !== destroy && - ((tag & Insertion) !== NoFlags - ? ((inst.destroy = void 0), + var _tag = prevHostParentIsContainer.tag, + _inst = prevHostParentIsContainer.inst, + _destroy = _inst.destroy; + void 0 !== _destroy && + ((_tag & Insertion) !== NoFlags + ? ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )) - : (tag & Layout) !== NoFlags && + : (_tag & Layout) !== NoFlags && (markComponentLayoutEffectUnmountStarted(deletedFiber), shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), - (inst.destroy = void 0), + (_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy ), recordLayoutEffectDuration(deletedFiber)) - : ((inst.destroy = void 0), + : ((_inst.destroy = void 0), runWithFiberInDEV( deletedFiber, callDestroyInDEV, deletedFiber, nearestMountedAncestor, - destroy + _destroy )), markComponentLayoutEffectUnmountStopped())); prevHostParentIsContainer = prevHostParentIsContainer.next; @@ -12533,7 +12578,6 @@ commitTime, includeWorkInProgressEffects ), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -12668,6 +12712,41 @@ (retainCache(finishedWork), null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + if (flags & 2048 && executionContext & CommitContext) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + runWithFiberInDEV( + finishedWork, + commitProfilerPostCommitImpl, + finishedWork, + finishedWork.alternate, + commitTime, + finishedRoot + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: @@ -13075,9 +13154,9 @@ this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; this._debugOwner = this._debugInfo = null; this._debugNeedsRemount = !1; this._debugHookTypes = null; @@ -13110,8 +13189,8 @@ (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -14727,7 +14806,7 @@ else switch ( (erroredWork.mode & ProfileMode && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), + stopProfilerTimerIfRunningAndRecordDuration(erroredWork), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -14845,8 +14924,8 @@ } workLoopSync(); break; - } catch (thrownValue$8) { - handleThrow(root, thrownValue$8); + } catch (thrownValue$9) { + handleThrow(root, thrownValue$9); } while (1); lanes && root.shellSuspendCounter++; @@ -15006,8 +15085,8 @@ ? workLoopSync() : workLoopConcurrent(); break; - } catch (thrownValue$9) { - handleThrow(root, thrownValue$9); + } catch (thrownValue$10) { + handleThrow(root, thrownValue$10); } while (1); resetContextDependencies(); @@ -15042,7 +15121,7 @@ unitOfWork, entangledRenderLanes )), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = runWithFiberInDEV( unitOfWork, beginWork, @@ -15095,7 +15174,7 @@ (current = beginWork(current, unitOfWork, entangledRenderLanes)); } isProfilingMode && - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0); + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork); return current; } function throwAndUnwindWorkLoop(root, unitOfWork, thrownValue) { @@ -15148,23 +15227,16 @@ } var current = completedWork.alternate; unitOfWork = completedWork.return; - (completedWork.mode & ProfileMode) === NoMode - ? (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )) - : (startProfilerTimer(completedWork), - (current = runWithFiberInDEV( - completedWork, - completeWork, - current, - completedWork, - entangledRenderLanes - )), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = runWithFiberInDEV( + completedWork, + completeWork, + current, + completedWork, + entangledRenderLanes + ); + (completedWork.mode & ProfileMode) !== NoMode && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -15188,7 +15260,7 @@ return; } if ((unitOfWork.mode & ProfileMode) !== NoMode) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -15311,7 +15383,7 @@ commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -15406,10 +15478,10 @@ if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + priority = pendingPassiveTransitions; pendingPassiveTransitions = null; - priority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root$jscomp$0 = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if ( @@ -15427,67 +15499,25 @@ injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= CommitContext; - commitPassiveUnmountOnFiber(priority.current); + commitPassiveUnmountOnFiber(root$jscomp$0.current); commitPassiveMountOnFiber( - priority, - priority.current, + root$jscomp$0, + root$jscomp$0.current, lanes, - transitions + priority ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if ( - executionContext & CommitContext && - 0 !== (finishedWork.flags & 4) - ) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$jscomp$0 = commitTime, - phase = - null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$jscomp$0 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markPassiveEffectsStopped && injectedProfilingHooks.markPassiveEffectsStopped(); - commitDoubleInvokeEffectsInDEV(priority); + commitDoubleInvokeEffectsInDEV(root$jscomp$0); executionContext = prevExecutionContext; flushSyncWorkAcrossRoots_impl(0, !1); didScheduleUpdateDuringPassiveEffects - ? priority === rootWithPassiveNestedUpdates + ? root$jscomp$0 === rootWithPassiveNestedUpdates ? nestedPassiveUpdateCount++ : ((nestedPassiveUpdateCount = 0), - (rootWithPassiveNestedUpdates = priority)) + (rootWithPassiveNestedUpdates = root$jscomp$0)) : (nestedPassiveUpdateCount = 0); didScheduleUpdateDuringPassiveEffects = isFlushingPassiveEffects = !1; @@ -15496,7 +15526,7 @@ "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, priority); + injectedHook.onPostCommitFiberRoot(rendererID, root$jscomp$0); } catch (err) { hasLoggedError || ((hasLoggedError = !0), @@ -15505,7 +15535,7 @@ err )); } - var stateNode = priority.current.stateNode; + var stateNode = root$jscomp$0.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -15519,15 +15549,6 @@ } return !1; } - function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); - } function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -20069,7 +20090,7 @@ ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -23948,7 +23969,7 @@ var nonExtensibleObject = Object.preventExtensions({}); new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); - } catch (e$7) { + } catch (e$8) { hasBadMapPolyfill = !0; } var DefaultAsyncDispatcher = { @@ -24021,7 +24042,6 @@ rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, NESTED_UPDATE_LIMIT = 50, @@ -24577,11 +24597,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-f2df5694-20240916" !== 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.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24618,11 +24638,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-206df66e-20240912" + reconcilerVersion: "19.0.0-rc-f2df5694-20240916" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25096,7 +25116,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js index 4f17c23e9c56a..2c3c952c7f939 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js @@ -168,16 +168,16 @@ function describeNativeComponentFrame(fn, construct) { } else { try { Fake.call(); - } catch (x$0) { - control = x$0; + } catch (x$1) { + control = x$1; } fn.call(Fake.prototype); } } else { try { throw Error(); - } catch (x$1) { - control = x$1; + } catch (x$2) { + control = x$2; } (Fake = fn()) && "function" === typeof Fake.catch && @@ -366,36 +366,36 @@ function findCurrentFiberUsingSlowPath(fiber) { } if (a.return !== b.return) (a = parentA), (b = parentB); else { - for (var didFindChild = !1, child$2 = parentA.child; child$2; ) { - if (child$2 === a) { + for (var didFindChild = !1, child$3 = parentA.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentA; b = parentB; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentA; a = parentB; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) { - for (child$2 = parentB.child; child$2; ) { - if (child$2 === a) { + for (child$3 = parentB.child; child$3; ) { + if (child$3 === a) { didFindChild = !0; a = parentB; b = parentA; break; } - if (child$2 === b) { + if (child$3 === b) { didFindChild = !0; b = parentB; a = parentA; break; } - child$2 = child$2.sibling; + child$3 = child$3.sibling; } if (!didFindChild) throw Error(formatProdErrorMessage(189)); } @@ -800,18 +800,18 @@ function markRootFinished( 0 < remainingLanes; ) { - var index$7 = 31 - clz32(remainingLanes), - lane = 1 << index$7; - entanglements[index$7] = 0; - expirationTimes[index$7] = -1; - var hiddenUpdatesForLane = hiddenUpdates[index$7]; + var index$8 = 31 - clz32(remainingLanes), + lane = 1 << index$8; + entanglements[index$8] = 0; + expirationTimes[index$8] = -1; + var hiddenUpdatesForLane = hiddenUpdates[index$8]; if (null !== hiddenUpdatesForLane) for ( - hiddenUpdates[index$7] = null, index$7 = 0; - index$7 < hiddenUpdatesForLane.length; - index$7++ + hiddenUpdates[index$8] = null, index$8 = 0; + index$8 < hiddenUpdatesForLane.length; + index$8++ ) { - var update = hiddenUpdatesForLane[index$7]; + var update = hiddenUpdatesForLane[index$8]; null !== update && (update.lane &= -536870913); } remainingLanes &= ~lane; @@ -836,19 +836,19 @@ function markSpawnedDeferredLane(root, spawnedLane, entangledLanes) { function markRootEntangled(root, entangledLanes) { var rootEntangledLanes = (root.entangledLanes |= entangledLanes); for (root = root.entanglements; rootEntangledLanes; ) { - var index$8 = 31 - clz32(rootEntangledLanes), - lane = 1 << index$8; - (lane & entangledLanes) | (root[index$8] & entangledLanes) && - (root[index$8] |= entangledLanes); + var index$9 = 31 - clz32(rootEntangledLanes), + lane = 1 << index$9; + (lane & entangledLanes) | (root[index$9] & entangledLanes) && + (root[index$9] |= entangledLanes); rootEntangledLanes &= ~lane; } } function addFiberToLanesMap(root, fiber, lanes) { if (isDevToolsPresent) for (root = root.pendingUpdatersLaneMap; 0 < lanes; ) { - var index$10 = 31 - clz32(lanes), - lane = 1 << index$10; - root[index$10].add(fiber); + var index$11 = 31 - clz32(lanes), + lane = 1 << index$11; + root[index$11].add(fiber); lanes &= ~lane; } } @@ -860,16 +860,16 @@ function movePendingFibersToMemoized(root, lanes) { 0 < lanes; ) { - var index$11 = 31 - clz32(lanes); - root = 1 << index$11; - index$11 = pendingUpdatersLaneMap[index$11]; - 0 < index$11.size && - (index$11.forEach(function (fiber) { + var index$12 = 31 - clz32(lanes); + root = 1 << index$12; + index$12 = pendingUpdatersLaneMap[index$12]; + 0 < index$12.size && + (index$12.forEach(function (fiber) { var alternate = fiber.alternate; (null !== alternate && memoizedUpdaters.has(alternate)) || memoizedUpdaters.add(fiber); }), - index$11.clear()); + index$12.clear()); lanes &= ~root; } } @@ -1019,8 +1019,8 @@ function setValueForAttribute(node, name, value) { node.removeAttribute(name); return; case "boolean": - var prefix$12 = name.toLowerCase().slice(0, 5); - if ("data-" !== prefix$12 && "aria-" !== prefix$12) { + var prefix$13 = name.toLowerCase().slice(0, 5); + if ("data-" !== prefix$13 && "aria-" !== prefix$13) { node.removeAttribute(name); return; } @@ -1353,15 +1353,15 @@ function setValueForStyles(node, styles, prevStyles) { : "float" === styleName ? (node.cssFloat = "") : (node[styleName] = "")); - for (var styleName$18 in styles) - (styleName = styles[styleName$18]), - styles.hasOwnProperty(styleName$18) && - prevStyles[styleName$18] !== styleName && - setValueForStyle(node, styleName$18, styleName); - } else for (var styleName$19 in styles) - styles.hasOwnProperty(styleName$19) && - setValueForStyle(node, styleName$19, styles[styleName$19]); + (styleName = styles[styleName$19]), + styles.hasOwnProperty(styleName$19) && + prevStyles[styleName$19] !== styleName && + setValueForStyle(node, styleName$19, styleName); + } else + for (var styleName$20 in styles) + styles.hasOwnProperty(styleName$20) && + setValueForStyle(node, styleName$20, styles[styleName$20]); } function isCustomElement(tagName) { if (-1 === tagName.indexOf("-")) return !1; @@ -2216,23 +2216,37 @@ function containsNode(outerNode, innerNode) { : !1 : !1; } -function getActiveElementDeep() { +function getActiveElementDeep(containerInfo) { + var $jscomp$optchain$tmp640726641$1, $jscomp$nullish$tmp0; + containerInfo = + null != + ($jscomp$nullish$tmp0 = + null == containerInfo + ? void 0 + : null == + ($jscomp$optchain$tmp640726641$1 = containerInfo.ownerDocument) + ? void 0 + : $jscomp$optchain$tmp640726641$1.defaultView) + ? $jscomp$nullish$tmp0 + : window; for ( - var win = window, element = getActiveElement(); - element instanceof win.HTMLIFrameElement; + $jscomp$optchain$tmp640726641$1 = getActiveElement(containerInfo.document); + $jscomp$optchain$tmp640726641$1 instanceof containerInfo.HTMLIFrameElement; ) { try { var JSCompiler_inline_result = - "string" === typeof element.contentWindow.location.href; + "string" === + typeof $jscomp$optchain$tmp640726641$1.contentWindow.location.href; } catch (err) { JSCompiler_inline_result = !1; } - if (JSCompiler_inline_result) win = element.contentWindow; + if (JSCompiler_inline_result) + containerInfo = $jscomp$optchain$tmp640726641$1.contentWindow; else break; - element = getActiveElement(win.document); + $jscomp$optchain$tmp640726641$1 = getActiveElement(containerInfo.document); } - return element; + return $jscomp$optchain$tmp640726641$1; } function hasSelectionCapabilities(elem) { var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase(); @@ -2248,101 +2262,95 @@ function hasSelectionCapabilities(elem) { "true" === elem.contentEditable) ); } -function restoreSelection(priorSelectionInformation) { - var curFocusedElem = getActiveElementDeep(), - priorFocusedElem = priorSelectionInformation.focusedElem, - priorSelectionRange = priorSelectionInformation.selectionRange; +function restoreSelection(priorSelectionInformation, containerInfo) { + var curFocusedElem = getActiveElementDeep(containerInfo); + containerInfo = priorSelectionInformation.focusedElem; + var priorSelectionRange = priorSelectionInformation.selectionRange; if ( - curFocusedElem !== priorFocusedElem && - priorFocusedElem && - priorFocusedElem.ownerDocument && - containsNode( - priorFocusedElem.ownerDocument.documentElement, - priorFocusedElem - ) + curFocusedElem !== containerInfo && + containerInfo && + containerInfo.ownerDocument && + containsNode(containerInfo.ownerDocument.documentElement, containerInfo) ) { - if ( - null !== priorSelectionRange && - hasSelectionCapabilities(priorFocusedElem) - ) + if (null !== priorSelectionRange && hasSelectionCapabilities(containerInfo)) if ( - ((curFocusedElem = priorSelectionRange.start), - (priorSelectionInformation = priorSelectionRange.end), - void 0 === priorSelectionInformation && - (priorSelectionInformation = curFocusedElem), - "selectionStart" in priorFocusedElem) + ((priorSelectionInformation = priorSelectionRange.start), + (curFocusedElem = priorSelectionRange.end), + void 0 === curFocusedElem && + (curFocusedElem = priorSelectionInformation), + "selectionStart" in containerInfo) ) - (priorFocusedElem.selectionStart = curFocusedElem), - (priorFocusedElem.selectionEnd = Math.min( - priorSelectionInformation, - priorFocusedElem.value.length + (containerInfo.selectionStart = priorSelectionInformation), + (containerInfo.selectionEnd = Math.min( + curFocusedElem, + containerInfo.value.length )); else if ( - ((priorSelectionInformation = - ((curFocusedElem = priorFocusedElem.ownerDocument || document) && - curFocusedElem.defaultView) || + ((curFocusedElem = + ((priorSelectionInformation = + containerInfo.ownerDocument || document) && + priorSelectionInformation.defaultView) || window), - priorSelectionInformation.getSelection) + curFocusedElem.getSelection) ) { - priorSelectionInformation = priorSelectionInformation.getSelection(); - var length = priorFocusedElem.textContent.length, + curFocusedElem = curFocusedElem.getSelection(); + var length = containerInfo.textContent.length, start = Math.min(priorSelectionRange.start, length); priorSelectionRange = void 0 === priorSelectionRange.end ? start : Math.min(priorSelectionRange.end, length); - !priorSelectionInformation.extend && + !curFocusedElem.extend && start > priorSelectionRange && ((length = priorSelectionRange), (priorSelectionRange = start), (start = length)); - length = getNodeForCharacterOffset(priorFocusedElem, start); + length = getNodeForCharacterOffset(containerInfo, start); var endMarker = getNodeForCharacterOffset( - priorFocusedElem, + containerInfo, priorSelectionRange ); length && endMarker && - (1 !== priorSelectionInformation.rangeCount || - priorSelectionInformation.anchorNode !== length.node || - priorSelectionInformation.anchorOffset !== length.offset || - priorSelectionInformation.focusNode !== endMarker.node || - priorSelectionInformation.focusOffset !== endMarker.offset) && - ((curFocusedElem = curFocusedElem.createRange()), - curFocusedElem.setStart(length.node, length.offset), - priorSelectionInformation.removeAllRanges(), + (1 !== curFocusedElem.rangeCount || + curFocusedElem.anchorNode !== length.node || + curFocusedElem.anchorOffset !== length.offset || + curFocusedElem.focusNode !== endMarker.node || + curFocusedElem.focusOffset !== endMarker.offset) && + ((priorSelectionInformation = + priorSelectionInformation.createRange()), + priorSelectionInformation.setStart(length.node, length.offset), + curFocusedElem.removeAllRanges(), start > priorSelectionRange - ? (priorSelectionInformation.addRange(curFocusedElem), - priorSelectionInformation.extend( + ? (curFocusedElem.addRange(priorSelectionInformation), + curFocusedElem.extend(endMarker.node, endMarker.offset)) + : (priorSelectionInformation.setEnd( endMarker.node, endMarker.offset - )) - : (curFocusedElem.setEnd(endMarker.node, endMarker.offset), - priorSelectionInformation.addRange(curFocusedElem))); + ), + curFocusedElem.addRange(priorSelectionInformation))); } - curFocusedElem = []; + priorSelectionInformation = []; for ( - priorSelectionInformation = priorFocusedElem; - (priorSelectionInformation = priorSelectionInformation.parentNode); + curFocusedElem = containerInfo; + (curFocusedElem = curFocusedElem.parentNode); ) - 1 === priorSelectionInformation.nodeType && - curFocusedElem.push({ - element: priorSelectionInformation, - left: priorSelectionInformation.scrollLeft, - top: priorSelectionInformation.scrollTop + 1 === curFocusedElem.nodeType && + priorSelectionInformation.push({ + element: curFocusedElem, + left: curFocusedElem.scrollLeft, + top: curFocusedElem.scrollTop }); - "function" === typeof priorFocusedElem.focus && priorFocusedElem.focus(); + "function" === typeof containerInfo.focus && containerInfo.focus(); for ( - priorFocusedElem = 0; - priorFocusedElem < curFocusedElem.length; - priorFocusedElem++ + containerInfo = 0; + containerInfo < priorSelectionInformation.length; + containerInfo++ ) - (priorSelectionInformation = curFocusedElem[priorFocusedElem]), - (priorSelectionInformation.element.scrollLeft = - priorSelectionInformation.left), - (priorSelectionInformation.element.scrollTop = - priorSelectionInformation.top); + (curFocusedElem = priorSelectionInformation[containerInfo]), + (curFocusedElem.element.scrollLeft = curFocusedElem.left), + (curFocusedElem.element.scrollTop = curFocusedElem.top); } } var skipSelectionChangeEvent = @@ -2529,11 +2537,18 @@ function startProfilerTimer(fiber) { profilerStartTime = now(); 0 > fiber.actualStartTime && (fiber.actualStartTime = profilerStartTime); } -function stopProfilerTimerIfRunningAndRecordDelta(fiber, overrideBaseTime) { +function stopProfilerTimerIfRunningAndRecordDuration(fiber) { + if (0 <= profilerStartTime) { + var elapsedTime = now() - profilerStartTime; + fiber.actualDuration += elapsedTime; + fiber.selfBaseDuration = elapsedTime; + profilerStartTime = -1; + } +} +function stopProfilerTimerIfRunningAndRecordIncompleteDuration(fiber) { if (0 <= profilerStartTime) { var elapsedTime = now() - profilerStartTime; fiber.actualDuration += elapsedTime; - overrideBaseTime && (fiber.selfBaseDuration = elapsedTime); profilerStartTime = -1; } } @@ -4066,7 +4081,7 @@ function updateReducerImpl(hook, current, reducer) { var newBaseQueueFirst = (baseFirst = null), newBaseQueueLast = null, update = current, - didReadFromEntangledAsyncAction$58 = !1; + didReadFromEntangledAsyncAction$59 = !1; do { var updateLane = update.lane & -536870913; if ( @@ -4087,11 +4102,11 @@ function updateReducerImpl(hook, current, reducer) { next: null }), updateLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$58 = !0); + (didReadFromEntangledAsyncAction$59 = !0); else if ((renderLanes & revertLane) === revertLane) { update = update.next; revertLane === currentEntangledLane && - (didReadFromEntangledAsyncAction$58 = !0); + (didReadFromEntangledAsyncAction$59 = !0); continue; } else (updateLane = { @@ -4137,7 +4152,7 @@ function updateReducerImpl(hook, current, reducer) { if ( !objectIs(pendingQueue, hook.memoizedState) && ((didReceiveUpdate = !0), - didReadFromEntangledAsyncAction$58 && + didReadFromEntangledAsyncAction$59 && ((reducer = currentEntangledActionThenable), null !== reducer)) ) throw reducer; @@ -4335,8 +4350,8 @@ function runActionStateAction(actionQueue, node) { try { (prevTransition = action(prevState, payload)), handleActionReturnValue(actionQueue, node, prevTransition); - } catch (error$64) { - onActionError(actionQueue, node, error$64); + } catch (error$65) { + onActionError(actionQueue, node, error$65); } } function handleActionReturnValue(actionQueue, node, returnValue) { @@ -4751,10 +4766,10 @@ function refreshCache(fiber) { case 3: var lane = requestUpdateLane(); fiber = createUpdate(lane); - var root$67 = enqueueUpdate(provider, fiber, lane); - null !== root$67 && - (scheduleUpdateOnFiber(root$67, provider, lane), - entangleTransitions(root$67, provider, lane)); + var root$68 = enqueueUpdate(provider, fiber, lane); + null !== root$68 && + (scheduleUpdateOnFiber(root$68, provider, lane), + entangleTransitions(root$68, provider, lane)); provider = { cache: createCache() }; fiber.payload = provider; return; @@ -5273,9 +5288,9 @@ function resolveClassComponentProps(Component, baseProps) { } if ((Component = Component.defaultProps)) { newProps === baseProps && (newProps = assign({}, newProps)); - for (var propName$71 in Component) - void 0 === newProps[propName$71] && - (newProps[propName$71] = Component[propName$71]); + for (var propName$72 in Component) + void 0 === newProps[propName$72] && + (newProps[propName$72] = Component[propName$72]); } return newProps; } @@ -5321,9 +5336,9 @@ function logUncaughtError(root, errorInfo) { try { var onUncaughtError = root.onUncaughtError; onUncaughtError(errorInfo.value, { componentStack: errorInfo.stack }); - } catch (e$72) { + } catch (e$73) { setTimeout(function () { - throw e$72; + throw e$73; }); } } @@ -5334,9 +5349,9 @@ function logCaughtError(root, boundary, errorInfo) { componentStack: errorInfo.stack, errorBoundary: 1 === boundary.tag ? boundary.stateNode : null }); - } catch (e$73) { + } catch (e$74) { setTimeout(function () { - throw e$73; + throw e$74; }); } } @@ -6662,6 +6677,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate( case 12: 0 !== (renderLanes & workInProgress.childLanes) && (workInProgress.flags |= 4); + workInProgress.flags |= 2048; var stateNode = workInProgress.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; @@ -7101,6 +7117,7 @@ function beginWork(current, workInProgress, renderLanes) { case 12: return ( (workInProgress.flags |= 4), + (workInProgress.flags |= 2048), (lazyComponent = workInProgress.stateNode), (lazyComponent.effectDuration = 0), (lazyComponent.passiveEffectDuration = 0), @@ -7788,8 +7805,8 @@ function safelyCallComponentWillUnmount( } else try { instance.componentWillUnmount(); - } catch (error$119) { - captureCommitPhaseError(current, nearestMountedAncestor, error$119); + } catch (error$120) { + captureCommitPhaseError(current, nearestMountedAncestor, error$120); } } function safelyAttachRef(current, nearestMountedAncestor) { @@ -7849,8 +7866,8 @@ function safelyDetachRef(current, nearestMountedAncestor) { recordLayoutEffectDuration(current); } else ref(null); - } catch (error$120) { - captureCommitPhaseError(current, nearestMountedAncestor, error$120); + } catch (error$121) { + captureCommitPhaseError(current, nearestMountedAncestor, error$121); } else ref.current = null; } @@ -7870,13 +7887,14 @@ function commitProfilerUpdate( if (executionContext & 4) try { var _finishedWork$memoize = finishedWork.memoizedProps, + id = _finishedWork$memoize.id, onCommit = _finishedWork$memoize.onCommit, onRender = _finishedWork$memoize.onRender; current = null === current ? "mount" : "update"; currentUpdateIsNested && (current = "nested-update"); "function" === typeof onRender && onRender( - finishedWork.memoizedProps.id, + id, current, finishedWork.actualDuration, finishedWork.treeBaseDuration, @@ -8005,8 +8023,9 @@ function shouldProfile(current) { } var shouldFireAfterActiveInstanceBlur = !1; function commitBeforeMutationEffects(root, firstChild) { + root = root.containerInfo; eventsEnabled = _enabled; - root = getActiveElementDeep(); + root = getActiveElementDeep(root); if (hasSelectionCapabilities(root)) { if ("selectionStart" in root) var JSCompiler_temp = { @@ -8028,7 +8047,7 @@ function commitBeforeMutationEffects(root, firstChild) { selection = selection.focusOffset; try { JSCompiler_temp.nodeType, focusNode.nodeType; - } catch (e$22) { + } catch (e$23) { JSCompiler_temp = null; break a; } @@ -8184,11 +8203,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { } else try { finishedRoot.componentDidMount(); - } catch (error$116) { + } catch (error$117) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$116 + error$117 ); } else { @@ -8205,11 +8224,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$117) { + } catch (error$118) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$117 + error$118 ); } recordLayoutEffectDuration(finishedWork); @@ -8220,11 +8239,11 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { current, finishedRoot.__reactInternalSnapshotBeforeUpdate ); - } catch (error$118) { + } catch (error$119) { captureCommitPhaseError( finishedWork, finishedWork.return, - error$118 + error$119 ); } } @@ -8267,7 +8286,6 @@ function commitLayoutEffectOnFiber(finishedRoot, current, finishedWork) { a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -8397,7 +8415,7 @@ function commitDeletionEffectsOnFiber( safelyDetachRef(deletedFiber, nearestMountedAncestor); case 6: prevHostParentIsContainer = hostParent; - var prevHostParentIsContainer$130 = hostParentIsContainer; + var prevHostParentIsContainer$129 = hostParentIsContainer; hostParent = null; recursivelyTraverseDeletionEffects( finishedRoot, @@ -8405,7 +8423,7 @@ function commitDeletionEffectsOnFiber( deletedFiber ); hostParent = prevHostParentIsContainer; - hostParentIsContainer = prevHostParentIsContainer$130; + hostParentIsContainer = prevHostParentIsContainer$129; if (null !== hostParent) if (hostParentIsContainer) try { @@ -8473,18 +8491,18 @@ function commitDeletionEffectsOnFiber( ) { prevHostParentIsContainer = prevHostParent = prevHostParent.next; do { - prevHostParentIsContainer$130 = prevHostParentIsContainer.tag; + prevHostParentIsContainer$129 = prevHostParentIsContainer.tag; var inst = prevHostParentIsContainer.inst, destroy = inst.destroy; void 0 !== destroy && - (0 !== (prevHostParentIsContainer$130 & 2) + (0 !== (prevHostParentIsContainer$129 & 2) ? ((inst.destroy = void 0), safelyCallDestroy( deletedFiber, nearestMountedAncestor, destroy )) - : 0 !== (prevHostParentIsContainer$130 & 4) && + : 0 !== (prevHostParentIsContainer$129 & 4) && (markComponentLayoutEffectUnmountStarted(deletedFiber), shouldProfile(deletedFiber) ? (startLayoutEffectTimer(), @@ -9082,21 +9100,21 @@ function commitReconciliationEffects(finishedWork) { insertOrAppendPlacementNode(finishedWork, before, parent$jscomp$0); break; case 5: - var parent$121 = JSCompiler_inline_result.stateNode; + var parent$122 = JSCompiler_inline_result.stateNode; JSCompiler_inline_result.flags & 32 && - (setTextContent(parent$121, ""), + (setTextContent(parent$122, ""), (JSCompiler_inline_result.flags &= -33)); - var before$122 = getHostSibling(finishedWork); - insertOrAppendPlacementNode(finishedWork, before$122, parent$121); + var before$123 = getHostSibling(finishedWork); + insertOrAppendPlacementNode(finishedWork, before$123, parent$122); break; case 3: case 4: - var parent$123 = JSCompiler_inline_result.stateNode.containerInfo, - before$124 = getHostSibling(finishedWork); + var parent$124 = JSCompiler_inline_result.stateNode.containerInfo, + before$125 = getHostSibling(finishedWork); insertOrAppendPlacementNodeIntoContainer( finishedWork, - before$124, - parent$123 + before$125, + parent$124 ); break; default: @@ -9260,7 +9278,6 @@ function recursivelyTraverseReappearLayoutEffects( a: for ( flags = finishedWork.stateNode.effectDuration, commitProfilerUpdate(finishedWork, current, commitTime, flags), - enqueuePendingPassiveProfilerEffect(finishedWork), finishedWork = finishedWork.return; null !== finishedWork; @@ -9378,12 +9395,46 @@ function commitPassiveMountOnFiber( (finishedWork.refCount++, null != finishedRoot && releaseCache(finishedRoot))); break; + case 12: + recursivelyTraversePassiveMountEffects( + finishedRoot, + finishedWork, + committedLanes, + committedTransitions + ); + if (flags & 2048 && executionContext & 4) { + finishedRoot = finishedWork.stateNode.passiveEffectDuration; + try { + var _finishedWork$memoize2 = finishedWork.memoizedProps, + id = _finishedWork$memoize2.id, + onPostCommit = _finishedWork$memoize2.onPostCommit, + phase = null === finishedWork.alternate ? "mount" : "update"; + currentUpdateIsNested && (phase = "nested-update"); + "function" === typeof onPostCommit && + onPostCommit(id, phase, finishedRoot, commitTime); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } + finishedWork = finishedWork.return; + a: for (; null !== finishedWork; ) { + switch (finishedWork.tag) { + case 3: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + case 12: + finishedWork.stateNode.passiveEffectDuration += finishedRoot; + break a; + } + finishedWork = finishedWork.return; + } + } + break; case 23: break; case 22: - var instance = finishedWork.stateNode; + _finishedWork$memoize2 = finishedWork.stateNode; null !== finishedWork.memoizedState - ? instance._visibility & 4 + ? _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, @@ -9391,14 +9442,14 @@ function commitPassiveMountOnFiber( committedTransitions ) : recursivelyTraverseAtomicPassiveEffects(finishedRoot, finishedWork) - : instance._visibility & 4 + : _finishedWork$memoize2._visibility & 4 ? recursivelyTraversePassiveMountEffects( finishedRoot, finishedWork, committedLanes, committedTransitions ) - : ((instance._visibility |= 4), + : ((_finishedWork$memoize2._visibility |= 4), recursivelyTraverseReconnectPassiveEffects( finishedRoot, finishedWork, @@ -9747,9 +9798,9 @@ function FiberNode(tag, pendingProps, key, mode) { this.deletions = null; this.childLanes = this.lanes = 0; this.alternate = null; - this.actualDuration = 0; - this.actualStartTime = -1; - this.treeBaseDuration = this.selfBaseDuration = 0; + this.actualDuration = -0; + this.actualStartTime = -1.1; + this.treeBaseDuration = this.selfBaseDuration = -0; } function createFiberImplClass(tag, pendingProps, key, mode) { return new FiberNode(tag, pendingProps, key, mode); @@ -9777,8 +9828,8 @@ function createWorkInProgress(current, pendingProps) { (workInProgress.flags = 0), (workInProgress.subtreeFlags = 0), (workInProgress.deletions = null), - (workInProgress.actualDuration = 0), - (workInProgress.actualStartTime = -1)); + (workInProgress.actualDuration = -0), + (workInProgress.actualStartTime = -1.1)); workInProgress.flags = current.flags & 31457280; workInProgress.childLanes = current.childLanes; workInProgress.lanes = current.lanes; @@ -10679,7 +10730,6 @@ var DefaultAsyncDispatcher = { rootDoesHavePassiveEffects = !1, rootWithPendingPassiveEffects = null, pendingPassiveEffectsLanes = 0, - pendingPassiveProfilerEffects = [], pendingPassiveEffectsRemainingLanes = 0, pendingPassiveTransitions = null, nestedUpdateCount = 0, @@ -11009,9 +11059,9 @@ function markRootSuspended( didSkipSuspendedSiblings || (root.warmLanes |= suspendedLanes); didSkipSuspendedSiblings = root.expirationTimes; for (var lanes = suspendedLanes; 0 < lanes; ) { - var index$6 = 31 - clz32(lanes), - lane = 1 << index$6; - didSkipSuspendedSiblings[index$6] = -1; + var index$7 = 31 - clz32(lanes), + lane = 1 << index$7; + didSkipSuspendedSiblings[index$7] = -1; lanes &= ~lane; } 0 !== spawnedLane && @@ -11126,9 +11176,9 @@ function prepareFreshStack(root, lanes) { 0 < allEntangledLanes; ) { - var index$4 = 31 - clz32(allEntangledLanes), - lane = 1 << index$4; - lanes |= root[index$4]; + var index$5 = 31 - clz32(allEntangledLanes), + lane = 1 << index$5; + lanes |= root[index$5]; allEntangledLanes &= ~lane; } entangledRenderLanes = lanes; @@ -11168,7 +11218,7 @@ function handleThrow(root, thrownValue) { else switch ( (erroredWork.mode & 2 && - stopProfilerTimerIfRunningAndRecordDelta(erroredWork, !0), + stopProfilerTimerIfRunningAndRecordDuration(erroredWork), markComponentRenderStopped(), workInProgressSuspendedReason) ) { @@ -11424,7 +11474,7 @@ function performUnitOfWork(unitOfWork) { 0 !== (unitOfWork.mode & 2) ? (startProfilerTimer(unitOfWork), (current = beginWork(current, unitOfWork, entangledRenderLanes)), - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !0)) + stopProfilerTimerIfRunningAndRecordDuration(unitOfWork)) : (current = beginWork(current, unitOfWork, entangledRenderLanes)); unitOfWork.memoizedProps = unitOfWork.pendingProps; null === current @@ -11466,7 +11516,7 @@ function replaySuspendedUnitOfWork(unitOfWork) { resetWorkInProgress(next, entangledRenderLanes)), (current = beginWork(current, next, entangledRenderLanes)); } - isProfilingMode && stopProfilerTimerIfRunningAndRecordDelta(next, !0); + isProfilingMode && stopProfilerTimerIfRunningAndRecordDuration(next); next = current; unitOfWork.memoizedProps = unitOfWork.pendingProps; null === next ? completeUnitOfWork(unitOfWork) : (workInProgress = next); @@ -11521,11 +11571,10 @@ function completeUnitOfWork(unitOfWork) { } var current = completedWork.alternate; unitOfWork = completedWork.return; - 0 === (completedWork.mode & 2) - ? (current = completeWork(current, completedWork, entangledRenderLanes)) - : (startProfilerTimer(completedWork), - (current = completeWork(current, completedWork, entangledRenderLanes)), - stopProfilerTimerIfRunningAndRecordDelta(completedWork, !1)); + startProfilerTimer(completedWork); + current = completeWork(current, completedWork, entangledRenderLanes); + 0 !== (completedWork.mode & 2) && + stopProfilerTimerIfRunningAndRecordIncompleteDuration(completedWork); if (null !== current) { workInProgress = current; return; @@ -11548,7 +11597,7 @@ function unwindUnitOfWork(unitOfWork, skipSiblings) { return; } if (0 !== (unitOfWork.mode & 2)) { - stopProfilerTimerIfRunningAndRecordDelta(unitOfWork, !1); + stopProfilerTimerIfRunningAndRecordIncompleteDuration(unitOfWork); next = unitOfWork.actualDuration; for (var child = unitOfWork.child; null !== child; ) (next += child.actualDuration), (child = child.sibling); @@ -11659,7 +11708,7 @@ function commitRootImpl( commitBeforeMutationEffects(root, finishedWork), (commitTime = now()), commitMutationEffects(root, finishedWork, lanes), - restoreSelection(selectionInformation), + restoreSelection(selectionInformation, root.containerInfo), (_enabled = !!eventsEnabled), (selectionInformation = eventsEnabled = null), (root.current = finishedWork), @@ -11729,10 +11778,10 @@ function flushPassiveEffects() { if (null === rootWithPendingPassiveEffects) var JSCompiler_inline_result = !1; else { - var transitions = pendingPassiveTransitions; + renderPriority = pendingPassiveTransitions; pendingPassiveTransitions = null; - renderPriority = rootWithPendingPassiveEffects; - var lanes = pendingPassiveEffectsLanes; + var root = rootWithPendingPassiveEffects, + lanes = pendingPassiveEffectsLanes; rootWithPendingPassiveEffects = null; pendingPassiveEffectsLanes = 0; if (0 !== (executionContext & 6)) @@ -11743,51 +11792,8 @@ function flushPassiveEffects() { injectedProfilingHooks.markPassiveEffectsStarted(lanes); var prevExecutionContext = executionContext; executionContext |= 4; - commitPassiveUnmountOnFiber(renderPriority.current); - commitPassiveMountOnFiber( - renderPriority, - renderPriority.current, - lanes, - transitions - ); - transitions = pendingPassiveProfilerEffects; - pendingPassiveProfilerEffects = []; - for (lanes = 0; lanes < transitions.length; lanes++) { - var finishedWork = transitions[lanes]; - if (executionContext & 4 && 0 !== (finishedWork.flags & 4)) - switch (finishedWork.tag) { - case 12: - var passiveEffectDuration = - finishedWork.stateNode.passiveEffectDuration, - _finishedWork$memoize = finishedWork.memoizedProps, - id = _finishedWork$memoize.id, - onPostCommit = _finishedWork$memoize.onPostCommit, - commitTime$126 = commitTime, - phase = null === finishedWork.alternate ? "mount" : "update"; - currentUpdateIsNested && (phase = "nested-update"); - "function" === typeof onPostCommit && - onPostCommit( - id, - phase, - passiveEffectDuration, - commitTime$126 - ); - var parentFiber = finishedWork.return; - b: for (; null !== parentFiber; ) { - switch (parentFiber.tag) { - case 3: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - case 12: - parentFiber.stateNode.passiveEffectDuration += - passiveEffectDuration; - break b; - } - parentFiber = parentFiber.return; - } - } - } + commitPassiveUnmountOnFiber(root.current); + commitPassiveMountOnFiber(root, root.current, lanes, renderPriority); null !== injectedProfilingHooks && "function" === typeof injectedProfilingHooks.markPassiveEffectsStopped && @@ -11799,9 +11805,9 @@ function flushPassiveEffects() { "function" === typeof injectedHook.onPostCommitFiberRoot ) try { - injectedHook.onPostCommitFiberRoot(rendererID, renderPriority); + injectedHook.onPostCommitFiberRoot(rendererID, root); } catch (err) {} - var stateNode = renderPriority.current.stateNode; + var stateNode = root.current.stateNode; stateNode.effectDuration = 0; stateNode.passiveEffectDuration = 0; JSCompiler_inline_result = !0; @@ -11815,15 +11821,6 @@ function flushPassiveEffects() { } return !1; } -function enqueuePendingPassiveProfilerEffect(fiber) { - pendingPassiveProfilerEffects.push(fiber); - rootDoesHavePassiveEffects || - ((rootDoesHavePassiveEffects = !0), - scheduleCallback$1(NormalPriority$1, function () { - flushPassiveEffects(); - return null; - })); -} function captureCommitPhaseErrorOnRoot(rootFiber, sourceFiber, error) { sourceFiber = createCapturedValueAtFiber(error, sourceFiber); sourceFiber = createRootErrorUpdate(rootFiber.stateNode, sourceFiber, 2); @@ -12057,12 +12054,12 @@ function scheduleTaskForRootDuringMicrotask(root, currentTime) { 0 < lanes; ) { - var index$5 = 31 - clz32(lanes), - lane = 1 << index$5, - expirationTime = expirationTimes[index$5]; + var index$6 = 31 - clz32(lanes), + lane = 1 << index$6, + expirationTime = expirationTimes[index$6]; if (-1 === expirationTime) { if (0 === (lane & suspendedLanes) || 0 !== (lane & pingedLanes)) - expirationTimes[index$5] = computeExpirationTime(lane, currentTime); + expirationTimes[index$6] = computeExpirationTime(lane, currentTime); } else expirationTime <= currentTime && (root.expiredLanes |= lane); lanes &= ~lane; } @@ -12226,20 +12223,20 @@ function extractEvents$1( } } for ( - var i$jscomp$inline_1496 = 0; - i$jscomp$inline_1496 < simpleEventPluginEvents.length; - i$jscomp$inline_1496++ + var i$jscomp$inline_1500 = 0; + i$jscomp$inline_1500 < simpleEventPluginEvents.length; + i$jscomp$inline_1500++ ) { - var eventName$jscomp$inline_1497 = - simpleEventPluginEvents[i$jscomp$inline_1496], - domEventName$jscomp$inline_1498 = - eventName$jscomp$inline_1497.toLowerCase(), - capitalizedEvent$jscomp$inline_1499 = - eventName$jscomp$inline_1497[0].toUpperCase() + - eventName$jscomp$inline_1497.slice(1); + var eventName$jscomp$inline_1501 = + simpleEventPluginEvents[i$jscomp$inline_1500], + domEventName$jscomp$inline_1502 = + eventName$jscomp$inline_1501.toLowerCase(), + capitalizedEvent$jscomp$inline_1503 = + eventName$jscomp$inline_1501[0].toUpperCase() + + eventName$jscomp$inline_1501.slice(1); registerSimpleEvent( - domEventName$jscomp$inline_1498, - "on" + capitalizedEvent$jscomp$inline_1499 + domEventName$jscomp$inline_1502, + "on" + capitalizedEvent$jscomp$inline_1503 ); } registerSimpleEvent(ANIMATION_END, "onAnimationEnd"); @@ -14917,7 +14914,7 @@ function insertStylesheetIntoRoot(root, resource) { ) { var node = nodes[i]; if ( - "link" === node.nodeName || + "LINK" === node.nodeName || "not all" !== node.getAttribute("media") ) precedences.set(node.dataset.precedence, node), (last = node); @@ -15699,16 +15696,16 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { 0 === i && attemptExplicitHydrationTarget(target); } }; -var isomorphicReactPackageVersion$jscomp$inline_1745 = React.version; +var isomorphicReactPackageVersion$jscomp$inline_1749 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== - isomorphicReactPackageVersion$jscomp$inline_1745 + "19.0.0-rc-f2df5694-20240916" !== + isomorphicReactPackageVersion$jscomp$inline_1749 ) throw Error( formatProdErrorMessage( 527, - isomorphicReactPackageVersion$jscomp$inline_1745, - "19.0.0-rc-206df66e-20240912" + isomorphicReactPackageVersion$jscomp$inline_1749, + "19.0.0-rc-f2df5694-20240916" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15728,13 +15725,13 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { null === componentOrElement ? null : componentOrElement.stateNode; return componentOrElement; }; -var internals$jscomp$inline_1752 = { +var internals$jscomp$inline_1756 = { bundleType: 0, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-206df66e-20240912", + reconcilerVersion: "19.0.0-rc-f2df5694-20240916", getLaneLabelMap: function () { for ( var map = new Map(), lane = 1, index$277 = 0; @@ -15752,16 +15749,16 @@ var internals$jscomp$inline_1752 = { } }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { - var hook$jscomp$inline_2177 = __REACT_DEVTOOLS_GLOBAL_HOOK__; + var hook$jscomp$inline_2180 = __REACT_DEVTOOLS_GLOBAL_HOOK__; if ( - !hook$jscomp$inline_2177.isDisabled && - hook$jscomp$inline_2177.supportsFiber + !hook$jscomp$inline_2180.isDisabled && + hook$jscomp$inline_2180.supportsFiber ) try { - (rendererID = hook$jscomp$inline_2177.inject( - internals$jscomp$inline_1752 + (rendererID = hook$jscomp$inline_2180.inject( + internals$jscomp$inline_1756 )), - (injectedHook = hook$jscomp$inline_2177); + (injectedHook = hook$jscomp$inline_2180); } catch (err) {} } function noop() {} @@ -16014,7 +16011,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js index 31989b609d250..505ea9a5b6102 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js @@ -8565,5 +8565,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js index d0ac6685078c6..190252fa94c59 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js @@ -5621,4 +5621,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js index 4c02e7b8bebf2..cc0be01b6ab18 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js @@ -8565,5 +8565,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js index dbb3eb6a7c850..12a24a359d0a6 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js @@ -5699,4 +5699,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js index 73b9b25c28cef..9a11cd77e23a3 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js @@ -8752,11 +8752,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-f2df5694-20240916" !== 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.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8849,5 +8849,5 @@ startWork(request$jscomp$0); }); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js index f62532eec44af..18db09680aa7e 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js @@ -5910,14 +5910,14 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_731 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== + "19.0.0-rc-f2df5694-20240916" !== isomorphicReactPackageVersion$jscomp$inline_731 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_731, - "19.0.0-rc-206df66e-20240912" + "19.0.0-rc-f2df5694-20240916" ) ); exports.renderToReadableStream = function (children, options) { @@ -6006,4 +6006,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js index 9f279a1b434b5..eaa09535e7b46 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js @@ -5594,13 +5594,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_735 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== + "19.0.0-rc-f2df5694-20240916" !== isomorphicReactPackageVersion$jscomp$inline_735 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_735 + - "\n - react-dom: 19.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -5688,4 +5688,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js index 8a3638388cc73..db8873e7578df 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js @@ -8771,11 +8771,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-f2df5694-20240916" !== 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.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8879,5 +8879,5 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js index 442926de5a493..108609b800507 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js @@ -6004,13 +6004,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_739 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== + "19.0.0-rc-f2df5694-20240916" !== isomorphicReactPackageVersion$jscomp$inline_739 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_739 + - "\n - react-dom: 19.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6109,4 +6109,4 @@ const setTimeoutOrImmediate = ? globalThis['set' + 'Immediate'] : setTimeout; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js index e37620777fc93..b428898540d06 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js @@ -8622,11 +8622,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-206df66e-20240912" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-f2df5694-20240916" !== 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.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToPipeableStream = function (children, options) { @@ -8668,5 +8668,5 @@ } }; }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js index 4264c4ca1b87d..17a8423b2f2cb 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js @@ -5626,13 +5626,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_762 = React.version; if ( - "19.0.0-rc-206df66e-20240912" !== + "19.0.0-rc-f2df5694-20240916" !== isomorphicReactPackageVersion$jscomp$inline_762 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_762 + - "\n - react-dom: 19.0.0-rc-206df66e-20240912\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-f2df5694-20240916\nLearn more: https://react.dev/warnings/version-mismatch") ); function createDrainHandler(destination, request) { return function () { @@ -5934,4 +5934,4 @@ exports.renderToPipeableStream = function (children, options) { } }; }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js index 4fd3b97ff0412..71684c454ed30 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js index e70b1deff4f07..716142eac68fc 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js index 1b395f37cc6b2..e7346d94248a6 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js index b10356863153e..84ef4696da8c2 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-dom/package.json b/packages/next/src/compiled/react-dom/package.json index 7c99af6ed663c..10a6c0758a1f1 100644 --- a/packages/next/src/compiled/react-dom/package.json +++ b/packages/next/src/compiled/react-dom/package.json @@ -67,10 +67,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.25.0-rc-206df66e-20240912" + "scheduler": "0.25.0-rc-f2df5694-20240916" }, "peerDependencies": { - "react": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-experimental/cjs/react.development.js b/packages/next/src/compiled/react-experimental/cjs/react.development.js index 008d78ec7a694..93c8896a2912b 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.development.js @@ -1233,7 +1233,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-experimental/cjs/react.production.js b/packages/next/src/compiled/react-experimental/cjs/react.production.js index 2df50ece794fa..171e123bbb31e 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.production.js @@ -562,4 +562,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js index 996647a6b1df1..75e13adca4782 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js @@ -979,5 +979,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-experimental-206df66e-20240912"; + exports.version = "19.0.0-experimental-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js index 8381f5525113a..c266e850f77af 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js @@ -567,4 +567,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-experimental-206df66e-20240912"; +exports.version = "19.0.0-experimental-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react-is/package.json b/packages/next/src/compiled/react-is/package.json index 2df7c292fbfb8..9b0d3afd3936f 100644 --- a/packages/next/src/compiled/react-is/package.json +++ b/packages/next/src/compiled/react-is/package.json @@ -1,6 +1,6 @@ { "name": "react-is", - "version": "19.0.0-rc-206df66e-20240912", + "version": "19.0.0-rc-f2df5694-20240916", "description": "Brand checking of React Elements.", "main": "index.js", "sideEffects": false, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js index 631117358de10..266da0afd8590 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-client.browser.development.js @@ -2494,10 +2494,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-server-dom-turbopack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912", + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js index 45df20377758e..5dad00f4cce96 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js @@ -676,7 +676,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1357,7 +1357,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1484,8 +1484,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2452,13 +2458,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2613,13 +2621,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2647,7 +2654,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3889,16 +3896,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js index 7fa490fc0330a..46bbf48ae9648 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js @@ -815,7 +815,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1066,7 +1066,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1165,7 +1165,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1186,7 +1186,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1263,8 +1263,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1364,7 +1370,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1463,7 +1469,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1752,8 +1758,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1870,7 +1876,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -1980,19 +1986,18 @@ function flushCompletedChunks(request, destination) { } 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2006,9 +2011,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), closeWithError(destination, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(destination, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2019,7 +2024,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js index 93aabf19acf80..9f1197595520a 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js @@ -677,7 +677,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1414,7 +1414,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1541,8 +1541,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2531,13 +2537,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2692,21 +2700,16 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + request.status === OPENING && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2734,7 +2737,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3991,16 +3994,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js index 3c68298b694e3..f17d75ca0c93c 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js @@ -820,7 +820,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1071,7 +1071,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1170,7 +1170,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1191,7 +1191,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1268,8 +1268,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1369,7 +1375,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1468,7 +1474,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1761,8 +1767,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1879,7 +1885,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -1989,27 +1995,22 @@ function flushCompletedChunks(request, destination) { } 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + 10 === request.status && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2023,9 +2024,9 @@ function enqueueFlush(request) { }, 0)); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), closeWithError(destination, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(destination, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2036,7 +2037,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js index acea83d6d1085..ebb1411c93b7d 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js @@ -701,7 +701,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1412,7 +1412,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1538,8 +1538,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2508,13 +2514,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2670,13 +2678,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2703,7 +2710,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3979,16 +3986,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js index 8e9ee0456329e..0154cc7d24125 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js @@ -837,7 +837,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1087,7 +1087,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1186,7 +1186,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1207,7 +1207,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1283,8 +1283,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1383,7 +1389,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1482,7 +1488,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1769,8 +1775,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1880,7 +1886,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -2014,19 +2020,18 @@ function flushCompletedChunks(request, destination) { "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2040,9 +2045,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2053,7 +2058,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json index 8059815ffba8a..54ee5212831b8 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json @@ -48,7 +48,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "0.0.0-experimental-206df66e-20240912", - "react-dom": "0.0.0-experimental-206df66e-20240912" + "react": "0.0.0-experimental-f2df5694-20240916", + "react-dom": "0.0.0-experimental-f2df5694-20240916" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js index 0a8f2d6c80f61..c9ae83ebfaf89 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-client.browser.development.js @@ -2294,10 +2294,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-server-dom-turbopack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-rc-206df66e-20240912", + reconcilerVersion: "19.0.0-rc-f2df5694-20240916", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js index 4f6e91f12fc75..7f5599edc04df 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js @@ -606,7 +606,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1136,7 +1136,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1256,8 +1256,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2118,13 +2124,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2260,13 +2268,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2281,7 +2288,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3488,9 +3495,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js index d37edb67072f7..68b64ae53f2b3 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js @@ -785,7 +785,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1001,7 +1001,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1100,7 +1100,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1121,7 +1121,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1165,7 +1165,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1256,8 +1256,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1379,7 +1385,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1646,8 +1652,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1744,7 +1750,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1835,17 +1841,16 @@ function flushCompletedChunks(request, destination) { (writtenBytes = 0)); } 0 === request.pendingChunks && - ((request.status = 13), destination.close(), (request.destination = null)); + ((request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1860,7 +1865,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -2732,9 +2737,9 @@ exports.renderToReadableStream = function (model, turbopackMap, options) { startWork(request); }, pull: function (controller) { - if (12 === request.status) - (request.status = 13), closeWithError(controller, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(controller, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = controller; try { flushCompletedChunks(request, controller); diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js index 68f4c93c24597..efb75849aa881 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js @@ -607,7 +607,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1153,7 +1153,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1273,8 +1273,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2146,13 +2152,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2288,21 +2296,16 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + request.status === OPENING && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2317,7 +2320,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3528,9 +3531,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js index a82e3858a2b00..aa3edfbddc7cd 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js @@ -790,7 +790,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1006,7 +1006,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1105,7 +1105,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1126,7 +1126,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1170,7 +1170,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1261,8 +1261,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1384,7 +1390,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1653,8 +1659,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1751,7 +1757,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1842,25 +1848,20 @@ function flushCompletedChunks(request, destination) { (writtenBytes = 0)); } 0 === request.pendingChunks && - ((request.status = 13), destination.close(), (request.destination = null)); + ((request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + 10 === request.status && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1875,7 +1876,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -2758,9 +2759,9 @@ exports.renderToReadableStream = function (model, turbopackMap, options) { startWork(request); }, pull: function (controller) { - if (12 === request.status) - (request.status = 13), closeWithError(controller, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(controller, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = controller; try { flushCompletedChunks(request, controller); diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js index 9afa158423241..3635441716a59 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js @@ -631,7 +631,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1171,7 +1171,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1290,8 +1290,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2148,13 +2154,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2291,13 +2299,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2324,7 +2331,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3540,9 +3547,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js index 2e9d5b51a670c..c856009746427 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js @@ -806,7 +806,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1021,7 +1021,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1120,7 +1120,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1141,7 +1141,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1185,7 +1185,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1275,8 +1275,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1397,7 +1403,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1663,8 +1669,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1755,7 +1761,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1870,17 +1876,16 @@ function flushCompletedChunks(request, destination) { } "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && - ((request.status = 13), destination.end(), (request.destination = null)); + ((request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1894,9 +1899,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -1907,7 +1912,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = diff --git a/packages/next/src/compiled/react-server-dom-turbopack/package.json b/packages/next/src/compiled/react-server-dom-turbopack/package.json index 550a360dd11eb..7b06a6b644166 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack/package.json @@ -48,7 +48,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js index 7f3dcbc9470d3..5bd7c9cf807e5 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-client.browser.development.js @@ -2507,10 +2507,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-experimental-206df66e-20240912", + version: "19.0.0-experimental-f2df5694-20240916", rendererPackageName: "react-server-dom-webpack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-experimental-206df66e-20240912", + reconcilerVersion: "19.0.0-experimental-f2df5694-20240916", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js index 8b44d64215c50..2ce86b8cd6c77 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js @@ -676,7 +676,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1357,7 +1357,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1484,8 +1484,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2452,13 +2458,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2613,13 +2621,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2647,7 +2654,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3894,16 +3901,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js index 9cc790c717f7e..93b55a6c7774f 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js @@ -815,7 +815,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1066,7 +1066,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1165,7 +1165,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1186,7 +1186,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1263,8 +1263,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1364,7 +1370,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1463,7 +1469,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1752,8 +1758,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1870,7 +1876,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -1980,19 +1986,18 @@ function flushCompletedChunks(request, destination) { } 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2006,9 +2011,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), closeWithError(destination, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(destination, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2019,7 +2024,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js index 02663113b3680..4df5553ac1f75 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js @@ -677,7 +677,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1414,7 +1414,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1541,8 +1541,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2531,13 +2537,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2692,21 +2700,16 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + request.status === OPENING && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2734,7 +2737,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3992,16 +3995,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js index 4fe084749872c..9d804423215f1 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js @@ -820,7 +820,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1071,7 +1071,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1170,7 +1170,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1191,7 +1191,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1268,8 +1268,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1369,7 +1375,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1468,7 +1474,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1761,8 +1767,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1879,7 +1885,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -1989,27 +1995,22 @@ function flushCompletedChunks(request, destination) { } 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + 10 === request.status && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2023,9 +2024,9 @@ function enqueueFlush(request) { }, 0)); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), closeWithError(destination, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(destination, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2036,7 +2037,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js index 7c450dac2ab1e..cae7c350bac0e 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js @@ -701,7 +701,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1412,7 +1412,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1538,8 +1538,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2508,13 +2514,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2670,13 +2678,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2703,7 +2710,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3980,16 +3987,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js index 50c0777a59719..97556d6677078 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js @@ -837,7 +837,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1087,7 +1087,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1186,7 +1186,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1207,7 +1207,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1283,8 +1283,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1383,7 +1389,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1482,7 +1488,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1769,8 +1775,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1880,7 +1886,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -2014,19 +2020,18 @@ function flushCompletedChunks(request, destination) { "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2040,9 +2045,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2053,7 +2058,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js index f16eb49b6a762..bb4e5874c39fc 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js @@ -701,7 +701,7 @@ TaintRegistryPendingRequests.add(cleanupQueue); var hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1412,7 +1412,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1538,8 +1538,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2508,13 +2514,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2670,13 +2678,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2703,7 +2710,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( @@ -3945,16 +3952,17 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, + PRERENDER = 21, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = ReactSharedInternalsServer.TaintRegistryByteLengths, TaintRegistryPendingRequests = ReactSharedInternalsServer.TaintRegistryPendingRequests, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, - PRERENDER = 21, currentRequest = null, debugID = null, modelRoot = !1, diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js index 0cabcb2af6a99..ea91b1fd97df0 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js @@ -837,7 +837,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1087,7 +1087,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1186,7 +1186,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1207,7 +1207,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1283,8 +1283,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1383,7 +1389,7 @@ function renderModel(request, task, parent, key, value) { null !== parent && (parent.$$typeof === REACT_ELEMENT_TYPE || parent.$$typeof === REACT_LAZY_TYPE); - if (11 === request.status) { + if (12 === request.status) { task.status = 3; if (21 === request.type) return ( @@ -1482,7 +1488,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1769,8 +1775,8 @@ function fatalError(request, error) { onFatalError(error); cleanupTaintQueue(request); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitPostponeChunk(request, id) { id = id.toString(16) + ":P\n"; @@ -1880,7 +1886,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) + if (12 === request.status) if ( (request.abortableTasks.delete(task), (task.status = 3), @@ -2014,19 +2020,18 @@ function flushCompletedChunks(request, destination) { "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && (cleanupTaintQueue(request), - (request.status = 13), + (request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2040,9 +2045,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -2053,7 +2058,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { if ( diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json index aeffaf0aba521..6fb8ea0655563 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json @@ -64,8 +64,8 @@ "webpack-sources": "^3.2.0" }, "peerDependencies": { - "react": "0.0.0-experimental-206df66e-20240912", - "react-dom": "0.0.0-experimental-206df66e-20240912", + "react": "0.0.0-experimental-f2df5694-20240916", + "react-dom": "0.0.0-experimental-f2df5694-20240916", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js index f22df68029839..83b77ce9275af 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-client.browser.development.js @@ -2307,10 +2307,10 @@ return hook.checkDCE ? !0 : !1; })({ bundleType: 1, - version: "19.0.0-rc-206df66e-20240912", + version: "19.0.0-rc-f2df5694-20240916", rendererPackageName: "react-server-dom-webpack", currentDispatcherRef: ReactSharedInternals, - reconcilerVersion: "19.0.0-rc-206df66e-20240912", + reconcilerVersion: "19.0.0-rc-f2df5694-20240916", getCurrentComponentInfo: function () { return currentOwnerInDEV; } diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js index 25797e2f8a0a2..dfa52a2934125 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js @@ -606,7 +606,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1136,7 +1136,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1256,8 +1256,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2118,13 +2124,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2260,13 +2268,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2281,7 +2288,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3493,9 +3500,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js index beb76d8103cfb..e3caaf10b475c 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js @@ -785,7 +785,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1001,7 +1001,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1100,7 +1100,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1121,7 +1121,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1165,7 +1165,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1256,8 +1256,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1379,7 +1385,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1646,8 +1652,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1744,7 +1750,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1835,17 +1841,16 @@ function flushCompletedChunks(request, destination) { (writtenBytes = 0)); } 0 === request.pendingChunks && - ((request.status = 13), destination.close(), (request.destination = null)); + ((request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - return performWork(request); - }) - : scheduleWork(function () { - return performWork(request); - }); + scheduleMicrotask(function () { + return performWork(request); + }); + scheduleWork(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1860,7 +1865,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -2742,9 +2747,9 @@ exports.renderToReadableStream = function (model, webpackMap, options) { startWork(request); }, pull: function (controller) { - if (12 === request.status) - (request.status = 13), closeWithError(controller, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(controller, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = controller; try { flushCompletedChunks(request, controller); diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js index 33e21c07b0e7a..1d036dcaeb91d 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js @@ -607,7 +607,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1153,7 +1153,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1273,8 +1273,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2146,13 +2152,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2288,21 +2296,16 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + request.status === OPENING && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2317,7 +2320,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3529,9 +3532,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js index c75a8f5e5bf7f..77f4dce6c4782 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js @@ -790,7 +790,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1006,7 +1006,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1105,7 +1105,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1126,7 +1126,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1170,7 +1170,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1261,8 +1261,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1384,7 +1390,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1653,8 +1659,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), closeWithError(request.destination, error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), closeWithError(request.destination, error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1751,7 +1757,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1842,25 +1848,20 @@ function flushCompletedChunks(request, destination) { (writtenBytes = 0)); } 0 === request.pendingChunks && - ((request.status = 13), destination.close(), (request.destination = null)); + ((request.status = 14), destination.close(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? supportsRequestStorage - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : scheduleMicrotask(function () { - return performWork(request); - }) - : supportsRequestStorage - ? setTimeoutOrImmediate(function () { - return requestStorage.run(request, performWork, request); - }, 0) - : setTimeoutOrImmediate(function () { - return performWork(request); - }, 0); + supportsRequestStorage + ? scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }) + : scheduleMicrotask(function () { + return performWork(request); + }); + setTimeoutOrImmediate(function () { + 10 === request.status && (request.status = 11); + }, 0); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1875,7 +1876,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -2759,9 +2760,9 @@ exports.renderToReadableStream = function (model, webpackMap, options) { startWork(request); }, pull: function (controller) { - if (12 === request.status) - (request.status = 13), closeWithError(controller, request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), closeWithError(controller, request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = controller; try { flushCompletedChunks(request, controller); diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js index 4f59bff1c89d8..ffbe637fc5f37 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js @@ -631,7 +631,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1171,7 +1171,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1290,8 +1290,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2148,13 +2154,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2291,13 +2299,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2324,7 +2331,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3541,9 +3548,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js index d3468d76400c5..4f4cec30a7112 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js @@ -806,7 +806,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1021,7 +1021,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1120,7 +1120,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1141,7 +1141,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1185,7 +1185,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1275,8 +1275,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1397,7 +1403,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1663,8 +1669,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1755,7 +1761,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1870,17 +1876,16 @@ function flushCompletedChunks(request, destination) { } "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && - ((request.status = 13), destination.end(), (request.destination = null)); + ((request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1894,9 +1899,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -1907,7 +1912,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js index ff55e31013a32..fd7f79c0dc876 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js @@ -631,7 +631,7 @@ pingedTasks = [], hints = new Set(); this.type = type; - this.status = 10; + this.status = OPENING; this.flushScheduled = !1; this.destination = this.fatalError = null; this.bundlerConfig = bundlerConfig; @@ -1171,7 +1171,7 @@ pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - request.type === PRERENDER + request.type === PRERENDER || request.status === OPENING ? scheduleMicrotask(function () { return performWork(request); }) @@ -1290,8 +1290,14 @@ '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var clientReferenceMetadata = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -2148,13 +2154,15 @@ ); var currentEnv = (0, request.environmentName)(); currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: currentEnv })); emitChunk(request, task, resolvedModel); } else { var json = stringify(resolvedModel), _currentEnv = (0, request.environmentName)(); _currentEnv !== task.environmentName && - emitDebugChunk(request, task.id, { env: _currentEnv }); + (request.pendingChunks++, + emitDebugChunk(request, task.id, { env: _currentEnv })); emitModelChunk(request, task.id, json); } request.abortableTasks.delete(task); @@ -2291,13 +2299,12 @@ } function startWork(request) { request.flushScheduled = null !== request.destination; - request.type === PRERENDER - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + request.status === OPENING && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -2324,7 +2331,7 @@ } function abort(request, reason) { try { - 10 === request.status && (request.status = ABORTING); + 11 >= request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = @@ -3506,9 +3513,10 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - ABORTING = 11, - CLOSING = 12, - CLOSED = 13, + OPENING = 10, + ABORTING = 12, + CLOSING = 13, + CLOSED = 14, PRERENDER = 21, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js index 7dbbcf89fd4ce..46533f22925d0 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js @@ -806,7 +806,7 @@ function serializeThenable(request, task, thenable) { newTask.id ); default: - if (11 === request.status) + if (12 === request.status) return ( request.abortableTasks.delete(newTask), (newTask.status = 3), @@ -1021,7 +1021,7 @@ function renderFunctionComponent(request, task, key, Component, props) { thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (11 === request.status) + if (12 === request.status) throw ( ("object" === typeof Component && null !== Component && @@ -1120,7 +1120,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1141,7 +1141,7 @@ function pingTask(request, task) { pingedTasks.push(task); 1 === pingedTasks.length && ((request.flushScheduled = null !== request.destination), - 21 === request.type + 21 === request.type || 10 === request.status ? scheduleMicrotask(function () { return performWork(request); }) @@ -1185,7 +1185,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { null !== parentPropertyName && (parentPropertyName.$$typeof === REACT_ELEMENT_TYPE || parentPropertyName.$$typeof === REACT_LAZY_TYPE)), - 11 === request.status) + 12 === request.status) ) (task.status = 3), (prevKeyPath = request.fatalError), @@ -1275,8 +1275,14 @@ function serializeClientReference( '" in the React Client Manifest. This is probably a bug in the React Server Components bundler.' ); } + if (!0 === resolvedModuleData.async && !0 === clientReference.$$async) + throw Error( + 'The module "' + + modulePath + + '" is marked as an async ESM module but was loaded as a CJS proxy. This is probably a bug in the React Server Components bundler.' + ); var JSCompiler_inline_result = - !0 === clientReference.$$async + !0 === resolvedModuleData.async || !0 === clientReference.$$async ? [resolvedModuleData.id, resolvedModuleData.chunks, existingId, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, existingId]; request.pendingChunks++; @@ -1397,7 +1403,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (11 === request.status) throw null; + if (12 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1663,8 +1669,8 @@ function fatalError(request, error) { var onFatalError = request.onFatalError; onFatalError(error); null !== request.destination - ? ((request.status = 13), request.destination.destroy(error)) - : ((request.status = 12), (request.fatalError = error)); + ? ((request.status = 14), request.destination.destroy(error)) + : ((request.status = 13), (request.fatalError = error)); } function emitErrorChunk(request, id, digest) { digest = { digest: digest }; @@ -1755,7 +1761,7 @@ function retryTask(request, task) { request.abortableTasks.delete(task); task.status = 1; } catch (thrownValue) { - if (11 === request.status) { + if (12 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model = stringify(serializeByValueID(request.fatalError)); @@ -1870,17 +1876,16 @@ function flushCompletedChunks(request, destination) { } "function" === typeof destination.flush && destination.flush(); 0 === request.pendingChunks && - ((request.status = 13), destination.end(), (request.destination = null)); + ((request.status = 14), destination.end(), (request.destination = null)); } function startWork(request) { request.flushScheduled = null !== request.destination; - 21 === request.type - ? scheduleMicrotask(function () { - requestStorage.run(request, performWork, request); - }) - : setImmediate(function () { - return requestStorage.run(request, performWork, request); - }); + scheduleMicrotask(function () { + requestStorage.run(request, performWork, request); + }); + setImmediate(function () { + 10 === request.status && (request.status = 11); + }); } function enqueueFlush(request) { !1 === request.flushScheduled && @@ -1894,9 +1899,9 @@ function enqueueFlush(request) { })); } function startFlowing(request, destination) { - if (12 === request.status) - (request.status = 13), destination.destroy(request.fatalError); - else if (13 !== request.status && null === request.destination) { + if (13 === request.status) + (request.status = 14), destination.destroy(request.fatalError); + else if (14 !== request.status && null === request.destination) { request.destination = destination; try { flushCompletedChunks(request, destination); @@ -1907,7 +1912,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - 10 === request.status && (request.status = 11); + 11 >= request.status && (request.status = 12); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { var error = diff --git a/packages/next/src/compiled/react-server-dom-webpack/package.json b/packages/next/src/compiled/react-server-dom-webpack/package.json index dfd8f9f7b1cc0..8bb43d7e74bdb 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack/package.json @@ -64,8 +64,8 @@ "webpack-sources": "^3.2.0" }, "peerDependencies": { - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912", + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react/cjs/react.development.js b/packages/next/src/compiled/react/cjs/react.development.js index b73950d4ae08c..6762f10516520 100644 --- a/packages/next/src/compiled/react/cjs/react.development.js +++ b/packages/next/src/compiled/react/cjs/react.development.js @@ -1517,7 +1517,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react/cjs/react.production.js b/packages/next/src/compiled/react/cjs/react.production.js index 87640238d7365..ea0b11e49d9f6 100644 --- a/packages/next/src/compiled/react/cjs/react.production.js +++ b/packages/next/src/compiled/react/cjs/react.production.js @@ -536,4 +536,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/react/cjs/react.react-server.development.js b/packages/next/src/compiled/react/cjs/react.react-server.development.js index 6b720df941a05..2d0be25857c78 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.development.js @@ -1113,5 +1113,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-rc-206df66e-20240912"; + exports.version = "19.0.0-rc-f2df5694-20240916"; })(); diff --git a/packages/next/src/compiled/react/cjs/react.react-server.production.js b/packages/next/src/compiled/react/cjs/react.react-server.production.js index d3cb2a9e14296..05a9651d2ce6c 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.production.js @@ -424,4 +424,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-rc-206df66e-20240912"; +exports.version = "19.0.0-rc-f2df5694-20240916"; diff --git a/packages/next/src/compiled/unistore/unistore.js b/packages/next/src/compiled/unistore/unistore.js index 653370268d9a5..cd8d2d648e80d 100644 --- a/packages/next/src/compiled/unistore/unistore.js +++ b/packages/next/src/compiled/unistore/unistore.js @@ -1 +1 @@ -(()=>{var t={621:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a{var t={157:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a=18'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -5923,12 +5923,12 @@ packages: peerDependencies: '@babel/core': 7.22.5 + babel-plugin-react-compiler@0.0.0-experimental-23b8160-20240916: + resolution: {integrity: sha512-Ou/Jo2dxmTEYOsvsYzykhLMsDDcH+ol8zp5ZzudzQAEia08aqa7lzJf9CC0nh2paPmk1tv7uWlflZYB+PMzljw==} + babel-plugin-react-compiler@0.0.0-experimental-c23de8d-20240515: resolution: {integrity: sha512-0XN2gmpT55QtAz5n7d5g91y1AuO9tRhWBaLgCRyc4ExHrlr7+LfxW+YTb3mOwxngkkiggwM8HyYsaEK9MqhnlQ==} - babel-plugin-react-compiler@0.0.0-experimental-de2cfda-20240912: - resolution: {integrity: sha512-ASAiKVPBNVWe1NHGEpYESYDs41+RzAv/8ZziAgHO3bYtBNwp0+4SeUkMhji5ueRfo1pYtsodnESwgiVGhzf1ZQ==} - babel-plugin-transform-async-to-promises@0.8.15: resolution: {integrity: sha512-fDXP68ZqcinZO2WCiimCL9zhGjGXOnn3D33zvbh+yheZ/qOrNVVDDIBtAaM3Faz8TRvQzHiRKsu3hfrBAhEncQ==} @@ -10367,7 +10367,7 @@ packages: lucide-react@0.383.0: resolution: {integrity: sha512-13xlG0CQCJtzjSQYwwJ3WRqMHtRj3EXmLlorrARt7y+IHnxUCp3XyFNL1DfaGySWxHObDvnu1u1dV+0VMKHUSg==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} @@ -12603,28 +12603,28 @@ packages: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true - react-dom@0.0.0-experimental-206df66e-20240912: - resolution: {integrity: sha512-HXDyMU/69Qx7SxL11r0NgojMAo05A7l0momUx3Mk9lWybS4eaVrwQROyQzC2UbzGWHRrDvinLp7zCak2QOYp9w==} + react-dom@0.0.0-experimental-f2df5694-20240916: + resolution: {integrity: sha512-x+s5ye6ybJiKwPErflc3F/QlAwz6W+yqdJ9ruY7+J+CTcaEmTPfD1BpZpx2g8kqitZ3/NbCDYs/v255hRdYOeA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-dom@17.0.2: resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 - react-dom@19.0.0-rc-206df66e-20240912: - resolution: {integrity: sha512-HT04eBSwoBW0vkoo3wpUvHTr28fTP3kOPGNFMRT2O+gkxGX8at1LvI0/0WpcLObuLfVTbD/044N+BXyztZhomw==} + react-dom@19.0.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-z5bmlgbhXEUNO902dKEuy61Lk/6E06ESsufiIdykddfyhggoRd/0GSZiUH12bGnwmzMnojICk2yI3yNpPIwpCw==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-dom@19.0.0-rc-f90a6bcc-20240827: resolution: {integrity: sha512-oUa/reDvGtjRcxi8u+GYHaDHanudaO28+G+Wvxm50CItW1xwIFN2Nn7foJxxDS9lFLGdRWZvjxldZEPAUSuXbg==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 - react-is@19.0.0-rc-206df66e-20240912: - resolution: {integrity: sha512-66tiUNmtqxj6STEuPiswK9RpGt+due5Pc1+YtTagQOkbxQE5PizXoLN+7ASF/2hg3VMdIRkqNEWL46JRYxWdHQ==} + react-is@19.0.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-mcnnburfOhLFQyM9KhSrv9wvftReH3KAyGLJhPImww2LL68F7GD+QbGGOu74LZgfmTGJhgGuG/KaZYk0XJfQ1g==} react-is@19.0.0-rc-f90a6bcc-20240827: resolution: {integrity: sha512-1tXoLFzVbqHAQeY3CwpyF5IYbkwgSoNHhrhS8qOrfiZIh2461h/C1BP/JVIxwyL51wHhUgLsAc/M8g0OcEhV1A==} @@ -12635,8 +12635,8 @@ packages: react-number-format@5.4.0: resolution: {integrity: sha512-NWdICrqLhI7rAS8yUeLVd6Wr4cN7UjJ9IBTS0f/a9i7UB4x4Ti70kGnksBtZ7o4Z7YRbvCMMR/jQmkoOBa/4fg==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 react-refresh@0.12.0: resolution: {integrity: sha512-suLIhrU2IHKL5JEKR/fAwJv7bbeq4kJ+pJopf77jHwuR+HmJS/HbrPIGsTBUVfw7tXPOmYv7UJ7PCaN49e8x4A==} @@ -12647,7 +12647,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -12657,58 +12657,58 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true - react-server-dom-turbopack@0.0.0-experimental-206df66e-20240912: - resolution: {integrity: sha512-5jAIvhup1HV24UoAUFbxZ6PgymX5kNaNIxxzNinupUEdwQ2vPmwX8qWCfGFdv29fuae+CtaG3kYqIYXrnXSbQA==} + react-server-dom-turbopack@0.0.0-experimental-f2df5694-20240916: + resolution: {integrity: sha512-MOPO/Jw5rFfJ9KbkonXGzcF/dWfazGFuGaVDb2RioW0DLDZ5Tqp4cvvDBs/hW9qbgtrtHe1fErRpPom8RTN6Yw==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 - react-server-dom-turbopack@19.0.0-rc-206df66e-20240912: - resolution: {integrity: sha512-gniGLlDp9HRXsFENNlj0uk1K0U04Le/Umtz8uJY8tkJ9ja9l4EAtX6CRipOSiFEKpyYu/87LVZTMMSHI+Cyyzg==} + react-server-dom-turbopack@19.0.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-cnSfBRoBVuuUOKBMc5y6ON7k20whaoLv+NsIlGx4UyLMLBb4FyrWYfjvK5UVa07N6yE72pJuKG8dMIiVdnxAsQ==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 - react-server-dom-webpack@0.0.0-experimental-206df66e-20240912: - resolution: {integrity: sha512-VHSmf+kq07pUr1CVOn97Y01SVMRx7ZqW5NPziCnbDKEeLngEkRm4wROcqEkVlwuBnlGvettA4dicw5IoJp9u6Q==} + react-server-dom-webpack@0.0.0-experimental-f2df5694-20240916: + resolution: {integrity: sha512-RsPqDiL5JW1kTPmtS8CnH1vHLj6sbHrxLLS837rOG3BTeiXlBLqX0GIPLEXZOoEHw2/0tX0yukvB9IowfOr3aw==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 webpack: 5.90.0 - react-server-dom-webpack@19.0.0-rc-206df66e-20240912: - resolution: {integrity: sha512-+CupanR85OecCL6T8/BF8si30U8wUriRjMqEEH4FNtNrJl9gZ9Hnte/ZvPR9brDfLXVdm3LsPrPWp4GjrtrhlA==} + react-server-dom-webpack@19.0.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-UhtCHuIp1iE6deBwin/iZJyv4tUqp8pbs2EsYe+cPf0yjwk/CcS98ZFHDNSMKaGNJLRcic25rzl8AlJrqcWkrA==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 webpack: 5.90.0 react-shallow-renderer@16.15.0: resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-ssr-prepass@1.0.8: resolution: {integrity: sha512-O0gfRA1SaK+9ITKxqfnXsej2jF+OHGP/+GxD4unROQaM/0/UczGF9fuF+wTboxaQoKdIf4FvS3h/OigWh704VA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-is: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-is: 19.0.0-rc-f2df5694-20240916 react-style-singleton@2.2.1: resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -12716,30 +12716,30 @@ packages: react-test-renderer@18.2.0: resolution: {integrity: sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-textarea-autosize@8.5.3: resolution: {integrity: sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==} engines: {node: '>=10'} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-virtualized@9.22.3: resolution: {integrity: sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 - react@0.0.0-experimental-206df66e-20240912: - resolution: {integrity: sha512-ERcs/OYN1zu/SF70ZYZ+0FatWLpGI39/seNTGlC5tbfz9SD3+wVGsSe2NQ2PL132P14mYne+/govBXJ0uPDA+g==} + react@0.0.0-experimental-f2df5694-20240916: + resolution: {integrity: sha512-j11MK88S6/x/BsCYtLb/TppmWpvEHoAzFXGF5UmscDKGkUBI0POY5eDA2Ab3wxnhG9URwh/5t2DkIFSNYHCFyg==} engines: {node: '>=0.10.0'} react@17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} engines: {node: '>=0.10.0'} - react@19.0.0-rc-206df66e-20240912: - resolution: {integrity: sha512-jGaTINz9o42gjsLcEuHLGqp6J/97vIX1bMgpVYCM8WHVI7O+g2wkudlODszpEn2YrrQB1vBXlQjGgGRbJUdyow==} + react@19.0.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-nGf0C1nmtK44uZVBGB1i320+oZpIL4YibvcDUpKQu/2wR/giIydwzVyx4mjsWRXbYDoyX240F04tHoYLTT2a2w==} engines: {node: '>=0.10.0'} react@19.0.0-rc-f90a6bcc-20240827: @@ -13267,11 +13267,11 @@ packages: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} - scheduler@0.0.0-experimental-206df66e-20240912: - resolution: {integrity: sha512-62YiU0QClSggyIQMsuVU+KY2S033Pz1UGNWpgwPRLN2MKl8YR4ysq5kBnFYIJ5jMBX+iisKocIFJ4gmCT/F0Cg==} + scheduler@0.0.0-experimental-f2df5694-20240916: + resolution: {integrity: sha512-S9QCFZ2M29kV480XZT8Ftx9nsEhQH90OQ88veBrcJFRZBLuWfXZ+aMurkgIksyDx+KihHcIZYnnW4TYugz2k1g==} - scheduler@0.25.0-rc-206df66e-20240912: - resolution: {integrity: sha512-5jBhjAvvoH3tf/LdrbqWggN8njR4Y2gD3XsT93Eer2WwjKYR2MekGWmfLtmbgqoCP9upnme0nMsGnKJ7R4hmmg==} + scheduler@0.25.0-rc-f2df5694-20240916: + resolution: {integrity: sha512-Gn75L9/3lldtLjFYgpsweYP3726xP/cgr23dsD6UZlLHc6RbkPbWiChQOfNuq21r8qManuD8p9hAHpXvtlvvbQ==} schema-utils@2.7.1: resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==} @@ -13845,8 +13845,8 @@ packages: engines: {node: '>= 16'} peerDependencies: babel-plugin-styled-components: '>= 2' - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: babel-plugin-styled-components: optional: true @@ -13860,7 +13860,7 @@ packages: peerDependencies: '@babel/core': '*' babel-plugin-macros: '*' - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@babel/core': optional: true @@ -13937,7 +13937,7 @@ packages: swr@2.2.4: resolution: {integrity: sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 symbol-observable@1.0.1: resolution: {integrity: sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==} @@ -14675,7 +14675,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -14683,13 +14683,13 @@ packages: use-composed-ref@1.3.0: resolution: {integrity: sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 use-isomorphic-layout-effect@1.1.2: resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -14698,7 +14698,7 @@ packages: resolution: {integrity: sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==} peerDependencies: '@types/react': '*' - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -14708,7 +14708,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 peerDependenciesMeta: '@types/react': optional: true @@ -14716,7 +14716,7 @@ packages: use-sync-external-store@1.2.0: resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 use@3.1.1: resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==} @@ -17104,17 +17104,17 @@ snapshots: '@emotion/memoize@0.8.1': {} - '@emotion/react@11.11.1(react@19.0.0-rc-206df66e-20240912)(types-react@19.0.0-rc.0)': + '@emotion/react@11.11.1(react@19.0.0-rc-f2df5694-20240916)(types-react@19.0.0-rc.0)': dependencies: '@babel/runtime': 7.22.5 '@emotion/babel-plugin': 11.11.0 '@emotion/cache': 11.11.0 '@emotion/serialize': 1.1.2 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@19.0.0-rc-206df66e-20240912) + '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@19.0.0-rc-f2df5694-20240916) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 hoist-non-react-statics: 3.3.2 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 optionalDependencies: '@types/react': types-react@19.0.0-rc.0 @@ -17130,9 +17130,9 @@ snapshots: '@emotion/unitless@0.8.1': {} - '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@19.0.0-rc-206df66e-20240912)': + '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@19.0.0-rc-f2df5694-20240916)': dependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 '@emotion/utils@1.2.1': {} @@ -18492,11 +18492,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@mdx-js/react@2.2.1(react@19.0.0-rc-206df66e-20240912)': + '@mdx-js/react@2.2.1(react@19.0.0-rc-f2df5694-20240916)': dependencies: '@types/mdx': 2.0.3 '@types/react': types-react@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 '@mdx-js/react@2.2.1(react@19.0.0-rc-f90a6bcc-20240827)': dependencies: @@ -19315,13 +19315,13 @@ snapshots: '@types/jest': 29.5.5 jest: 29.7.0(@types/node@20.12.3)(babel-plugin-macros@3.1.0) - '@testing-library/react@15.0.7(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912)(types-react@19.0.0-rc.0)': + '@testing-library/react@15.0.7(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916)(types-react@19.0.0-rc.0)': dependencies: '@babel/runtime': 7.22.5 '@testing-library/dom': 10.1.0 '@types/react-dom': types-react-dom@19.0.0-rc.0 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) optionalDependencies: '@types/react': types-react@19.0.0-rc.0 @@ -20569,7 +20569,7 @@ snapshots: transitivePeerDependencies: - supports-color - babel-plugin-react-compiler@0.0.0-experimental-c23de8d-20240515: + babel-plugin-react-compiler@0.0.0-experimental-23b8160-20240916: dependencies: '@babel/generator': 7.2.0 '@babel/types': 7.22.5 @@ -20579,7 +20579,7 @@ snapshots: zod: 3.23.8 zod-validation-error: 2.1.0(zod@3.23.8) - babel-plugin-react-compiler@0.0.0-experimental-de2cfda-20240912: + babel-plugin-react-compiler@0.0.0-experimental-c23de8d-20240515: dependencies: '@babel/generator': 7.2.0 '@babel/types': 7.22.5 @@ -24248,7 +24248,7 @@ snapshots: hoist-non-react-statics@3.3.2: dependencies: - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 homedir-polyfill@1.0.3: dependencies: @@ -28685,25 +28685,25 @@ snapshots: '@jest/types': 24.9.0 ansi-regex: 4.1.0 ansi-styles: 3.2.1 - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 pretty-format@27.5.1: dependencies: ansi-regex: 5.0.1 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 pretty-format@29.5.0: dependencies: '@jest/schemas': 29.4.3 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 pretty-format@29.7.0: dependencies: '@jest/schemas': 29.6.3 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 pretty-ms@7.0.0: dependencies: @@ -28760,7 +28760,7 @@ snapshots: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react-is: 19.0.0-rc-206df66e-20240912 + react-is: 19.0.0-rc-f2df5694-20240916 property-information@5.6.0: dependencies: @@ -28932,29 +28932,29 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 - react-dom@0.0.0-experimental-206df66e-20240912(react@19.0.0-rc-206df66e-20240912): + react-dom@0.0.0-experimental-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916): dependencies: - react: 19.0.0-rc-206df66e-20240912 - scheduler: 0.25.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + scheduler: 0.25.0-rc-f2df5694-20240916 - react-dom@17.0.2(react@19.0.0-rc-206df66e-20240912): + react-dom@17.0.2(react@19.0.0-rc-f2df5694-20240916): dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react: 19.0.0-rc-206df66e-20240912 - scheduler: 0.25.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + scheduler: 0.25.0-rc-f2df5694-20240916 - react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912): + react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916): dependencies: - react: 19.0.0-rc-206df66e-20240912 - scheduler: 0.25.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + scheduler: 0.25.0-rc-f2df5694-20240916 react-dom@19.0.0-rc-f90a6bcc-20240827(react@19.0.0-rc-f90a6bcc-20240827): dependencies: react: 19.0.0-rc-f90a6bcc-20240827 - scheduler: 0.25.0-rc-206df66e-20240912 + scheduler: 0.25.0-rc-f2df5694-20240916 - react-is@19.0.0-rc-206df66e-20240912: {} + react-is@19.0.0-rc-f2df5694-20240916: {} react-is@19.0.0-rc-f90a6bcc-20240827: {} @@ -28987,48 +28987,48 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - react-server-dom-turbopack@0.0.0-experimental-206df66e-20240912(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912): + react-server-dom-turbopack@0.0.0-experimental-f2df5694-20240916(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) - react-server-dom-turbopack@19.0.0-rc-206df66e-20240912(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912): + react-server-dom-turbopack@19.0.0-rc-f2df5694-20240916(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) - react-server-dom-webpack@0.0.0-experimental-206df66e-20240912(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13))): + react-server-dom-webpack@0.0.0-experimental-f2df5694-20240916(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13))): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) webpack: 5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13)) webpack-sources: 3.2.3(patch_hash=jbynf5dc46ambamq3wuyho6hkq) - react-server-dom-webpack@19.0.0-rc-206df66e-20240912(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13))): + react-server-dom-webpack@19.0.0-rc-f2df5694-20240916(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13))): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) webpack: 5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.13)) webpack-sources: 3.2.3(patch_hash=jbynf5dc46ambamq3wuyho6hkq) - react-shallow-renderer@16.15.0(react@19.0.0-rc-206df66e-20240912): + react-shallow-renderer@16.15.0(react@19.0.0-rc-f2df5694-20240916): dependencies: object-assign: 4.1.1 - react: 19.0.0-rc-206df66e-20240912 - react-is: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-is: 19.0.0-rc-f2df5694-20240916 - react-ssr-prepass@1.0.8(react-is@19.0.0-rc-f90a6bcc-20240827)(react@19.0.0-rc-206df66e-20240912): + react-ssr-prepass@1.0.8(react-is@19.0.0-rc-f90a6bcc-20240827)(react@19.0.0-rc-f2df5694-20240916): dependencies: object-is: 1.0.2 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 react-is: 19.0.0-rc-f90a6bcc-20240827 react-style-singleton@2.2.1(react@19.0.0-rc-f90a6bcc-20240827)(types-react@19.0.0-rc.0): @@ -29040,12 +29040,12 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - react-test-renderer@18.2.0(react@19.0.0-rc-206df66e-20240912): + react-test-renderer@18.2.0(react@19.0.0-rc-f2df5694-20240916): dependencies: - react: 19.0.0-rc-206df66e-20240912 - react-is: 19.0.0-rc-206df66e-20240912 - react-shallow-renderer: 16.15.0(react@19.0.0-rc-206df66e-20240912) - scheduler: 0.25.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 + react-is: 19.0.0-rc-f2df5694-20240916 + react-shallow-renderer: 16.15.0(react@19.0.0-rc-f2df5694-20240916) + scheduler: 0.25.0-rc-f2df5694-20240916 react-textarea-autosize@8.5.3(react@19.0.0-rc-f90a6bcc-20240827)(types-react@19.0.0-rc.0): dependencies: @@ -29056,25 +29056,25 @@ snapshots: transitivePeerDependencies: - '@types/react' - react-virtualized@9.22.3(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912): + react-virtualized@9.22.3(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916): dependencies: '@babel/runtime': 7.22.5 clsx: 1.1.1 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) react-lifecycles-compat: 3.0.4 - react@0.0.0-experimental-206df66e-20240912: {} + react@0.0.0-experimental-f2df5694-20240916: {} react@17.0.2: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react@19.0.0-rc-206df66e-20240912: {} + react@19.0.0-rc-f2df5694-20240916: {} react@19.0.0-rc-f90a6bcc-20240827: {} @@ -29763,9 +29763,9 @@ snapshots: dependencies: xmlchars: 2.2.0 - scheduler@0.0.0-experimental-206df66e-20240912: {} + scheduler@0.0.0-experimental-f2df5694-20240916: {} - scheduler@0.25.0-rc-206df66e-20240912: {} + scheduler@0.25.0-rc-f2df5694-20240916: {} schema-utils@2.7.1: dependencies: @@ -30417,7 +30417,7 @@ snapshots: dependencies: inline-style-parser: 0.1.1 - styled-components@6.0.0-rc.3(react-dom@19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912))(react@19.0.0-rc-206df66e-20240912): + styled-components@6.0.0-rc.3(react-dom@19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916))(react@19.0.0-rc-f2df5694-20240916): dependencies: '@babel/cli': 7.21.5(@babel/core@7.22.5) '@babel/core': 7.22.5 @@ -30432,8 +30432,8 @@ snapshots: '@emotion/unitless': 0.8.1 css-to-react-native: 3.2.0 postcss: 8.4.31 - react: 19.0.0-rc-206df66e-20240912 - react-dom: 19.0.0-rc-206df66e-20240912(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + react-dom: 19.0.0-rc-f2df5694-20240916(react@19.0.0-rc-f2df5694-20240916) shallowequal: 1.1.0 stylis: 4.2.0 tslib: 2.5.3 @@ -30445,10 +30445,10 @@ snapshots: postcss: 7.0.32 postcss-load-plugins: 2.3.0 - styled-jsx@5.1.6(@babel/core@7.22.5)(babel-plugin-macros@3.1.0)(react@19.0.0-rc-206df66e-20240912): + styled-jsx@5.1.6(@babel/core@7.22.5)(babel-plugin-macros@3.1.0)(react@19.0.0-rc-f2df5694-20240916): dependencies: client-only: 0.0.1 - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 optionalDependencies: '@babel/core': 7.22.5 babel-plugin-macros: 3.1.0 @@ -30538,11 +30538,11 @@ snapshots: picocolors: 1.0.1 stable: 0.1.8 - swr@2.2.4(react@19.0.0-rc-206df66e-20240912): + swr@2.2.4(react@19.0.0-rc-f2df5694-20240916): dependencies: client-only: 0.0.1 - react: 19.0.0-rc-206df66e-20240912 - use-sync-external-store: 1.2.0(react@19.0.0-rc-206df66e-20240912) + react: 19.0.0-rc-f2df5694-20240916 + use-sync-external-store: 1.2.0(react@19.0.0-rc-f2df5694-20240916) symbol-observable@1.0.1: {} @@ -31227,9 +31227,9 @@ snapshots: unist-util-is: 5.2.0 unist-util-visit-parents: 5.1.3 - unistore@3.4.1(react@19.0.0-rc-206df66e-20240912): + unistore@3.4.1(react@19.0.0-rc-f2df5694-20240916): optionalDependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 universal-github-app-jwt@1.1.1: dependencies: @@ -31354,9 +31354,9 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - use-sync-external-store@1.2.0(react@19.0.0-rc-206df66e-20240912): + use-sync-external-store@1.2.0(react@19.0.0-rc-f2df5694-20240916): dependencies: - react: 19.0.0-rc-206df66e-20240912 + react: 19.0.0-rc-f2df5694-20240916 use@3.1.1: {} diff --git a/run-tests.js b/run-tests.js index b71359fa4f666..377969896666c 100644 --- a/run-tests.js +++ b/run-tests.js @@ -20,7 +20,7 @@ const { getTestFilter } = require('./test/get-test-filter') // Do not rename or format. sync-react script relies on this line. // prettier-ignore -const nextjsReactPeerVersion = "19.0.0-rc-206df66e-20240912"; +const nextjsReactPeerVersion = "19.0.0-rc-f2df5694-20240916"; let argv = require('yargs/yargs')(process.argv.slice(2)) .string('type') diff --git a/test/.stats-app/package.json b/test/.stats-app/package.json index 27788705b6c0d..085c93309edc6 100644 --- a/test/.stats-app/package.json +++ b/test/.stats-app/package.json @@ -4,8 +4,8 @@ "license": "MIT", "dependencies": { "next": "latest", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916" }, "engines": { "node": ">=18.18.0" diff --git a/test/e2e/next-test/first-time-setup-js/package.json b/test/e2e/next-test/first-time-setup-js/package.json index d8451df5fe06a..26f09d68e1c8d 100644 --- a/test/e2e/next-test/first-time-setup-js/package.json +++ b/test/e2e/next-test/first-time-setup-js/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916" } } diff --git a/test/e2e/next-test/first-time-setup-ts/package.json b/test/e2e/next-test/first-time-setup-ts/package.json index d9b6d09570048..2a3d7dcd92505 100644 --- a/test/e2e/next-test/first-time-setup-ts/package.json +++ b/test/e2e/next-test/first-time-setup-ts/package.json @@ -8,8 +8,8 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-206df66e-20240912", - "react-dom": "19.0.0-rc-206df66e-20240912" + "react": "19.0.0-rc-f2df5694-20240916", + "react-dom": "19.0.0-rc-f2df5694-20240916" }, "devDependencies": { "@types/react": "^18", diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts index ed2ff87feab2d..cbc4a51ebb816 100644 --- a/test/lib/next-modes/base.ts +++ b/test/lib/next-modes/base.ts @@ -51,7 +51,7 @@ type OmitFirstArgument = F extends ( // Do not rename or format. sync-react script relies on this line. // prettier-ignore -const nextjsReactPeerVersion = "19.0.0-rc-206df66e-20240912"; +const nextjsReactPeerVersion = "19.0.0-rc-f2df5694-20240916"; export class NextInstance { protected files: FileRef | { [filename: string]: string | FileRef }