react-native-tvos 0.76.5-0 → 0.77.0-0

package/scripts/codegen/generate-specs-cli-executor.js

@@ -11,7 +11,6 @@
 
 const utils = require('./codegen-utils');
 const fs = require('fs');
-const mkdirp = require('mkdirp');
 const path = require('path');
 
 const GENERATORS = {
@@ -33,7 +32,7 @@ function createOutputDirectoryIfNeeded(outputDirectory, libraryName) {
   if (!outputDirectory) {
     outputDirectory = path.resolve(__dirname, '..', 'Libraries', libraryName);
   }
-  mkdirp.sync(outputDirectory);
+  fs.mkdirSync(outputDirectory, {recursive: true});
 }
 
 /**
@@ -81,6 +80,7 @@ function generateSpecFromInMemorySchema(
       schema,
       outputDirectory,
       packageName,
+      assumeNonnull: platform === 'ios',
       useLocalIncludePaths,
     },
     {
@@ -95,7 +95,7 @@ function generateSpecFromInMemorySchema(
     // * this subdir structure is Android-only, not applicable to iOS
     const files = fs.readdirSync(outputDirectory);
     const jniOutputDirectory = `${outputDirectory}/jni/react/renderer/components/${libraryName}`;
-    mkdirp.sync(jniOutputDirectory);
+    fs.mkdirSync(jniOutputDirectory, {recursive: true});
     files
       .filter(f => f.endsWith('.h') || f.endsWith('.cpp'))
       .forEach(f => {

package/scripts/codegen/templates/RCTAppDependencyProviderH.template

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React-RCTAppDelegate/RCTDependencyProvider.h>
+#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React_RCTAppDelegate/RCTDependencyProvider.h>
+#else
+#import "RCTDependencyProvider.h"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTAppDependencyProvider : NSObject <RCTDependencyProvider>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/scripts/codegen/templates/RCTAppDependencyProviderMM.template

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTAppDependencyProvider.h"
+#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+
+@implementation RCTAppDependencyProvider {
+  NSArray<NSString *> * _URLRequestHandlerClassNames;
+  NSArray<NSString *> * _imageDataDecoderClassNames;
+  NSArray<NSString *> * _imageURLLoaderClassNames;
+  NSDictionary<NSString *,Class<RCTComponentViewProtocol>> * _thirdPartyFabricComponents;
+}
+
+- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
+  static dispatch_once_t requestUrlToken;
+  dispatch_once(&requestUrlToken, ^{
+    self->_URLRequestHandlerClassNames = RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
+  });
+
+  return _URLRequestHandlerClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
+  static dispatch_once_t dataDecoderToken;
+  dispatch_once(&dataDecoderToken, ^{
+    _imageDataDecoderClassNames = RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
+  });
+
+  return _imageDataDecoderClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
+  static dispatch_once_t urlLoaderToken;
+  dispatch_once(&urlLoaderToken, ^{
+    _imageURLLoaderClassNames = RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;
+  });
+
+  return _imageURLLoaderClassNames;
+}
+
+- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
+  static dispatch_once_t nativeComponentsToken;
+  dispatch_once(&nativeComponentsToken, ^{
+    _thirdPartyFabricComponents = RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
+  });
+
+  return _thirdPartyFabricComponents;
+}
+
+@end

package/scripts/codegen/templates/RCTThirdPartyComponentsProviderH.template

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol RCTComponentViewProtocol;
+
+@interface RCTThirdPartyComponentsProvider: NSObject
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
+
+@end

package/scripts/codegen/templates/RCTThirdPartyComponentsProviderMM.template

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#import "RCTThirdPartyComponentsProvider.h"
+#import <React/RCTComponentViewProtocol.h>
+
+@implementation RCTThirdPartyComponentsProvider
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
+{
+  return @{
+{thirdPartyComponentsMapping}
+  };
+}
+
+@end

package/scripts/codegen/templates/ReactAppDependencyProvider.podspec.template

@@ -0,0 +1,34 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+version = "{react-native-version}"
+source = { :git => 'https://github.com/facebook/react-native.git' }
+if version == '1000.0.0'
+  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+Pod::Spec.new do |s|
+  s.name                   = "ReactAppDependencyProvider"
+  s.version                = version
+  s.summary                = "The third party dependency provider for the app"
+  s.homepage               = "https://reactnative.dev/"
+  s.documentation_url      = "https://reactnative.dev/"
+  s.license                = "{react-native-licence}"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
+  s.platforms              = min_supported_versions
+  s.source                 = source
+  s.source_files           = "**/RCTAppDependencyProvider.{h,mm}"
+
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+  s.pod_target_xcconfig    = {
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
+    "DEFINES_MODULE" => "YES"
+  }
+
+  s.dependency "ReactCodegen"
+end

package/scripts/generate-provider-cli.js

@@ -11,7 +11,6 @@
 
 const utils = require('./codegen/codegen-utils');
 const fs = require('fs');
-const mkdirp = require('mkdirp');
 const yargs = require('yargs');
 
 const argv = yargs
@@ -49,7 +48,7 @@ function generateProvider(platform, schemaListPath, outputDirectory) {
   if (!outputDirectory) {
     throw new Error('outputDir is required');
   }
-  mkdirp.sync(outputDirectory);
+  fs.mkdirSync(outputDirectory, {recursive: true});
 
   let schemaPaths;
   try {

package/scripts/ios-configure-glog.sh

@@ -42,7 +42,7 @@ EOF
     patch -p1 config.sub fix_glog_0.3.5_apple_silicon.patch
 fi
 
-XCRUN="$(which xcrun)"
+XCRUN="$(which xcrun || true)"
 if [ -n "$XCRUN" ]; then
   export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
   export CXX="$CC"
@@ -61,7 +61,7 @@ fi
 sed -i.bak -e 's/\@ac_cv_have_libgflags\@/0/' src/glog/logging.h.in && rm src/glog/logging.h.in.bak
 sed -i.bak -e 's/HAVE_LIB_GFLAGS/HAVE_LIB_GFLAGS_DISABLED/' src/config.h.in && rm src/config.h.in.bak
 
-./configure --host arm-apple-darwin
+./configure --host arm-apple-darwin || true
 
 # Fix build for tvOS
 cat << EOF >> src/config.h

package/scripts/react-native-xcode.sh

@@ -102,7 +102,10 @@ else
   CONFIG_ARG="--config $BUNDLE_CONFIG"
 fi
 
-BUNDLE_FILE="$CONFIGURATION_BUILD_DIR/main.jsbundle"
+if [[ -z "$BUNDLE_NAME" ]]; then
+  BUNDLE_NAME="main"
+fi
+BUNDLE_FILE="$CONFIGURATION_BUILD_DIR/$BUNDLE_NAME.jsbundle"
 
 EXTRA_ARGS=()
 
@@ -162,7 +165,7 @@ fi
 
 if [[ $USE_HERMES == false ]]; then
   cp "$BUNDLE_FILE" "$DEST/"
-  BUNDLE_FILE="$DEST/main.jsbundle"
+  BUNDLE_FILE="$DEST/$BUNDLE_NAME.jsbundle"
 else
   EXTRA_COMPILER_ARGS=
   if [[ $DEV == true ]]; then
@@ -173,14 +176,14 @@ else
   if [[ $EMIT_SOURCEMAP == true ]]; then
     EXTRA_COMPILER_ARGS="$EXTRA_COMPILER_ARGS -output-source-map"
   fi
-  "$HERMES_CLI_PATH" -emit-binary -max-diagnostic-width=80 $EXTRA_COMPILER_ARGS -out "$DEST/main.jsbundle" "$BUNDLE_FILE"
+  "$HERMES_CLI_PATH" -emit-binary -max-diagnostic-width=80 $EXTRA_COMPILER_ARGS -out "$DEST/$BUNDLE_NAME.jsbundle" "$BUNDLE_FILE"
   if [[ $EMIT_SOURCEMAP == true ]]; then
-    HBC_SOURCEMAP_FILE="$DEST/main.jsbundle.map"
+    HBC_SOURCEMAP_FILE="$DEST/$BUNDLE_NAME.jsbundle.map"
     "$NODE_BINARY" "$COMPOSE_SOURCEMAP_PATH" "$PACKAGER_SOURCEMAP_FILE" "$HBC_SOURCEMAP_FILE" -o "$SOURCEMAP_FILE"
     rm "$HBC_SOURCEMAP_FILE"
     rm "$PACKAGER_SOURCEMAP_FILE"
   fi
-  BUNDLE_FILE="$DEST/main.jsbundle"
+  BUNDLE_FILE="$DEST/$BUNDLE_NAME.jsbundle"
 fi
 
 if [[ $DEV != true && ! -f "$BUNDLE_FILE" ]]; then

package/scripts/react_native_pods.rb

@@ -130,6 +130,7 @@ def use_react_native! (
   pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
   pod 'React-nativeconfig', :path => "#{prefix}/ReactCommon"
   pod 'RCTDeprecation', :path => "#{prefix}/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
+  pod 'React-RCTFBReactNativeSpec', :path => "#{prefix}/React"
 
   if hermes_enabled
     setup_hermes!(:react_native_path => prefix)
@@ -156,6 +157,7 @@ def use_react_native! (
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
   pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
+  pod 'fast_float', :podspec => "#{prefix}/third-party-podspecs/fast_float.podspec"
   pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
   pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
@@ -175,6 +177,7 @@ def use_react_native! (
   )
 
   pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
+  pod 'ReactAppDependencyProvider', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   # Always need fabric to access the RCTSurfacePresenterBridgeAdapter which allow to enable the RuntimeScheduler
   # If the New Arch is turned off, we will use the Old Renderer, though.
@@ -281,6 +284,13 @@ def get_glog_config()
   return Helpers::Constants.glog_config
 end
 
+# This method returns an hash with the fast_float git url
+# that can be used to configure libraries.
+# @return an hash with the `:git` field.
+def get_fast_float_config()
+  return Helpers::Constants.fast_float_config
+end
+
 # This method returns an hash with the fmt git url
 # that can be used to configure libraries.
 # @return an hash with the `:git` field.
@@ -320,6 +330,12 @@ def set_glog_config(glog_config)
    Helpers::Constants.set_glog_config(glog_config)
 end
 
+# This method can be used to set the fast_float config
+# that can be used to configure libraries.
+def set_fast_float_config(fmt_config)
+  Helpers::Constants.set_fast_float_config(fast_float_config)
+end
+
 # This method can be used to set the fmt config
 # that can be used to configure libraries.
 def set_fmt_config(fmt_config)

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-11-12-RNv0.76.2-5b4aa20c719830dcf5684832b89a6edb95ac3d64
+hermes-2024-11-25-RNv0.77.0-d4f25d534ab744866448b36ca3bf3d97c08e638c

package/sdks/hermes-engine/hermes-engine.podspec

@@ -6,16 +6,21 @@
 require "json"
 require_relative "./hermes-utils.rb"
 
-react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-  "react-native",
+begin
+  react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
+    'require.resolve(
+    "react-native",
     {paths: [process.argv[1]]},
-  )', __dir__]).strip
-)
+    )', __dir__]).strip
+  )
+rescue => e
+  # Fallback to the parent directory if the above command fails (e.g when building locally in OOT Platform)
+  react_native_path = File.join(__dir__, "..", "..")
+end
 
 # package.json
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
-version = package['version']
+version = core_version(package['version'])
 
 source_type = hermes_source_type(version, react_native_path)
 source = podspec_source(source_type, version, react_native_path)
@@ -36,11 +41,12 @@ Pod::Spec.new do |spec|
 
   spec.pod_target_xcconfig = {
                     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-                    "CLANG_CXX_LIBRARY" => "compiler-default"
+                    "CLANG_CXX_LIBRARY" => "compiler-default",
+                    "GCC_WARN_INHIBIT_ALL_WARNINGS" => "YES" # Disable warnings because we don't control this library
                   }
 
-  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.framework"
-  spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.framework"
+  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/ios/hermes.framework"
+  spec.tvos.vendored_frameworks = "destroot/Library/Frameworks/tvos/hermes.framework"
   spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
   spec.visionos.vendored_frameworks = "destroot/Library/Frameworks/xros/hermes.framework"
 

package/sdks/hermes-engine/hermes-utils.rb

@@ -101,6 +101,27 @@ def nightly_artifact_exists(version)
     return hermes_artifact_exists(nightly_tarball_url(version).gsub("\\", ""))
 end
 
+# Computes the core release version on which this TV release version is based
+def core_version(version)
+    match = version.match(/(.+)-(.+)/)
+    if match.nil?
+      hermes_log("core_version = #{version}")
+      return version
+    end
+
+    core_base_version = match[1]
+    prerelease = match[2]
+    prerelease_match = prerelease.match(/0rc(\d+)/)
+    if prerelease_match.nil?
+        hermes_log("core_version = #{core_base_version}")
+        return core_base_version
+    end
+
+    cv = "#{core_base_version}-rc.#{prerelease_match[1]}"
+    hermes_log("core_version = #{cv}")
+    return cv
+end
+
 def podspec_source(source_type, version, react_native_path)
     case source_type
     when HermesEngineSourceType::BUILD_FROM_LOCAL_SOURCE_DIR
@@ -126,7 +147,9 @@ def podspec_source_build_from_local_source_dir(react_native_path)
     source_dir_path = ENV['REACT_NATIVE_OVERRIDE_HERMES_DIR']
     if Dir.exist?(source_dir_path)
         hermes_log("Using source code from local path: #{source_dir_path}")
-        tarball_path = File.join(artifacts_dir(), "hermes-engine-from-local-source-dir.tar.gz")
+        tarball_dir_path = artifacts_dir()
+        FileUtils.mkdir_p(tarball_dir_path) unless Dir.exist?(tarball_dir_path)
+        tarball_path = File.join(tarball_dir_path, "hermes-engine-from-local-source-dir.tar.gz")
         exclude_paths = [
             "__tests__",
             "./external/flowtest",
@@ -202,13 +225,11 @@ def hermestag_file(react_native_path)
 end
 
 def release_tarball_url(version, build_type)
-    if ENV["HERMES_ARTIFACT_FROM_MAVEN_LOCAL"] == "1"
-      return "file:///tmp/maven-local/io/github/react-native-tvos/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
-    end
-    # React Native core URL
-    #return "https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
-    # React Native TV URL
-    return "https://repo1.maven.org/maven2/io/github/react-native-tvos/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+    maven_repo_url = "https://repo1.maven.org/maven2"
+    namespace = "com/facebook/react"
+    # Sample url from Maven:
+    # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
+    return "#{maven_repo_url}/#{namespace}/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
 end
 
 def download_stable_hermes(react_native_path, version, configuration)

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -31,9 +31,7 @@ function get_architecture {
 function get_deployment_target {
     if [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
       echo "$(get_visionos_deployment_target)"
-    elif [[ $1 == "appletvos" || $1 == "appletvsimulator" ]]; then
-      echo "$(get_tvos_deployment_target)"
-    else
+    else # tvOS and iOS use the same deployment target
       echo "$(get_ios_deployment_target)"
     fi
 }
@@ -52,24 +50,10 @@ function build_framework {
   fi
 }
 
-# Allows RNTV CI to optionally build Vision OS framework
-function set_include_vision {
-    if [[ "$INCLUDE_VISION_OS" == "0" || "$INCLUDE_VISION_OS" == "false" || "$INCLUDE_VISION_OS" == "FALSE" ]]; then
-        include_vision=0
-    else
-        include_vision=1
-    fi
-}
-
 # group the frameworks together to create a universal framework
 function build_universal_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        set_include_vision
-        if [[ $include_vision == 1 ]]; then
-            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
-        else
-            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "appletvos" "appletvsimulator"
-        fi
+        create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -79,17 +63,13 @@ function build_universal_framework {
 # this is used to preserve backward compatibility
 function create_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        set_include_vision
-
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
-        if [[ $include_vision == 1 ]]; then
-            build_framework "xros"
-            build_framework "xrsimulator"
-        fi
+        build_framework "xros"
+        build_framework "xrsimulator"
         build_universal_framework
     else
         echo "Skipping; Clean \"destroot\" to rebuild".

package/src/private/animated/NativeAnimatedHelper.js

@@ -8,7 +8,6 @@
  * @format
  */
 
-import type {EventSubscription} from '../../../Libraries/vendor/emitter/EventEmitter';
 import type {EventConfig} from '../../../Libraries/Animated/AnimatedEvent';
 import type {
   AnimationConfig,
@@ -18,13 +17,14 @@ import type {
   AnimatedNodeConfig,
   EventMapping,
 } from '../../../Libraries/Animated/NativeAnimatedModule';
+import type {EventSubscription} from '../../../Libraries/vendor/emitter/EventEmitter';
 
-import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlags';
+import NativeAnimatedNonTurboModule from '../../../Libraries/Animated/NativeAnimatedModule';
+import NativeAnimatedTurboModule from '../../../Libraries/Animated/NativeAnimatedTurboModule';
 import NativeEventEmitter from '../../../Libraries/EventEmitter/NativeEventEmitter';
 import RCTDeviceEventEmitter from '../../../Libraries/EventEmitter/RCTDeviceEventEmitter';
 import Platform from '../../../Libraries/Utilities/Platform';
-import NativeAnimatedNonTurboModule from '../../../Libraries/Animated/NativeAnimatedModule';
-import NativeAnimatedTurboModule from '../../../Libraries/Animated/NativeAnimatedTurboModule';
+import * as ReactNativeFeatureFlags from '../featureflags/ReactNativeFeatureFlags';
 import invariant from 'invariant';
 import nullthrows from 'nullthrows';
 
@@ -46,7 +46,7 @@ const isSingleOpBatching =
   Platform.OS === 'android' &&
   NativeAnimatedModule?.queueAndExecuteBatchedOperations != null &&
   ReactNativeFeatureFlags.animatedShouldUseSingleOp();
-let flushQueueTimeout = null;
+let flushQueueImmediate = null;
 
 const eventListenerGetValueCallbacks: {
   [number]: (value: number) => void,
@@ -142,9 +142,13 @@ const API = {
     queueOperations = true;
     if (
       ReactNativeFeatureFlags.animatedShouldDebounceQueueFlush() &&
-      flushQueueTimeout
+      flushQueueImmediate
     ) {
-      clearTimeout(flushQueueTimeout);
+      if (ReactNativeFeatureFlags.enableAnimatedClearImmediateFix()) {
+        clearImmediate(flushQueueImmediate);
+      } else {
+        clearTimeout(flushQueueImmediate);
+      }
     }
   },
 
@@ -161,9 +165,9 @@ const API = {
     invariant(NativeAnimatedModule, 'Native animated module is not available');
 
     if (ReactNativeFeatureFlags.animatedShouldDebounceQueueFlush()) {
-      const prevTimeout = flushQueueTimeout;
-      clearImmediate(prevTimeout);
-      flushQueueTimeout = setImmediate(API.flushQueue);
+      const prevImmediate = flushQueueImmediate;
+      clearImmediate(prevImmediate);
+      flushQueueImmediate = setImmediate(API.flushQueue);
     } else {
       API.flushQueue();
     }
@@ -171,12 +175,11 @@ const API = {
 
   flushQueue: (isSingleOpBatching
     ? (): void => {
-        // TODO: (T136971132)
         invariant(
-          NativeAnimatedModule || process.env.NODE_ENV === 'test',
+          NativeAnimatedModule,
           'Native animated module is not available',
         );
-        flushQueueTimeout = null;
+        flushQueueImmediate = null;
 
         if (singleOpQueue.length === 0) {
           return;
@@ -193,12 +196,11 @@ const API = {
         singleOpQueue.length = 0;
       }
     : (): void => {
-        // TODO: (T136971132)
         invariant(
-          NativeAnimatedModule || process.env.NODE_ENV === 'test',
+          NativeAnimatedModule,
           'Native animated module is not available',
         );
-        flushQueueTimeout = null;
+        flushQueueImmediate = null;
 
         if (queue.length === 0) {
           return;