Flow upgrade to 0.146

This upgrade made more expressions invalidate refinements. In some places this lead to a large number of suppressions that I automatically suppressed and should be followed up on when the code is touched. I think most of them might require either manual annotations or moving a value into a const to allow refinement. ghstack-source-id: a45b40abf03474b691a2dc18a4f1f3b06cfbdffd Pull Request resolved: #25410
facebook · Oct 4, 2022 · 64fe791 · 64fe791
1 parent d3c6c16
commit 64fe791
Show file tree

Hide file tree

Showing 33 changed files with 138 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "eslint-plugin-react-internal": "link:./scripts/eslint-rules",
     "fbjs-scripts": "1.2.0",
     "filesize": "^6.0.1",
-    "flow-bin": "^0.145.0",
+    "flow-bin": "^0.146.0",
     "glob": "^7.1.6",
     "glob-stream": "^6.1.0",
     "google-closure-compiler": "^20200517.0.0",

diff --git a/packages/react-devtools-core/src/editor.js b/packages/react-devtools-core/src/editor.js
@@ -186,6 +186,7 @@ export function launchEditor(
     childProcess = spawn(editor, args, {stdio: 'inherit'});
   }
   childProcess.on('error', function() {});
+  // $FlowFixMe[incompatible-use] found when upgrading Flow
   childProcess.on('exit', function(errorCode) {
     childProcess = null;
   });

diff --git a/packages/react-devtools-shared/src/backend/profilingHooks.js b/packages/react-devtools-shared/src/backend/profilingHooks.js
@@ -350,7 +350,9 @@ export function createProfilingHooks({
           );
         }
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentReactComponentMeasure.duration =
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           getRelativeTime() - currentReactComponentMeasure.timestamp;
         currentReactComponentMeasure = null;
       }
@@ -393,7 +395,9 @@ export function createProfilingHooks({
           );
         }
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentReactComponentMeasure.duration =
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           getRelativeTime() - currentReactComponentMeasure.timestamp;
         currentReactComponentMeasure = null;
       }
@@ -438,7 +442,9 @@ export function createProfilingHooks({
           );
         }
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentReactComponentMeasure.duration =
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           getRelativeTime() - currentReactComponentMeasure.timestamp;
         currentReactComponentMeasure = null;
       }
@@ -481,7 +487,9 @@ export function createProfilingHooks({
           );
         }
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentReactComponentMeasure.duration =
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           getRelativeTime() - currentReactComponentMeasure.timestamp;
         currentReactComponentMeasure = null;
       }
@@ -526,7 +534,9 @@ export function createProfilingHooks({
           );
         }
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentReactComponentMeasure.duration =
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           getRelativeTime() - currentReactComponentMeasure.timestamp;
         currentReactComponentMeasure = null;
       }

diff --git a/packages/react-devtools-shared/src/backend/renderer.js b/packages/react-devtools-shared/src/backend/renderer.js
@@ -1310,6 +1310,7 @@ export function attach(
           const id = getFiberIDThrows(fiber);
           const contexts = getContextsForFiber(fiber);
           if (contexts !== null) {
+            // $FlowFixMe[incompatible-use] found when upgrading Flow
             idToContextsMap.set(id, contexts);
           }
         }
