{"files":[{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js"}],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\nindex 52eb869e9d..c7edb766a2 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n@@ -9,7 +9,12 @@\n \n 'use strict';\n \n-import {normalizeCodeLocInfo} from '.\/utils';\n+import semver from 'semver';\n+\n+import {getLegacyRenderImplementation, normalizeCodeLocInfo} from '.\/utils';\n+import {ReactVersion} from '..\/..\/..\/..\/ReactVersions';\n+\n+const ReactVersionTestingAgainst = process.env.REACT_VERSION || ReactVersion;\n \n describe('Timeline profiler', () => {\n let React;\n@@ -76,6 +81,13 @@ describe('Timeline profiler', () => {\n }\n \n beforeEach(() => {\n+ \/\/ Mock react\/jsx-dev-runtime for React 16.x\n+ \/\/ Although there are no tests in this suite which will run for React 16,\n+ \/\/ Jest will report an error trying to resolve this dependency\n+ if (semver.lt(ReactVersionTestingAgainst, '17.0.0')) {\n+ jest.mock('react\/jsx-dev-runtime', () => {});\n+ }\n+\n utils = require('.\/utils');\n utils.beforeEachProfiling();\n \n@@ -107,6 +119,8 @@ describe('Timeline profiler', () => {\n setPerformanceMock(null);\n });\n \n+ const {render: legacyRender} = getLegacyRenderImplementation();\n+\n describe('getLanesFromTransportDecimalBitmask', () => {\n let getLanesFromTransportDecimalBitmask;\n \n@@ -614,8 +628,10 @@ describe('Timeline profiler', () => {\n `);\n });\n \n+ \/\/ @reactVersion <= 18.2\n+ \/\/ @reactVersion >= 18.0\n it('should process a sample legacy render sequence', async () => {\n- utils.legacyRender(

, document.createElement('div'));\n+ legacyRender(

);\n \n const data = await preprocessData([\n ...createBoilerplateEntries(),\n@@ -629,7 +645,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.01,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.006,\n \"type\": \"render-idle\",\n },\n@@ -637,7 +653,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.001,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.006,\n \"type\": \"render\",\n },\n@@ -645,7 +661,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.008,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.008,\n \"type\": \"commit\",\n },\n@@ -653,7 +669,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 1,\n \"duration\": 0.001,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.014,\n \"type\": \"layout-effects\",\n },\n@@ -714,13 +730,12 @@ describe('Timeline profiler', () => {\n 30 => \"Offscreen\",\n },\n \"laneToReactMeasureMap\": Map {\n- 0 => [],\n- 1 => [\n+ 0 => [\n {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.01,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.006,\n \"type\": \"render-idle\",\n },\n@@ -728,7 +743,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.001,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.006,\n \"type\": \"render\",\n },\n@@ -736,7 +751,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 0,\n \"duration\": 0.008,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.008,\n \"type\": \"commit\",\n },\n@@ -744,11 +759,12 @@ describe('Timeline profiler', () => {\n \"batchUID\": 0,\n \"depth\": 1,\n \"duration\": 0.001,\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.014,\n \"type\": \"layout-effects\",\n },\n ],\n+ 1 => [],\n 2 => [],\n 3 => [],\n 4 => [],\n@@ -785,7 +801,7 @@ describe('Timeline profiler', () => {\n \"reactVersion\": \"\",\n \"schedulingEvents\": [\n {\n- \"lanes\": \"0b0000000000000000000000000000001\",\n+ \"lanes\": \"0b0000000000000000000000000000000\",\n \"timestamp\": 0.005,\n \"type\": \"schedule-render\",\n \"warning\": null,\n@@ -1132,9 +1148,9 @@ describe('Timeline profiler', () => {\n });\n \n \/\/ @reactVersion >= 18.0\n+ \/\/ @reactVersion <= 18.2\n it('should error if events and measures are incomplete', async () => {\n- const container = document.createElement('div');\n- utils.legacyRender(

, container);\n+ legacyRender(

);\n \n const invalidMarks = clearedMarks.filter(\n mark => !mark.includes('render-stop'),\n@@ -1150,9 +1166,9 @@ describe('Timeline profiler', () => {\n });\n \n \/\/ @reactVersion >= 18.0\n+ \/\/ @reactVersion <= 18.2\n it('should error if work is completed without being started', async () => {\n- const container = document.createElement('div');\n- utils.legacyRender(

, container);\n+ legacyRender(

);\n \n const invalidMarks = clearedMarks.filter(\n mark => !mark.includes('render-start'),\n@@ -1262,6 +1278,7 @@ describe('Timeline profiler', () => {\n describe('warnings', () => {\n describe('long event handlers', () => {\n \/\/ @reactVersion >= 18.0\n+ \/\/ @reactVersion <= 18.2\n it('should not warn when React scedules a (sync) update inside of a short event handler', async () => {\n function App() {\n return null;\n@@ -1275,7 +1292,7 @@ describe('Timeline profiler', () => {\n \n clearPendingMarks();\n \n- utils.legacyRender(, document.createElement('div'));\n+ legacyRender();\n \n testMarks.push(...createUserTimingData(clearedMarks));\n \n@@ -1285,6 +1302,7 @@ describe('Timeline profiler', () => {\n });\n \n \/\/ @reactVersion >= 18.0\n+ \/\/ @reactVersion <= 18.2\n it('should not warn about long events if the cause was non-React JavaScript', async () => {\n function App() {\n return null;\n@@ -1300,7 +1318,7 @@ describe('Timeline profiler', () => {\n \n clearPendingMarks();\n \n- utils.legacyRender(, document.createElement('div'));\n+ legacyRender();\n \n testMarks.push(...createUserTimingData(clearedMarks));\n \n@@ -1310,6 +1328,7 @@ describe('Timeline profiler', () => {\n });\n \n \/\/ @reactVersion >= 18.0\n+ \/\/ @reactVersion <= 18.2\n it('should warn when React scedules a long (sync) update inside of an event', async () => {\n function App() {\n return null;\n@@ -1323,7 +1342,7 @@ describe('Timeline profiler', () => {\n \n clearPendingMarks();\n \n- utils.legacyRender(, document.createElement('div'));\n+ legacyRender();\n \n clearedMarks.forEach(markName => {\n if (markName === '--render-stop') {\n@@ -1929,8 +1948,12 @@ describe('Timeline profiler', () => {\n global.IS_REACT_ACT_ENVIRONMENT = true;\n });\n \n+ const {render: legacyRender} = getLegacyRenderImplementation();\n+\n+ \/\/ @reactVersion <= 18.2\n+ \/\/ @reactVersion >= 18.0\n it('should process a sample legacy render sequence', async () => {\n- utils.legacyRender(

, document.createElement('div'));\n+ legacyRender(

);\n utils.act(() => store.profilerStore.stopProfiling());\n \n const data = store.profilerStore.profilingData?.timelineData;\n@@ -1944,7 +1967,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"render-idle\",\n },\n@@ -1952,7 +1975,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"render\",\n },\n@@ -1960,7 +1983,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"commit\",\n },\n@@ -1968,7 +1991,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 1,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"layout-effects\",\n },\n@@ -1979,13 +2002,13 @@ describe('Timeline profiler', () => {\n \"flamechart\": [],\n \"internalModuleSourceToRanges\": Map {},\n \"laneToLabelMap\": Map {\n- 1 => \"SyncHydrationLane\",\n- 2 => \"Sync\",\n- 4 => \"InputContinuousHydration\",\n- 8 => \"InputContinuous\",\n- 16 => \"DefaultHydration\",\n- 32 => \"Default\",\n- 64 => \"TransitionHydration\",\n+ 1 => \"Sync\",\n+ 2 => \"InputContinuousHydration\",\n+ 4 => \"InputContinuous\",\n+ 8 => \"DefaultHydration\",\n+ 16 => \"Default\",\n+ 32 => \"TransitionHydration\",\n+ 64 => \"Transition\",\n 128 => \"Transition\",\n 256 => \"Transition\",\n 512 => \"Transition\",\n@@ -2005,20 +2028,19 @@ describe('Timeline profiler', () => {\n 8388608 => \"Retry\",\n 16777216 => \"Retry\",\n 33554432 => \"Retry\",\n- 67108864 => \"SelectiveHydration\",\n- 134217728 => \"IdleHydration\",\n- 268435456 => \"Idle\",\n- 536870912 => \"Offscreen\",\n- 1073741824 => \"Deferred\",\n+ 67108864 => \"Retry\",\n+ 134217728 => \"SelectiveHydration\",\n+ 268435456 => \"IdleHydration\",\n+ 536870912 => \"Idle\",\n+ 1073741824 => \"Offscreen\",\n },\n \"laneToReactMeasureMap\": Map {\n- 1 => [],\n- 2 => [\n+ 1 => [\n {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"render-idle\",\n },\n@@ -2026,7 +2048,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"render\",\n },\n@@ -2034,7 +2056,7 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 0,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"commit\",\n },\n@@ -2042,11 +2064,12 @@ describe('Timeline profiler', () => {\n \"batchUID\": 1,\n \"depth\": 1,\n \"duration\": 0,\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"layout-effects\",\n },\n ],\n+ 2 => [],\n 4 => [],\n 8 => [],\n 16 => [],\n@@ -2083,7 +2106,7 @@ describe('Timeline profiler', () => {\n \"reactVersion\": \"\",\n \"schedulingEvents\": [\n {\n- \"lanes\": \"0b0000000000000000000000000000010\",\n+ \"lanes\": \"0b0000000000000000000000000000001\",\n \"timestamp\": 10,\n \"type\": \"schedule-render\",\n \"warning\": null,\n","commit":{"authorEmail":"rdlesyutin@gmail.com","subject":"chore: use versioned render in preprocessData test and gate some for … (#28219)","revision":"8b5f0c43ad49943eba6e522a708cdbb47c5f9b26","authorName":"Ruslan Lesiutin","authoredAt":"2024-02-06T17:34:41+00:00","shortRevision":"8b5f0c43ad"},"parents":["97fd3e7064b162f05b1bac3962ed10c6559c346c"],"body":""}

dillon1000/react

Files changed