react-native-windows 0.81.1 → 0.82.0-preview.1

package/jest/setup.js

@@ -17,7 +17,7 @@ import '@react-native/js-polyfills/error-guard';
 
 import mock from './mock';
 
-// $FlowIgnore[cannot-write]
+// $FlowFixMe[cannot-write]
 Object.defineProperties(global, {
   __DEV__: {
     configurable: true,
@@ -43,7 +43,7 @@ Object.defineProperties(global, {
     configurable: true,
     enumerable: true,
     value: {
-      // $FlowIgnore[method-unbinding]
+      // $FlowFixMe[method-unbinding]
       now: jest.fn(Date.now),
     },
     writable: true,
@@ -70,7 +70,18 @@ Object.defineProperties(global, {
   },
 });
 
-// $FlowFixMe[incompatible-call] - `./mocks/AppState` is incomplete.
+/**
+ * Prettier v3 uses import (cjs/mjs) file formats that jest-runtime does not
+ * support. To work around this we need to bypass the jest module system by
+ * using the orginal node `require` function.
+ */
+jest.mock('prettier', () => {
+  // $FlowExpectedError[underconstrained-implicit-instantiation]
+  const module = jest.requireActual('module');
+  return module.prototype.require(require.resolve('prettier'));
+});
+
+// $FlowFixMe[incompatible-type] - `./mocks/AppState` is incomplete.
 mock('m#../Libraries/AppState/AppState', 'm#./mocks/AppState');
 mock('m#../Libraries/BatchedBridge/NativeModules', 'm#./mocks/NativeModules');
 mock(
@@ -84,41 +95,41 @@ mock(
 mock('m#../Libraries/Components/Clipboard/Clipboard', 'm#./mocks/Clipboard');
 mock(
   'm#../Libraries/Components/RefreshControl/RefreshControl',
-  // $FlowFixMe[incompatible-call] - `../Libraries/Components/RefreshControl/RefreshControl` should export a component type.
+  // $FlowFixMe[incompatible-type] - `../Libraries/Components/RefreshControl/RefreshControl` should export a component type.
   'm#./mocks/RefreshControl',
 );
 // $FlowFixMe[incompatible-exact] - `../Libraries/Components/ScrollView/ScrollView` is... I don't even.
-// $FlowFixMe[prop-missing]
+// $FlowFixMe[incompatible-type]
 mock('m#../Libraries/Components/ScrollView/ScrollView', 'm#./mocks/ScrollView');
 mock('m#../Libraries/Components/TextInput/TextInput', 'm#./mocks/TextInput');
 mock('m#../Libraries/Components/View/View', 'm#./mocks/View');
 mock(
   'm#../Libraries/Components/View/ViewNativeComponent',
-  // $FlowFixMe[incompatible-call] - `./mocks/ViewNativeComponent` is incomplete.
+  // $FlowFixMe[incompatible-type] - `./mocks/ViewNativeComponent` is incomplete.
   // $FlowFixMe[prop-missing]
   'm#./mocks/ViewNativeComponent',
 );
 mock('m#../Libraries/Core/InitializeCore', 'm#./mocks/InitializeCore');
 mock('m#../Libraries/Core/NativeExceptionsManager');
 mock('m#../Libraries/Image/Image', 'm#./mocks/Image');
-// $FlowFixMe[incompatible-call] - `./mocks/Linking` is incomplete.
+// $FlowFixMe[incompatible-type] - `./mocks/Linking` is incomplete.
 mock('m#../Libraries/Linking/Linking', 'm#./mocks/Linking');
-// $FlowFixMe[incompatible-call] - `../Libraries/Modal/Modal` should export a component type.
+// $FlowFixMe[incompatible-type] - `../Libraries/Modal/Modal` should export a component type.
 mock('m#../Libraries/Modal/Modal', 'm#./mocks/Modal');
 mock(
   'm#../Libraries/NativeComponent/NativeComponentRegistry',
-  // $FlowFixMe[prop-missing] - `./mocks/NativeComponentRegistry` should export named functions.
+  // $FlowFixMe[incompatible-type] - `./mocks/NativeComponentRegistry` should export named functions.
   'm#./mocks/NativeComponentRegistry',
 );
-// $FlowFixMe[prop-missing] - `./mocks/RendererProxy` is incomplete.
+// $FlowFixMe[incompatible-type] - `./mocks/RendererProxy` is incomplete.
 mock('m#../Libraries/ReactNative/RendererProxy', 'm#./mocks/RendererProxy');
 mock(
   'm#../Libraries/ReactNative/requireNativeComponent',
   'm#./mocks/requireNativeComponent',
 );
-// $FlowFixMe[prop-missing] - `./mocks/UIManager` is incomplete.
+// $FlowFixMe[incompatible-type] - `./mocks/UIManager` is incomplete.
 mock('m#../Libraries/ReactNative/UIManager', 'm#./mocks/UIManager');
 mock('m#../Libraries/Text/Text', 'm#./mocks/Text');
 mock('m#../Libraries/Utilities/useColorScheme', 'm#./mocks/useColorScheme');
-// $FlowFixMe[incompatible-call]
+// $FlowFixMe[incompatible-type]
 mock('m#../Libraries/Vibration/Vibration', 'm#./mocks/Vibration');

package/just-task.js

@@ -22,6 +22,9 @@ require('@rnw-scripts/just-task/flow-tasks');
 
 const {execSync} = require('child_process');
 const fs = require('fs');
+const {
+  registerNuGetRestoreTask,
+} = require('@rnw-scripts/just-task/nuget-restore-task');
 
 option('production');
 option('clean');
@@ -71,6 +74,16 @@ task('copyReadmeAndLicenseFromRoot', () => {
 
 task('compileTsPlatformOverrides', tscTask());
 
+registerNuGetRestoreTask({
+  taskName: 'restoreNuGetPackages',
+  scriptPath: path.resolve(
+    __dirname,
+    'Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1',
+  ),
+  logDirectory: path.resolve(__dirname, 'logs'),
+  scriptArguments: ['-SkipLockDeletion'],
+});
+
 task(
   'build',
   series(
@@ -79,6 +92,7 @@ task(
     'copyReadmeAndLicenseFromRoot',
     'layoutMSRNCxx',
     'compileTsPlatformOverrides',
+    'restoreNuGetPackages',
     'codegen',
   ),
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.81.1",
+  "version": "0.82.0-preview.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,24 +23,24 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native-community/cli": "17.0.0",
-    "@react-native-community/cli-platform-android": "17.0.0",
-    "@react-native-community/cli-platform-ios": "17.0.0",
-    "@react-native-windows/cli": "0.81.0",
+    "@react-native-community/cli": "20.0.0",
+    "@react-native-community/cli-platform-android": "20.0.0",
+    "@react-native-community/cli-platform-ios": "20.0.0",
+    "@react-native-windows/cli": "0.82.0-preview.1",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.81.5",
-    "@react-native/codegen": "0.81.5",
-    "@react-native/community-cli-plugin": "0.81.5",
-    "@react-native/gradle-plugin": "0.81.5",
-    "@react-native/js-polyfills": "0.81.5",
-    "@react-native/normalize-colors": "0.81.5",
-    "@react-native/virtualized-lists": "0.81.5",
-    "@react-native/new-app-screen": "0.81.5",
+    "@react-native/assets-registry": "0.82.0-rc.0",
+    "@react-native/codegen": "0.82.0-rc.0",
+    "@react-native/community-cli-plugin": "0.82.0-rc.0",
+    "@react-native/gradle-plugin": "0.82.0-rc.0",
+    "@react-native/js-polyfills": "0.82.0-rc.0",
+    "@react-native/new-app-screen": "0.82.0-nightly-20250902-9731e8ebc",
+    "@react-native/normalize-colors": "0.82.0-rc.0",
+    "@react-native/virtualized-lists": "0.82.0-rc.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "babel-jest": "^29.7.0",
-    "babel-plugin-syntax-hermes-parser": "0.28.1",
+    "babel-plugin-syntax-hermes-parser": "0.32.0",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
     "commander": "^12.0.0",
@@ -50,13 +50,13 @@
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.82.2",
-    "metro-source-map": "^0.82.2",
+    "metro-runtime": "^0.83.1",
+    "metro-source-map": "^0.83.1",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
-    "react-devtools-core": "^6.1.1",
+    "react-devtools-core": "^6.1.5",
     "react-refresh": "^0.14.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "0.26.0",
@@ -68,38 +68,38 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.81.0",
-    "@react-native/metro-config": "0.81.5",
+    "@react-native-windows/codegen": "0.82.0-preview.1",
+    "@react-native/metro-config": "0.82.0-rc.0",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
-    "@rnw-scripts/eslint-config": "1.2.37",
-    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.41",
-    "@rnw-scripts/just-task": "2.3.56",
+    "@rnw-scripts/eslint-config": "1.2.38",
+    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.42",
+    "@rnw-scripts/just-task": "2.3.58",
     "@rnw-scripts/metro-dev-config": "0.0.0",
     "@rnx-kit/jest-preset": "^0.1.17",
     "@types/node": "^22.14.0",
     "@types/react": "^19.1.0",
     "eslint": "^8.19.0",
-    "flow-bin": "^0.274.2",
+    "flow-bin": "^0.280.0",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
-    "react": "19.1.0",
-    "react-native": "0.81.5",
-    "react-native-platform-override": "0.81.0",
+    "react": "19.1.1",
+    "react-native": "0.82.0-rc.0",
+    "react-native-platform-override": "0.82.0-preview.1",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
-    "@types/react": "^19.1.0",
-    "react": "^19.1.0",
-    "react-native": "0.81.5"
+    "@types/react": "^19.1.1",
+    "react": "^19.1.1",
+    "react-native": "0.82.0-rc.0"
   },
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "preview",
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "prerelease",
+      "patch",
       "premajor",
       "preminor",
       "prepatch"
@@ -108,7 +108,6 @@
   },
   "files": [
     "/codegen",
-    "/Chakra",
     "/Common",
     "/DeforkingPatches",
     "fmt",

package/src/private/animated/NativeAnimatedHelper.js

@@ -58,7 +58,6 @@ let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
 
 const shouldSignalBatch: boolean =
-  ReactNativeFeatureFlags.animatedShouldSignalBatch() ||
   ReactNativeFeatureFlags.cxxNativeAnimatedEnabled();
 
 function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
@@ -128,7 +127,7 @@ function createNativeOperations(): $NonMaybeType<typeof NativeAnimatedModule> {
       };
     }
   }
-  // $FlowExpectedError[incompatible-return] - Dynamism.
+  // $FlowExpectedError[incompatible-type] - Dynamism.
   return nativeOperations;
 }
 
@@ -141,10 +140,12 @@ const NativeOperations = createNativeOperations();
 const API = {
   getValue: (isSingleOpBatching
     ? (tag, saveValueCallback) => {
+        /* $FlowFixMe[constant-condition] Error discovered during Constant
+         * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
         if (saveValueCallback) {
           eventListenerGetValueCallbacks[tag] = saveValueCallback;
         }
-        /* $FlowExpectedError[incompatible-call] - `saveValueCallback` is handled
+        /* $FlowExpectedError[incompatible-type] - `saveValueCallback` is handled
             differently when `isSingleOpBatching` is enabled. */
         NativeOperations.getValue(tag);
       }
@@ -240,7 +241,11 @@ const API = {
       }) as () => void,
 
   createAnimatedNode(tag: number, config: AnimatedNodeConfig): void {
-    NativeOperations.createAnimatedNode(tag, config);
+    if (config.disableBatchingForNativeCreate) {
+      NativeAnimatedModule?.createAnimatedNode(tag, config);
+    } else {
+      NativeOperations.createAnimatedNode(tag, config);
+    }
   },
 
   updateAnimatedNodeConfig(tag: number, config: AnimatedNodeConfig): void {
@@ -265,10 +270,12 @@ const API = {
 
   startAnimatingNode: (isSingleOpBatching
     ? (animationId, nodeTag, config, endCallback) => {
+        /* $FlowFixMe[constant-condition] Error discovered during Constant
+         * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
         if (endCallback) {
           eventListenerAnimationFinishedCallbacks[animationId] = endCallback;
         }
-        /* $FlowExpectedError[incompatible-call] - `endCallback` is handled
+        /* $FlowExpectedError[incompatible-type] - `endCallback` is handled
             differently when `isSingleOpBatching` is enabled. */
         NativeOperations.startAnimatingNode(animationId, nodeTag, config);
       }
@@ -350,6 +357,8 @@ function ensureGlobalEventEmitterListeners() {
     params => {
       const {tag} = params;
       const callback = eventListenerGetValueCallbacks[tag];
+      /* $FlowFixMe[constant-condition] Error discovered during Constant
+       * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
       if (!callback) {
         return;
       }
@@ -366,6 +375,8 @@ function ensureGlobalEventEmitterListeners() {
         for (const animation of animations) {
           const {animationId} = animation;
           const callback = eventListenerAnimationFinishedCallbacks[animationId];
+          /* $FlowFixMe[constant-condition] Error discovered during Constant
+           * Condition roll out. See https://fburl.com/workplace/1v97vimq. */
           if (callback) {
             callback(animation);
             delete eventListenerAnimationFinishedCallbacks[animationId];

package/src/private/animated/createAnimatedPropsHook.js

@@ -67,7 +67,7 @@ export default function createAnimatedPropsHook(
 
     useEffect(() => {
       // Animated queue flush is handled deterministically in setImmediate for the following feature flags:
-      // animatedShouldSignalBatch, cxxNativeAnimatedEnabled
+      // cxxNativeAnimatedEnabled
       if (!NativeAnimatedHelper.shouldSignalBatch) {
         // If multiple components call `flushQueue`, the first one will flush the
         // queue and subsequent ones will do nothing.
@@ -89,13 +89,6 @@ export default function createAnimatedPropsHook(
       };
     });
 
-    // NOTE: This feature flag must be evaluated inside the hook because this
-    // module factory can be evaluated much sooner, before overrides are set.
-    const useAnimatedPropsLifecycle =
-      ReactNativeFeatureFlags.scheduleAnimatedCleanupInMicrotask()
-        ? useAnimatedPropsLifecycleWithCleanupInMicrotask
-        : useAnimatedPropsLifecycleWithPrevNodeRef;
-
     useAnimatedPropsLifecycle(node);
 
     // TODO: This "effect" does three things:
@@ -115,7 +108,7 @@ export default function createAnimatedPropsHook(
       (instance: TInstance) => {
         // NOTE: This may be called more often than necessary (e.g. when `props`
         // changes), but `setNativeView` already optimizes for that.
-        // $FlowFixMe[incompatible-call]
+        // $FlowFixMe[incompatible-type]
         node.setNativeView(instance);
 
         // NOTE: When using the JS animation driver, this callback is called on
@@ -132,13 +125,11 @@ export default function createAnimatedPropsHook(
           if (node.__isNative) {
             // Check 2: this is an animation driven by native.
             // In native driven animations, this callback is only called once the animation completes.
-            if (
-              isFabricNode &&
-              !(
-                ReactNativeFeatureFlags.cxxNativeAnimatedEnabled() &&
-                ReactNativeFeatureFlags.cxxNativeAnimatedRemoveJsSync()
-              )
-            ) {
+            const shouldRemoveJsSync =
+              ReactNativeFeatureFlags.cxxNativeAnimatedEnabled() &&
+              !ReactNativeFeatureFlags.disableFabricCommitInCXXAnimated() &&
+              ReactNativeFeatureFlags.cxxNativeAnimatedRemoveJsSync();
+            if (isFabricNode && !shouldRemoveJsSync) {
               // Call `scheduleUpdate` to synchronise Fiber and Shadow tree.
               // Must not be called in Paper.
               scheduleUpdate();
@@ -156,7 +147,7 @@ export default function createAnimatedPropsHook(
 
           if (!isFabricNode) {
             // Check 4: this is a paper instance, call setNativeProps.
-            // $FlowIgnore[not-a-function] - Assume it's still a function.
+            // $FlowFixMe[not-a-function] - Assume it's still a function.
             // $FlowFixMe[incompatible-use]
             return instance.setNativeProps(node.__getAnimatedValue());
           }
@@ -168,7 +159,7 @@ export default function createAnimatedPropsHook(
 
           // This is a Fabric instance and setNativeProps is supported.
 
-          // $FlowIgnore[not-a-function] - Assume it's still a function.
+          // $FlowFixMe[not-a-function] - Assume it's still a function.
           // $FlowFixMe[incompatible-use]
           instance.setNativeProps(node.__getAnimatedValue());
 
@@ -197,7 +188,7 @@ export default function createAnimatedPropsHook(
 
         for (const [propName, propValue] of eventTuples) {
           propValue.__attach(target, propName);
-          // $FlowFixMe[incompatible-call] - the `addListenersToPropsValue` drills down the propValue.
+          // $FlowFixMe[incompatible-type] - the `addListenersToPropsValue` drills down the propValue.
           addListenersToPropsValue(propValue, animatedValueListeners);
         }
 
@@ -262,44 +253,6 @@ function addAnimatedValuesListenersToProps(
   }
 }
 
-/**
- * Manages the lifecycle of the supplied `AnimatedProps` by invoking `__attach`
- * and `__detach`. However, this is more complicated because `AnimatedProps`
- * uses reference counting to determine when to recursively detach its children
- * nodes. So in order to optimize this, we avoid detaching until the next attach
- * unless we are unmounting.
- */
-function useAnimatedPropsLifecycleWithPrevNodeRef(node: AnimatedProps): void {
-  const prevNodeRef = useRef<?AnimatedProps>(null);
-  const isUnmountingRef = useRef<boolean>(false);
-
-  useInsertionEffect(() => {
-    isUnmountingRef.current = false;
-    return () => {
-      isUnmountingRef.current = true;
-    };
-  }, []);
-
-  useInsertionEffect(() => {
-    node.__attach();
-    if (prevNodeRef.current != null) {
-      const prevNode = prevNodeRef.current;
-      // TODO: Stop restoring default values (unless `reset` is called).
-      prevNode.__restoreDefaultValues();
-      prevNode.__detach();
-      prevNodeRef.current = null;
-    }
-    return () => {
-      if (isUnmountingRef.current) {
-        // NOTE: Do not restore default values on unmount, see D18197735.
-        node.__detach();
-      } else {
-        prevNodeRef.current = node;
-      }
-    };
-  }, [node]);
-}
-
 /**
  * Manages the lifecycle of the supplied `AnimatedProps` by invoking `__attach`
  * and `__detach`. However, `__detach` occurs in a microtask for these reasons:
@@ -314,9 +267,7 @@ function useAnimatedPropsLifecycleWithPrevNodeRef(node: AnimatedProps): void {
  * callbacks may update state, which is unsupported and will force synchronous
  * updates.
  */
-function useAnimatedPropsLifecycleWithCleanupInMicrotask(
-  node: AnimatedProps,
-): void {
+function useAnimatedPropsLifecycle(node: AnimatedProps): void {
   const isMounted = useRef<boolean>(false);
 
   useInsertionEffect(() => {

package/src/private/animated/createAnimatedPropsMemoHook.js

@@ -16,9 +16,8 @@ import {AnimatedEvent} from '../../../Libraries/Animated/AnimatedEvent';
 import AnimatedNode from '../../../Libraries/Animated/nodes/AnimatedNode';
 import {isPlainObject} from '../../../Libraries/Animated/nodes/AnimatedObject';
 import flattenStyle from '../../../Libraries/StyleSheet/flattenStyle';
-import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlags';
 import nullthrows from 'nullthrows';
-import {useInsertionEffect, useMemo, useRef, useState} from 'react';
+import {useInsertionEffect, useMemo, useRef} from 'react';
 
 type CompositeKey = {
   style?: {[string]: CompositeKeyComponent},
@@ -64,19 +63,6 @@ export function createAnimatedPropsMemoHook(
   return function useAnimatedPropsMemo(
     create: () => AnimatedProps,
     props: $ReadOnly<{[string]: mixed}>,
-  ): AnimatedProps {
-    // NOTE: This feature flag must be evaluated inside the hook because this
-    // module factory can be evaluated much sooner, before overrides are set.
-    const useAnimatedPropsImpl =
-      ReactNativeFeatureFlags.avoidStateUpdateInAnimatedPropsMemo()
-        ? useAnimatedPropsMemo_ref
-        : useAnimatedPropsMemo_state;
-    return useAnimatedPropsImpl(create, props);
-  };
-
-  function useAnimatedPropsMemo_ref(
-    create: () => AnimatedProps,
-    props: $ReadOnly<{[string]: mixed}>,
   ): AnimatedProps {
     const compositeKey = useMemo(
       () => createCompositeKeyForProps(props, allowlist),
@@ -102,39 +88,7 @@ export function createAnimatedPropsMemoHook(
     }, [next]);
 
     return next.node;
-  }
-
-  function useAnimatedPropsMemo_state(
-    create: () => AnimatedProps,
-    props: $ReadOnly<{[string]: mixed}>,
-  ): AnimatedProps {
-    const compositeKey = useMemo(
-      () => createCompositeKeyForProps(props, allowlist),
-      [props],
-    );
-
-    const [state, setState] = useState<{
-      allowlist: ?AnimatedPropsAllowlist,
-      compositeKey: $ReadOnlyCompositeKey | null,
-      value: AnimatedProps,
-    }>(() => ({
-      allowlist,
-      compositeKey,
-      value: create(),
-    }));
-
-    if (
-      state.allowlist !== allowlist ||
-      !areCompositeKeysEqual(state.compositeKey, compositeKey)
-    ) {
-      setState({
-        allowlist,
-        compositeKey,
-        value: create(),
-      });
-    }
-    return state.value;
-  }
+  };
 }
 
 /**
@@ -310,9 +264,9 @@ export function areCompositeKeysEqual(
       // We know style components are objects with non-mixed values.
       if (
         !areCompositeKeyComponentsEqual(
-          // $FlowIgnore[incompatible-cast]
+          // $FlowFixMe[incompatible-type]
           prevComponent as $ReadOnlyCompositeKeyComponent,
-          // $FlowIgnore[incompatible-cast]
+          // $FlowFixMe[incompatible-type]
           nextComponent as $ReadOnlyCompositeKeyComponent,
         )
       ) {
@@ -335,9 +289,9 @@ export function areCompositeKeysEqual(
       } else {
         if (
           !areCompositeKeyComponentsEqual(
-            // $FlowIgnore[incompatible-cast]
+            // $FlowFixMe[incompatible-type]
             prevComponent as $ReadOnlyCompositeKeyComponent,
-            // $FlowIgnore[incompatible-cast]
+            // $FlowFixMe[incompatible-type]
             nextComponent as $ReadOnlyCompositeKeyComponent,
           )
         ) {
@@ -399,8 +353,8 @@ function areCompositeKeyComponentsEqual(
 
 // Supported versions of JSC do not implement the newer Object.hasOwn. Remove
 // this shim when they do.
-// $FlowIgnore[method-unbinding]
+// $FlowFixMe[method-unbinding]
 const _hasOwnProp = Object.prototype.hasOwnProperty;
 const hasOwn: (obj: $ReadOnly<{...}>, prop: string) => boolean =
-  // $FlowIgnore[method-unbinding]
+  // $FlowFixMe[method-unbinding]
   Object.hasOwn ?? ((obj, prop) => _hasOwnProp.call(obj, prop));