{"parents":["2c6d92fd80ec6917cb7387dbb771e35e82b0126d"],"files":[{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js"}],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\nindex d46cac42b7..8d9f34371b 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\n@@ -130,24 +130,28 @@ describe('Timeline profiler', () => {\n \/\/ @reactVersion <= 18.2\n \/\/ @reactVersion >= 18.0\n it('should mark sync render without suspends or state updates', () => {\n+ utils.act(() => store.profilerStore.startProfiling());\n legacyRender(

);\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n expect(registeredMarks).toMatchInlineSnapshot(`\n- [\n- \"--schedule-render-1\",\n- \"--render-start-1\",\n- \"--render-stop\",\n- \"--commit-start-1\",\n- \"--react-version-\",\n- \"--profiler-version-1\",\n- \"--react-internal-module-start- at filtered (:0:0)\",\n- \"--react-internal-module-stop- at filtered (:1:1)\",\n- \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n- \"--layout-effects-start-1\",\n- \"--layout-effects-stop\",\n- \"--commit-stop\",\n- ]\n- `);\n+ [\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--schedule-render-1\",\n+ \"--render-start-1\",\n+ \"--render-stop\",\n+ \"--commit-start-1\",\n+ \"--react-version-\",\n+ \"--profiler-version-1\",\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n+ \"--layout-effects-start-1\",\n+ \"--layout-effects-stop\",\n+ \"--commit-stop\",\n+ ]\n+ `);\n });\n \n \/\/ TODO(hoxyq): investigate why running this test with React 18 fails\n@@ -260,46 +264,50 @@ describe('Timeline profiler', () => {\n throw Error('Expected error');\n }\n \n+ utils.act(() => store.profilerStore.startProfiling());\n legacyRender(\n \n \n <\/ErrorBoundary>,\n );\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n expect(registeredMarks).toMatchInlineSnapshot(`\n- [\n- \"--schedule-render-1\",\n- \"--render-start-1\",\n- \"--component-render-start-ErrorBoundary\",\n- \"--component-render-stop\",\n- \"--component-render-start-ExampleThatThrows\",\n- \"--component-render-start-ExampleThatThrows\",\n- \"--component-render-stop\",\n- \"--error-ExampleThatThrows-mount-Expected error\",\n- \"--render-stop\",\n- \"--commit-start-1\",\n- \"--react-version-\",\n- \"--profiler-version-1\",\n- \"--react-internal-module-start- at filtered (:0:0)\",\n- \"--react-internal-module-stop- at filtered (:1:1)\",\n- \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n- \"--layout-effects-start-1\",\n- \"--schedule-state-update-1-ErrorBoundary\",\n- \"--layout-effects-stop\",\n- \"--commit-stop\",\n- \"--render-start-1\",\n- \"--component-render-start-ErrorBoundary\",\n- \"--component-render-stop\",\n- \"--render-stop\",\n- \"--commit-start-1\",\n- \"--react-version-\",\n- \"--profiler-version-1\",\n- \"--react-internal-module-start- at filtered (:0:0)\",\n- \"--react-internal-module-stop- at filtered (:1:1)\",\n- \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n- \"--commit-stop\",\n- ]\n- `);\n+ [\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--schedule-render-1\",\n+ \"--render-start-1\",\n+ \"--component-render-start-ErrorBoundary\",\n+ \"--component-render-stop\",\n+ \"--component-render-start-ExampleThatThrows\",\n+ \"--component-render-start-ExampleThatThrows\",\n+ \"--component-render-stop\",\n+ \"--error-ExampleThatThrows-mount-Expected error\",\n+ \"--render-stop\",\n+ \"--commit-start-1\",\n+ \"--react-version-\",\n+ \"--profiler-version-1\",\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n+ \"--layout-effects-start-1\",\n+ \"--schedule-state-update-1-ErrorBoundary\",\n+ \"--layout-effects-stop\",\n+ \"--commit-stop\",\n+ \"--render-start-1\",\n+ \"--component-render-start-ErrorBoundary\",\n+ \"--component-render-stop\",\n+ \"--render-stop\",\n+ \"--commit-start-1\",\n+ \"--react-version-\",\n+ \"--profiler-version-1\",\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n+ \"--commit-stop\",\n+ ]\n+ `);\n });\n });\n \n@@ -1095,24 +1103,28 @@ describe('Timeline profiler', () => {\n \/\/ @reactVersion <= 18.2\n \/\/ @reactVersion >= 18.0\n it('regression test SyncLane', () => {\n+ utils.act(() => store.profilerStore.startProfiling());\n legacyRender(

);\n+ utils.act(() => store.profilerStore.stopProfiling());\n \n expect(registeredMarks).toMatchInlineSnapshot(`\n- [\n- \"--schedule-render-1\",\n- \"--render-start-1\",\n- \"--render-stop\",\n- \"--commit-start-1\",\n- \"--react-version-\",\n- \"--profiler-version-1\",\n- \"--react-internal-module-start- at filtered (:0:0)\",\n- \"--react-internal-module-stop- at filtered (:1:1)\",\n- \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n- \"--layout-effects-start-1\",\n- \"--layout-effects-stop\",\n- \"--commit-stop\",\n- ]\n- `);\n+ [\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--schedule-render-1\",\n+ \"--render-start-1\",\n+ \"--render-stop\",\n+ \"--commit-start-1\",\n+ \"--react-version-\",\n+ \"--profiler-version-1\",\n+ \"--react-internal-module-start- at filtered (:0:0)\",\n+ \"--react-internal-module-stop- at filtered (:1:1)\",\n+ \"--react-lane-labels-Sync,InputContinuousHydration,InputContinuous,DefaultHydration,Default,TransitionHydration,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Transition,Retry,Retry,Retry,Retry,Retry,SelectiveHydration,IdleHydration,Idle,Offscreen\",\n+ \"--layout-effects-start-1\",\n+ \"--layout-effects-stop\",\n+ \"--commit-stop\",\n+ ]\n+ `);\n });\n });\n \n@@ -1432,19 +1444,19 @@ describe('Timeline profiler', () => {\n expect(timelineData.suspenseEvents).toHaveLength(1);\n const suspenseEvent = timelineData.suspenseEvents[0];\n expect(suspenseEvent).toMatchInlineSnapshot(`\n- {\n- \"componentName\": \"Example\",\n- \"depth\": 0,\n- \"duration\": 10,\n- \"id\": \"0\",\n- \"phase\": \"mount\",\n- \"promiseName\": \"\",\n- \"resolution\": \"resolved\",\n- \"timestamp\": 10,\n- \"type\": \"suspense\",\n- \"warning\": null,\n- }\n- `);\n+ {\n+ \"componentName\": \"Example\",\n+ \"depth\": 0,\n+ \"duration\": 0,\n+ \"id\": \"0\",\n+ \"phase\": \"mount\",\n+ \"promiseName\": \"\",\n+ \"resolution\": \"unresolved\",\n+ \"timestamp\": 10,\n+ \"type\": \"suspense\",\n+ \"warning\": null,\n+ }\n+ `);\n \n \/\/ There should be two batches of renders: Suspeneded and resolved.\n expect(timelineData.batchUIDToMeasuresMap.size).toBe(2);\n@@ -1490,19 +1502,19 @@ describe('Timeline profiler', () => {\n expect(timelineData.suspenseEvents).toHaveLength(1);\n const suspenseEvent = timelineData.suspenseEvents[0];\n expect(suspenseEvent).toMatchInlineSnapshot(`\n- {\n- \"componentName\": \"Example\",\n- \"depth\": 0,\n- \"duration\": 10,\n- \"id\": \"0\",\n- \"phase\": \"mount\",\n- \"promiseName\": \"\",\n- \"resolution\": \"rejected\",\n- \"timestamp\": 10,\n- \"type\": \"suspense\",\n- \"warning\": null,\n- }\n- `);\n+ {\n+ \"componentName\": \"Example\",\n+ \"depth\": 0,\n+ \"duration\": 0,\n+ \"id\": \"0\",\n+ \"phase\": \"mount\",\n+ \"promiseName\": \"\",\n+ \"resolution\": \"unresolved\",\n+ \"timestamp\": 10,\n+ \"type\": \"suspense\",\n+ \"warning\": null,\n+ }\n+ `);\n \n \/\/ There should be two batches of renders: Suspeneded and resolved.\n expect(timelineData.batchUIDToMeasuresMap.size).toBe(2);\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\nindex 1de972658c..6d60b7e632 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n@@ -111,9 +111,31 @@ describe('Timeline profiler', () => {\n ReactDOMClient = require('react-dom\/client');\n Scheduler = require('scheduler');\n \n- const InternalTestUtils = require('internal-test-utils');\n- assertLog = InternalTestUtils.assertLog;\n- waitFor = InternalTestUtils.waitFor;\n+ if (typeof Scheduler.log !== 'function') {\n+ \/\/ backwards compat for older scheduler versions\n+ Scheduler.log = Scheduler.unstable_yieldValue;\n+ Scheduler.unstable_clearLog = Scheduler.unstable_clearYields;\n+ const InternalTestUtils = require('internal-test-utils');\n+ assertLog = InternalTestUtils.assertLog;\n+\n+ \/\/ polyfill waitFor as Scheduler.toFlushAndYieldThrough\n+ waitFor = expectedYields => {\n+ let actualYields = Scheduler.unstable_clearYields();\n+ if (actualYields.length !== 0) {\n+ throw new Error(\n+ 'Log of yielded values is not empty. ' +\n+ 'Call expect(Scheduler).toHaveYielded(...) first.',\n+ );\n+ }\n+ Scheduler.unstable_flushNumberOfYields(expectedYields.length);\n+ actualYields = Scheduler.unstable_clearYields();\n+ expect(actualYields).toEqual(expectedYields);\n+ };\n+ } else {\n+ const InternalTestUtils = require('internal-test-utils');\n+ assertLog = InternalTestUtils.assertLog;\n+ waitFor = InternalTestUtils.waitFor;\n+ }\n \n setPerformanceMock =\n require('react-devtools-shared\/src\/backend\/profilingHooks').setPerformanceMock_ONLY_FOR_TESTING;\n","commit":{"subject":"Fix failing React DevTools regression tests (#34585)","authorName":"Sebastian \"Sebbie\" Silbermann","authorEmail":"sebastian.silbermann@vercel.com","shortRevision":"58d17912e8","revision":"58d17912e89b56067eeba08619fd7f7b6c813519","authoredAt":"2025-09-24T19:08:13+02:00"},"body":""}

dillon1000/react

Files changed