@@ -1380,8 +1381,10 @@ export function attach(
   function getContextChangedKeys(fiber: Fiber): null | boolean | Array<string> {
     if (idToContextsMap !== null) {
       const id = getFiberIDThrows(fiber);
+      // $FlowFixMe[incompatible-use] found when upgrading Flow
       const prevContexts = idToContextsMap.has(id)
-        ? idToContextsMap.get(id)
+        ? // $FlowFixMe[incompatible-use] found when upgrading Flow
+          idToContextsMap.get(id)
         : null;
       const nextContexts = getContextsForFiber(fiber);
 
@@ -2636,7 +2639,9 @@ export function attach(
         const {effectDuration, passiveEffectDuration} = getEffectDurations(
           root,
         );
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentCommitProfilingMetadata.effectDuration = effectDuration;
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         currentCommitProfilingMetadata.passiveEffectDuration = passiveEffectDuration;
       }
     }
@@ -3702,6 +3707,7 @@ export function attach(
       id,
       responseID: requestID,
       type: 'full-data',
+      // $FlowFixMe[incompatible-return] found when upgrading Flow
       value: cleanedInspectedElement,
     };
   }
@@ -4276,6 +4282,7 @@ export function attach(
     ) {
       // Is this the next Fiber we should select? Let's compare the frames.
       const actualFrame = getPathFrame(fiber);
+      // $FlowFixMe[incompatible-use] found when upgrading Flow
       const expectedFrame = trackedPath[trackedPathMatchDepth + 1];
       if (expectedFrame === undefined) {
         throw new Error('Expected to see a frame at the next depth.');
@@ -4289,6 +4296,7 @@ export function attach(
         trackedPathMatchFiber = fiber;
         trackedPathMatchDepth++;
         // Are we out of frames to match?
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         if (trackedPathMatchDepth === trackedPath.length - 1) {
           // There's nothing that can possibly match afterwards.
           // Don't check the children.
@@ -4443,6 +4451,7 @@ export function attach(
     }
     return {
       id: getFiberIDThrows(fiber),
+      // $FlowFixMe[incompatible-use] found when upgrading Flow
       isFullMatch: trackedPathMatchDepth === trackedPath.length - 1,
     };
   }

diff --git a/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js b/packages/react-devtools-shared/src/devtools/views/Components/OwnersListContext.js
@@ -45,6 +45,7 @@ const resource: Resource<
   (element: Element) => {
     const request = inProgressRequests.get(element);
     if (request != null) {
+      // $FlowFixMe[incompatible-call] found when upgrading Flow
       return request.promise;
     }
 
@@ -53,6 +54,7 @@ const resource: Resource<
       resolveFn = resolve;
     });
 
+    // $FlowFixMe[incompatible-call] found when upgrading Flow
     inProgressRequests.set(element, {promise, resolveFn});
 
     return promise;

diff --git a/packages/react-devtools-shared/src/hooks/parseHookNames/parseSourceAndMetadata.js b/packages/react-devtools-shared/src/hooks/parseHookNames/parseSourceAndMetadata.js
@@ -186,6 +186,7 @@ function findHookNames(
     }
 
     const key = getHookSourceLocationKey(hookSource);
+    // $FlowFixMe[incompatible-call] found when upgrading Flow
     map.set(key, name);
   });
 

diff --git a/packages/react-devtools-shared/src/inspectedElementMutableSource.js b/packages/react-devtools-shared/src/inspectedElementMutableSource.js
@@ -137,6 +137,7 @@ export function inspectElement({
 
         // A path has been hydrated.
         // Merge it with the latest copy we have locally and resolve with the merged value.
+        // $FlowFixMe[incompatible-type] found when upgrading Flow
         inspectedElement = inspectedElementCache.get(id) || null;
         if (inspectedElement !== null) {
           // Clone element
@@ -150,6 +151,7 @@ export function inspectElement({
             hydrateHelper(value, ((path: any): Path)),
           );
 
+          // $FlowFixMe[incompatible-call] found when upgrading Flow
           inspectedElementCache.set(id, inspectedElement);
 
           return [inspectedElement, type];

diff --git a/packages/react-devtools/app.js b/packages/react-devtools/app.js
@@ -40,13 +40,16 @@ app.on('ready', function() {
   }
 
   // https://stackoverflow.com/questions/32402327/
+  // $FlowFixMe[incompatible-use] found when upgrading Flow
   mainWindow.webContents.on('new-window', function(event, url) {
     event.preventDefault();
     require('electron').shell.openExternal(url);
   });
 
   // and load the index.html of the app.
+  // $FlowFixMe[incompatible-use] found when upgrading Flow
   mainWindow.loadURL('file://' + __dirname + '/app.html'); // eslint-disable-line no-path-concat
+  // $FlowFixMe[incompatible-use] found when upgrading Flow
   mainWindow.webContents.executeJavaScript(
     // We use this so that RN can keep relative JSX __source filenames
     // but "click to open in editor" still works. js1 passes project roots
@@ -55,6 +58,7 @@ app.on('ready', function() {
   );
 
   // Emitted when the window is closed.
+  // $FlowFixMe[incompatible-use] found when upgrading Flow
   mainWindow.on('closed', function() {
     mainWindow = null;
   });

diff --git a/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js b/packages/react-dom-bindings/src/client/ReactDOMFloatClient.js
@@ -241,6 +241,7 @@ function preinit(href: string, options: PreinitOptions) {
             options,
           );
           resource = createStyleResource(
+            // $FlowFixMe[incompatible-call] found when upgrading Flow
             currentDocument,
             href,
             precedence,
@@ -347,6 +348,7 @@ export function getResource(
             } else {
               const resourceProps = stylePropsFromRawProps(styleRawProps);
               resource = createStyleResource(
+                // $FlowFixMe[incompatible-call] found when upgrading Flow
                 currentDocument,
                 href,
                 precedence,
@@ -382,6 +384,7 @@ export function getResource(
             } else {
               const resourceProps = preloadPropsFromRawProps(preloadRawProps);
               resource = createPreloadResource(
+                // $FlowFixMe[incompatible-call] found when upgrading Flow
                 currentDocument,
                 href,
                 resourceProps,

diff --git a/packages/react-dom-bindings/src/events/plugins/BeforeInputEventPlugin.js b/packages/react-dom-bindings/src/events/plugins/BeforeInputEventPlugin.js
@@ -227,6 +227,7 @@ function extractCompositionEvent(
     }
   }
 
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const listeners = accumulateTwoPhaseListeners(targetInst, eventType);
   if (listeners.length > 0) {
     // $FlowFixMe[incompatible-type]

diff --git a/packages/react-dom-bindings/src/events/plugins/EnterLeaveEventPlugin.js b/packages/react-dom-bindings/src/events/plugins/EnterLeaveEventPlugin.js
@@ -104,6 +104,7 @@ function extractEvents(
       const nearestMounted = getNearestMountedFiber(to);
       if (
         to !== nearestMounted ||
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         (to.tag !== HostComponent && to.tag !== HostText)
       ) {
         to = null;

diff --git a/packages/react-dom-bindings/src/server/ReactDOMFloatServer.js b/packages/react-dom-bindings/src/server/ReactDOMFloatServer.js
@@ -144,6 +144,7 @@ function preload(href: string, options: PreloadOptions) {
     options !== null
   ) {
     const as = options.as;
+    // $FlowFixMe[incompatible-use] found when upgrading Flow
     let resource = currentResources.preloadsMap.get(href);
     if (resource) {
       if (__DEV__) {
@@ -159,12 +160,14 @@ function preload(href: string, options: PreloadOptions) {
       }
     } else {
       resource = createPreloadResource(
+        // $FlowFixMe[incompatible-call] found when upgrading Flow
         currentResources,
         href,
         as,
         preloadPropsFromPreloadOptions(href, as, options),
       );
     }
+    // $FlowFixMe[incompatible-call] found when upgrading Flow
     captureExplicitPreloadResourceDependency(currentResources, resource);
   }
 }
@@ -199,6 +202,7 @@ function preinit(href: string, options: PreinitOptions) {
       case 'style': {
         const precedence = options.precedence || 'default';
 
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         let resource = currentResources.stylesMap.get(href);
         if (resource) {
           if (__DEV__) {
@@ -216,6 +220,7 @@ function preinit(href: string, options: PreinitOptions) {
             options,
           );
           resource = createStyleResource(
+            // $FlowFixMe[incompatible-call] found when upgrading Flow
             currentResources,
             href,
             precedence,
@@ -224,6 +229,7 @@ function preinit(href: string, options: PreinitOptions) {
         }
 
         // Do not associate preinit style resources with any specific boundary regardless of where it is called
+        // $FlowFixMe[incompatible-call] found when upgrading Flow
         captureStyleResourceDependency(currentResources, null, resource);
 
         return;
@@ -459,9 +465,11 @@ export function resourcesFromLink(props: Props): boolean {
         if (__DEV__) {
           validateLinkPropsForStyleResource(props);
         }
+        // $FlowFixMe[incompatible-use] found when upgrading Flow
         let preloadResource = currentResources.preloadsMap.get(href);
         if (!preloadResource) {
           preloadResource = createPreloadResource(
+            // $FlowFixMe[incompatible-call] found when upgrading Flow
             currentResources,
             href,
             'style',
@@ -472,6 +480,7 @@ export function resourcesFromLink(props: Props): boolean {
           }
         }
         captureImplicitPreloadResourceDependency(
+          // $FlowFixMe[incompatible-call] found when upgrading Flow
           currentResources,
           preloadResource,
         );
@@ -492,14 +501,17 @@ export function resourcesFromLink(props: Props): boolean {
         } else {
           const resourceProps = stylePropsFromRawProps(href, precedence, props);
           resource = createStyleResource(
+            // $FlowFixMe[incompatible-call] found when upgrading Flow
             currentResources,
             href,
             precedence,
             resourceProps,
           );
         }
         captureStyleResourceDependency(
+          // $FlowFixMe[incompatible-call] found when upgrading Flow
           currentResources,
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           currentResources.boundaryResources,
           resource,
         );
@@ -519,6 +531,7 @@ export function resourcesFromLink(props: Props): boolean {
           if (__DEV__) {
             validateLinkPropsForPreloadResource(props);
           }
+          // $FlowFixMe[incompatible-use] found when upgrading Flow
           let resource = currentResources.preloadsMap.get(href);
           if (resource) {
             if (__DEV__) {
@@ -534,12 +547,14 @@ export function resourcesFromLink(props: Props): boolean {
             }
           } else {
             resource = createPreloadResource(
+              // $FlowFixMe[incompatible-call] found when upgrading Flow
               currentResources,
               href,
               as,
               preloadPropsFromRawProps(href, as, props),
             );
           }
+          // $FlowFixMe[incompatible-call] found when upgrading Flow
           captureExplicitPreloadResourceDependency(currentResources, resource);
           return true;
         }

diff --git a/packages/react-fs/src/ReactFilesystem.js b/packages/react-fs/src/ReactFilesystem.js
@@ -121,6 +121,7 @@ export function access(path: string, mode?: number): void {
     record = createRecordFromThenable(thenable);
     accessCache.push(mode, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   readRecord(record); // No return value.
 }
 
@@ -154,6 +155,7 @@ export function lstat(path: string, options?: {bigint?: boolean}): mixed {
     record = createRecordFromThenable(thenable);
     lstatCache.push(bigint, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const stats = readRecord(record).value;
   return stats;
 }
@@ -203,6 +205,7 @@ export function readdir(
     record = createRecordFromThenable(thenable);
     readdirCache.push(encoding, withFileTypes, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const files = readRecord(record).value;
   return files;
 }
@@ -301,6 +304,7 @@ export function readlink(
     record = createRecordFromThenable(thenable);
     readlinkCache.push(encoding, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const linkString = readRecord(record).value;
   return linkString;
 }
@@ -342,6 +346,7 @@ export function realpath(
     record = createRecordFromThenable(thenable);
     realpathCache.push(encoding, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const resolvedPath = readRecord(record).value;
   return resolvedPath;
 }
@@ -376,6 +381,7 @@ export function stat(path: string, options?: {bigint?: boolean}): mixed {
     record = createRecordFromThenable(thenable);
     statCache.push(bigint, record);
   }
+  // $FlowFixMe[incompatible-call] found when upgrading Flow
   const stats = readRecord(record).value;
   return stats;
 }