Fix devtools tests after internal test changes

Author: rickhanlonii

packages/react-devtools-shared/src/__tests__/TimelineProfiler-test.js

@@ -48,12 +48,6 @@ describe('Timeline profiler', () => {
     ReactDOMClient = require('react-dom/client');
     Scheduler = require('scheduler');
 
-    const InternalTestUtils = require('internal-test-utils');
-    waitFor = InternalTestUtils.waitFor;
-    waitForAll = InternalTestUtils.waitForAll;
-    waitForPaint = InternalTestUtils.waitForPaint;
-    assertLog = InternalTestUtils.assertLog;
-
     store = global.store;
   });
 
@@ -1324,7 +1318,7 @@ describe('Timeline profiler', () => {
         expect(timelineData.batchUIDToMeasuresMap.size).toBe(2);
       });
 
-      // @reactVersion >=18.0
+      // @reactVersion >=18.3
       it('should mark render yields', async () => {
         function Bar() {
           Scheduler.log('Bar');
@@ -1409,7 +1403,7 @@ describe('Timeline profiler', () => {
         expect(timelineData.componentMeasures).toHaveLength(2);
       });
 
-      // @reactVersion >=18.0
+      // @reactVersion >=18.3
       it('should mark sync render with suspense that rejects', async () => {
         let rejectFn;
         let rejected = false;
@@ -1467,7 +1461,7 @@ describe('Timeline profiler', () => {
         expect(timelineData.componentMeasures).toHaveLength(2);
       });
 
-      // @reactVersion >=18.0
+      // @reactVersion >=18.3
       it('should mark concurrent render with suspense that resolves', async () => {
         let resolveFn;
         let resolved = false;
@@ -1525,7 +1519,7 @@ describe('Timeline profiler', () => {
         expect(timelineData.componentMeasures).toHaveLength(2);
       });
 
-      // @reactVersion >=18.0
+      // @reactVersion >=18.3
       it('should mark concurrent render with suspense that rejects', async () => {
         let rejectFn;
         let rejected = false;

packages/react-devtools-shared/src/__tests__/preprocessData-test.js

@@ -1349,7 +1349,7 @@ describe('Timeline profiler', () => {
             );
           });
 
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should not warn when React finishes a previously long (async) update with a short (sync) update inside of an event', async () => {
             function Yield({id, value}) {
               Scheduler.log(`${id}:${value}`);
@@ -1411,7 +1411,7 @@ describe('Timeline profiler', () => {
         });
 
         describe('nested updates', () => {
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should not warn about short nested (state) updates during layout effects', async () => {
             function Component() {
               const [didMount, setDidMount] = React.useState(false);
@@ -1442,7 +1442,7 @@ describe('Timeline profiler', () => {
             expect(event.warning).toBe(null);
           });
 
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should not warn about short (forced) updates during layout effects', async () => {
             class Component extends React.Component {
               _didMount: boolean = false;
@@ -1595,7 +1595,7 @@ describe('Timeline profiler', () => {
             );
           });
 
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should not warn about transition updates scheduled during commit phase', async () => {
             function Component() {
               const [value, setValue] = React.useState(0);
@@ -1783,7 +1783,7 @@ describe('Timeline profiler', () => {
         describe('suspend during an update', () => {
           // This also tests an edge case where the a component suspends while profiling
           // before the first commit is logged (so the lane-to-labels map will not yet exist).
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should warn about suspending during an udpate', async () => {
             let promise = null;
             let resolvedValue = null;
@@ -1841,7 +1841,7 @@ describe('Timeline profiler', () => {
             );
           });
 
-          // @reactVersion >= 18.0
+          // @reactVersion >= 18.3
           it('should not warn about suspending during an transition', async () => {
             let promise = null;
             let resolvedValue = null;

packages/react-devtools-shared/src/__tests__/storeComponentFilters-test.js

@@ -19,7 +19,12 @@ describe('Store component filters', () => {
   let utils;
 
   const act = async (callback: Function) => {
-    await React.unstable_act(callback);
+    if (React.unstable_act != null) {
+      await React.unstable_act(callback);
+    } else {
+      callback();
+    }
+
     jest.runAllTimers(); // Flush Bridge operations
   };