Uh oh!
There was an error while loading. Please reload this page.
Unify RootDidNotComplete and RootSuspendedWithDelay exit path - #31547
Merged
Conversation
Both now go through finishConcurrentRender (which is not just for concurrent).
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
sebmarkbage
commented
Nov 15, 2024
| // cases where need to exit the current render without producing a | ||
| // consistent tree or committing. | ||
| const didAttemptEntireTree = !workInProgressRootDidSkipSuspendedSiblings; | ||
| markRootSuspended(root, lanes, NoLane, didAttemptEntireTree); |
ContributorAuthor
There was a problem hiding this comment.
In the else branch we just fall through to finishConcurrentRender since we won't be concurrent and it doesn't match the explicit exitStatus checks.
Therefore we enter the same path as RootSuspendedWithDelay and we can use the same code path.
sebmarkbage
commented
Nov 15, 2024
| didAttemptEntireTree, | ||
| ); | ||
| return; | ||
| if (!includesOnlyTransitions(lanes)) { |
ContributorAuthor
There was a problem hiding this comment.
This is the subtle difference that RootSuspendedWithDelay checks the lanes but maybe we should just do that before setting the flag in the first place?
react-sizebot
commented
Nov 15, 2024
Comparing: 63cde684f5340b1ca73f6244501aac1c3d2c92a8...8f8b017e931852d43d5ad7291481797d6f66ee55 Critical size changesIncludes critical production bundles, as well as any change greater than 2%:
Significant size changesIncludes any change greater than 0.2%: (No significant changes) |
acdlite
approved these changes
Nov 15, 2024
This was referenced Dec 4, 2024
cipolleschi added a commit
to cipolleschi/metro
that referenced
this pull request
Dec 11, 2024
Summary: X-link: react/react-native#48196 - **[372ec00c03](react/react@372ec00c03 )**: Update ReactDebugInfo types to declare timing info separately ([#31714](react/react#31714)) //<Sebastian Markbåge>// - **[3d2ab01a55](react/react@3d2ab01a55 )**: [Flight] Extract special cases for Server Component return value position ([#31713](react/react#31713)) //<Sebastian Markbåge>// - **[1c9b138714](react/react@1c9b138714 )**: Don't serialize chunk ids for Hint and Console rows ([#31671](react/react#31671)) //<Sebastian Markbåge>// - **[de68d2f4a2](react/react@de68d2f4a2 )**: Register Suspense retry handlers in commit phase ([#31667](react/react#31667)) //<Josh Story>// - **[16d2bbbd1f](react/react@16d2bbbd1f )**: Client render dehydrated Suspense boundaries on document load ([#31620](react/react#31620)) //<Josh Story>// - **[5b0ef217ef](react/react@5b0ef217ef )**: s/server action/server function ([#31005](react/react#31005)) //<Ricky>// - **[e3b7ef32be](react/react@e3b7ef32be )**: [crud] Only export uRC when flag is enabled ([#31617](react/react#31617)) //<lauren>// - **[aba370f1e4](react/react@aba370f1e4 )**: Add moveBefore Experiment ([#31596](react/react#31596)) //<Sebastian Markbåge>// - **[1345c37941](react/react@1345c37941 )**: Mark all lanes in order on every new render ([#31615](react/react#31615)) //<Sebastian Markbåge>// - **[91061073d5](react/react@91061073d5 )**: Mark ping time as update ([#31611](react/react#31611)) //<Sebastian Markbåge>// - **[a9f14cb44e](react/react@a9f14cb44e )**: Fix Logging of Immediately Resolved Promises ([#31610](react/react#31610)) //<Sebastian Markbåge>// - **[c11c9510fa](react/react@c11c9510fa )**: [crud] Fix deps comparison bug ([#31599](react/react#31599)) //<lauren>// - **[64f89510af](react/react@64f89510af )**: [crud] Enable on RTR FB builds ([#31590](react/react#31590)) //<lauren>// - **[7558ffe84d](react/react@7558ffe84d )**: [crud] Fix copy paste typo ([#31588](react/react#31588)) //<lauren>// - **[7c254b6576](react/react@7c254b6576 )**: Log yielded time in the Component Track ([#31563](react/react#31563)) //<Sebastian Markbåge>// - **[6177b18c66](react/react@6177b18c66 )**: Track suspended time when the render doesn't commit because it suspended ([#31552](react/react#31552)) //<Sebastian Markbåge>// - **[eaf2d5c670](react/react@eaf2d5c670 )**: fix[eslint-plugin-react-hooks]: Fix error when callback argument is an identifier with an `as` expression ([#31119](react/react#31119)) //<Mark Skelton>// - **[047d95e85f](react/react@047d95e85f )**: [crud] Basic implementation ([#31523](react/react#31523)) //<lauren>// - **[92c0f5f85f](react/react@92c0f5f85f )**: Track separate SuspendedOnAction flag by rethrowing a separate SuspenseActionException sentinel ([#31554](react/react#31554)) //<Sebastian Markbåge>// - **[053b3cb050](react/react@053b3cb050 )**: [crud] Rename Effect type ([#31557](react/react#31557)) //<lauren>// - **[7dd6b9e68a](react/react@7dd6b9e68a )**: [crud] Add enableUseResourceEffectHook flag ([#31556](react/react#31556)) //<lauren>// - **[d8afd1c82e](react/react@d8afd1c82e )**: [crud] Scaffold initial types ([#31555](react/react#31555)) //<lauren>// - **[3720870a97](react/react@3720870a97 )**: Log Render Phases that Never Committed ([#31548](react/react#31548)) //<Sebastian Markbåge>// - **[8a41d6ceab](react/react@8a41d6ceab )**: Unify RootDidNotComplete and RootSuspendedWithDelay exit path ([#31547](react/react#31547)) //<Sebastian Markbåge>// - **[63cde684f5](react/react@63cde684f5 )**: (chore): copy fix in <style> precedence error ([#31524](react/react#31524)) //<Zack Tanner>// - **[b01722d585](react/react@b01722d585 )**: Format event with "warning" yellow and prefix with "Event: " ([#31536](react/react#31536)) //<Sebastian Markbåge>// - **[c13986da78](react/react@c13986da78 )**: Fix Overlapping "message" Bug in Performance Track ([#31528](react/react#31528)) //<Sebastian Markbåge>// - **[4686872159](react/react@4686872159 )**: Log passive commit phase when it wasn't delayed ([#31526](react/react#31526)) //<Sebastian Markbåge>// - **[5d89471ca6](react/react@5d89471ca6 )**: Export __COMPILER_RUNTIME in stable ([#31540](react/react#31540)) //<lauren>// - **[3644f0bd21](react/react@3644f0bd21 )**: Use completedRenderEndTime as the start of the commit phase if it's an immediate commit ([#31527](react/react#31527)) //<Sebastian Markbåge>// - **[8657869999](react/react@8657869999 )**: Separate Tracks for Components and Phases ([#31525](react/react#31525)) //<Sebastian Markbåge>// - **[b15135b9f5](react/react@b15135b9f5 )**: [ez] Update useMemoCache return type ([#31539](react/react#31539)) //<lauren>// Changelog: [General][Changed] - Bump React from 18.3.1 to 19.0.0 jest_e2e[run_all_tests] Reviewed By: cortinico Differential Revision: D67018480
facebook-github-bot pushed a commit
to react/metro
that referenced
this pull request
Dec 16, 2024
Summary: X-link: react/react-native#48196 Pull Request resolved: #1400 - **[372ec00c03](react/react@372ec00c03 )**: Update ReactDebugInfo types to declare timing info separately ([#31714](react/react#31714)) //<Sebastian Markbåge>// - **[3d2ab01a55](react/react@3d2ab01a55 )**: [Flight] Extract special cases for Server Component return value position ([#31713](react/react#31713)) //<Sebastian Markbåge>// - **[1c9b138714](react/react@1c9b138714 )**: Don't serialize chunk ids for Hint and Console rows ([#31671](react/react#31671)) //<Sebastian Markbåge>// - **[de68d2f4a2](react/react@de68d2f4a2 )**: Register Suspense retry handlers in commit phase ([#31667](react/react#31667)) //<Josh Story>// - **[16d2bbbd1f](react/react@16d2bbbd1f )**: Client render dehydrated Suspense boundaries on document load ([#31620](react/react#31620)) //<Josh Story>// - **[5b0ef217ef](react/react@5b0ef217ef )**: s/server action/server function ([#31005](react/react#31005)) //<Ricky>// - **[e3b7ef32be](react/react@e3b7ef32be )**: [crud] Only export uRC when flag is enabled ([#31617](react/react#31617)) //<lauren>// - **[aba370f1e4](react/react@aba370f1e4 )**: Add moveBefore Experiment ([#31596](react/react#31596)) //<Sebastian Markbåge>// - **[1345c37941](react/react@1345c37941 )**: Mark all lanes in order on every new render ([#31615](react/react#31615)) //<Sebastian Markbåge>// - **[91061073d5](react/react@91061073d5 )**: Mark ping time as update ([#31611](react/react#31611)) //<Sebastian Markbåge>// - **[a9f14cb44e](react/react@a9f14cb44e )**: Fix Logging of Immediately Resolved Promises ([#31610](react/react#31610)) //<Sebastian Markbåge>// - **[c11c9510fa](react/react@c11c9510fa )**: [crud] Fix deps comparison bug ([#31599](react/react#31599)) //<lauren>// - **[64f89510af](react/react@64f89510af )**: [crud] Enable on RTR FB builds ([#31590](react/react#31590)) //<lauren>// - **[7558ffe84d](react/react@7558ffe84d )**: [crud] Fix copy paste typo ([#31588](react/react#31588)) //<lauren>// - **[7c254b6576](react/react@7c254b6576 )**: Log yielded time in the Component Track ([#31563](react/react#31563)) //<Sebastian Markbåge>// - **[6177b18c66](react/react@6177b18c66 )**: Track suspended time when the render doesn't commit because it suspended ([#31552](react/react#31552)) //<Sebastian Markbåge>// - **[eaf2d5c670](react/react@eaf2d5c670 )**: fix[eslint-plugin-react-hooks]: Fix error when callback argument is an identifier with an `as` expression ([#31119](react/react#31119)) //<Mark Skelton>// - **[047d95e85f](react/react@047d95e85f )**: [crud] Basic implementation ([#31523](react/react#31523)) //<lauren>// - **[92c0f5f85f](react/react@92c0f5f85f )**: Track separate SuspendedOnAction flag by rethrowing a separate SuspenseActionException sentinel ([#31554](react/react#31554)) //<Sebastian Markbåge>// - **[053b3cb050](react/react@053b3cb050 )**: [crud] Rename Effect type ([#31557](react/react#31557)) //<lauren>// - **[7dd6b9e68a](react/react@7dd6b9e68a )**: [crud] Add enableUseResourceEffectHook flag ([#31556](react/react#31556)) //<lauren>// - **[d8afd1c82e](react/react@d8afd1c82e )**: [crud] Scaffold initial types ([#31555](react/react#31555)) //<lauren>// - **[3720870a97](react/react@3720870a97 )**: Log Render Phases that Never Committed ([#31548](react/react#31548)) //<Sebastian Markbåge>// - **[8a41d6ceab](react/react@8a41d6ceab )**: Unify RootDidNotComplete and RootSuspendedWithDelay exit path ([#31547](react/react#31547)) //<Sebastian Markbåge>// - **[63cde684f5](react/react@63cde684f5 )**: (chore): copy fix in <style> precedence error ([#31524](react/react#31524)) //<Zack Tanner>// - **[b01722d585](react/react@b01722d585 )**: Format event with "warning" yellow and prefix with "Event: " ([#31536](react/react#31536)) //<Sebastian Markbåge>// - **[c13986da78](react/react@c13986da78 )**: Fix Overlapping "message" Bug in Performance Track ([#31528](react/react#31528)) //<Sebastian Markbåge>// - **[4686872159](react/react@4686872159 )**: Log passive commit phase when it wasn't delayed ([#31526](react/react#31526)) //<Sebastian Markbåge>// - **[5d89471ca6](react/react@5d89471ca6 )**: Export __COMPILER_RUNTIME in stable ([#31540](react/react#31540)) //<lauren>// - **[3644f0bd21](react/react@3644f0bd21 )**: Use completedRenderEndTime as the start of the commit phase if it's an immediate commit ([#31527](react/react#31527)) //<Sebastian Markbåge>// - **[8657869999](react/react@8657869999 )**: Separate Tracks for Components and Phases ([#31525](react/react#31525)) //<Sebastian Markbåge>// - **[b15135b9f5](react/react@b15135b9f5 )**: [ez] Update useMemoCache return type ([#31539](react/react#31539)) //<lauren>// Changelog: [General][Changed] - Bump React from 18.3.1 to 19.0.0 bypass-github-export-checks jest_e2e[run_all_tests] Reviewed By: cortinico Differential Revision: D67018480 fbshipit-source-id: 39bca3261ffaa8bb7d74187510724d77cc36b196
facebook-github-bot pushed a commit
to react/react-native
that referenced
this pull request
Dec 16, 2024
Summary: Pull Request resolved: #48196 X-link: react/metro#1400 - **[372ec00c03](react/react@372ec00c03 )**: Update ReactDebugInfo types to declare timing info separately ([#31714](react/react#31714)) //<Sebastian Markbåge>// - **[3d2ab01a55](react/react@3d2ab01a55 )**: [Flight] Extract special cases for Server Component return value position ([#31713](react/react#31713)) //<Sebastian Markbåge>// - **[1c9b138714](react/react@1c9b138714 )**: Don't serialize chunk ids for Hint and Console rows ([#31671](react/react#31671)) //<Sebastian Markbåge>// - **[de68d2f4a2](react/react@de68d2f4a2 )**: Register Suspense retry handlers in commit phase ([#31667](react/react#31667)) //<Josh Story>// - **[16d2bbbd1f](react/react@16d2bbbd1f )**: Client render dehydrated Suspense boundaries on document load ([#31620](react/react#31620)) //<Josh Story>// - **[5b0ef217ef](react/react@5b0ef217ef )**: s/server action/server function ([#31005](react/react#31005)) //<Ricky>// - **[e3b7ef32be](react/react@e3b7ef32be )**: [crud] Only export uRC when flag is enabled ([#31617](react/react#31617)) //<lauren>// - **[aba370f1e4](react/react@aba370f1e4 )**: Add moveBefore Experiment ([#31596](react/react#31596)) //<Sebastian Markbåge>// - **[1345c37941](react/react@1345c37941 )**: Mark all lanes in order on every new render ([#31615](react/react#31615)) //<Sebastian Markbåge>// - **[91061073d5](react/react@91061073d5 )**: Mark ping time as update ([#31611](react/react#31611)) //<Sebastian Markbåge>// - **[a9f14cb44e](react/react@a9f14cb44e )**: Fix Logging of Immediately Resolved Promises ([#31610](react/react#31610)) //<Sebastian Markbåge>// - **[c11c9510fa](react/react@c11c9510fa )**: [crud] Fix deps comparison bug ([#31599](react/react#31599)) //<lauren>// - **[64f89510af](react/react@64f89510af )**: [crud] Enable on RTR FB builds ([#31590](react/react#31590)) //<lauren>// - **[7558ffe84d](react/react@7558ffe84d )**: [crud] Fix copy paste typo ([#31588](react/react#31588)) //<lauren>// - **[7c254b6576](react/react@7c254b6576 )**: Log yielded time in the Component Track ([#31563](react/react#31563)) //<Sebastian Markbåge>// - **[6177b18c66](react/react@6177b18c66 )**: Track suspended time when the render doesn't commit because it suspended ([#31552](react/react#31552)) //<Sebastian Markbåge>// - **[eaf2d5c670](react/react@eaf2d5c670 )**: fix[eslint-plugin-react-hooks]: Fix error when callback argument is an identifier with an `as` expression ([#31119](react/react#31119)) //<Mark Skelton>// - **[047d95e85f](react/react@047d95e85f )**: [crud] Basic implementation ([#31523](react/react#31523)) //<lauren>// - **[92c0f5f85f](react/react@92c0f5f85f )**: Track separate SuspendedOnAction flag by rethrowing a separate SuspenseActionException sentinel ([#31554](react/react#31554)) //<Sebastian Markbåge>// - **[053b3cb050](react/react@053b3cb050 )**: [crud] Rename Effect type ([#31557](react/react#31557)) //<lauren>// - **[7dd6b9e68a](react/react@7dd6b9e68a )**: [crud] Add enableUseResourceEffectHook flag ([#31556](react/react#31556)) //<lauren>// - **[d8afd1c82e](react/react@d8afd1c82e )**: [crud] Scaffold initial types ([#31555](react/react#31555)) //<lauren>// - **[3720870a97](react/react@3720870a97 )**: Log Render Phases that Never Committed ([#31548](react/react#31548)) //<Sebastian Markbåge>// - **[8a41d6ceab](react/react@8a41d6ceab )**: Unify RootDidNotComplete and RootSuspendedWithDelay exit path ([#31547](react/react#31547)) //<Sebastian Markbåge>// - **[63cde684f5](react/react@63cde684f5 )**: (chore): copy fix in <style> precedence error ([#31524](react/react#31524)) //<Zack Tanner>// - **[b01722d585](react/react@b01722d585 )**: Format event with "warning" yellow and prefix with "Event: " ([#31536](react/react#31536)) //<Sebastian Markbåge>// - **[c13986da78](react/react@c13986da78 )**: Fix Overlapping "message" Bug in Performance Track ([#31528](react/react#31528)) //<Sebastian Markbåge>// - **[4686872159](react/react@4686872159 )**: Log passive commit phase when it wasn't delayed ([#31526](react/react#31526)) //<Sebastian Markbåge>// - **[5d89471ca6](react/react@5d89471ca6 )**: Export __COMPILER_RUNTIME in stable ([#31540](react/react#31540)) //<lauren>// - **[3644f0bd21](react/react@3644f0bd21 )**: Use completedRenderEndTime as the start of the commit phase if it's an immediate commit ([#31527](react/react#31527)) //<Sebastian Markbåge>// - **[8657869999](react/react@8657869999 )**: Separate Tracks for Components and Phases ([#31525](react/react#31525)) //<Sebastian Markbåge>// - **[b15135b9f5](react/react@b15135b9f5 )**: [ez] Update useMemoCache return type ([#31539](react/react#31539)) //<lauren>// Changelog: [General][Changed] - Bump React from 18.3.1 to 19.0.0 bypass-github-export-checks jest_e2e[run_all_tests] Reviewed By: cortinico Differential Revision: D67018480 fbshipit-source-id: 39bca3261ffaa8bb7d74187510724d77cc36b196
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also rename RootDidNotComplete to RootSuspendedAtTheShell since it specifically means something suspended in the shell during hydration.