react-native-windows 0.73.11 → 0.74.0-preview.2

package/.flowconfig

@@ -1,6 +1,6 @@
 [ignore]
 ; We fork some components by platform - ignore all platforms except windows
-.*/*[.]android.js
+.*/!(ProgressBarAndroid)[.]android.js
 .*/*[.]ios.js
 .*/*[.]macos.js
 
@@ -11,10 +11,7 @@
 <PROJECT_ROOT>/Libraries/Alert/Alert.js
 <PROJECT_ROOT>/Libraries/Components/Button.js
 <PROJECT_ROOT>/Libraries/Components/Picker/RCTPickerNativeComponent.js
-<PROJECT_ROOT>/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.js
 <PROJECT_ROOT>/Libraries/Components/RefreshControl/RefreshControl.js
-<PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
-<PROJECT_ROOT>/Libraries/Components/ScrollView/ScrollView.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/Touchable.js
@@ -28,6 +25,7 @@
 <PROJECT_ROOT>/Libraries/Components/View/View.js
 <PROJECT_ROOT>/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
 <PROJECT_ROOT>/Libraries/Image/Image.js
+<PROJECT_ROOT>/Libraries/Image/resolveAssetSource.js
 <PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/DebugInstructions.js
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/ReloadInstructions.js
@@ -64,14 +62,20 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
-.*/vnext/src/.*
+; Ignore the src-win folder - flow files are combined with ones from react-native into the root Libraries folder
+.*/vnext/src-win/.*
+
+; Ignore the private __tests__ (until this is fixed: https://github.com/facebook/react-native/issues/43242)
+.*/vnext/src/private/.*/__tests__/.*
 
 .*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
 
 ; Checked-in build output
 <PROJECT_ROOT>/packages/debugger-frontend/dist/
 
+; Generated build output
+<PROJECT_ROOT>/packages/.*/dist
+
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 
@@ -87,6 +91,7 @@ flow/
 [options]
 experimental.global_find_ref=true
 enums=true
+casting_syntax=both
 
 emoji=true
 
@@ -141,4 +146,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.217.0
+^0.228.0

package/Chakra/ChakraUtils.cpp

@@ -88,7 +88,7 @@ JsValueRefUniquePtr jsArrayBufferFromBigString(const std::shared_ptr<const JSBig
   return MakeJsValueRefUniquePtr(arrayBuffer);
 }
 
-FileMappingBigString::FileMappingBigString(const std::string &filenameUtf8, uint32_t offset)
+FileMappingBigString::FileMappingBigString(const std::wstring &filename, uint32_t offset)
     : JSBigString{},
       m_fileMapping{nullptr, &CloseHandle},
       m_fileData{nullptr, &fileDataDeleter},
@@ -97,17 +97,12 @@ FileMappingBigString::FileMappingBigString(const std::string &filenameUtf8, uint
       m_fileSize{0} {
 #if (defined(WINRT))
   std::unique_ptr<void, decltype(&CloseHandle)> fileHandle{
-      CreateFile2(
-          Microsoft::Common::Unicode::Utf8ToUtf16(filenameUtf8).c_str(),
-          GENERIC_READ,
-          FILE_SHARE_READ,
-          OPEN_EXISTING,
-          nullptr /* pCreateExParams */),
+      CreateFile2(filename.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr /* pCreateExParams */),
       &CloseHandle};
 #else
   std::unique_ptr<void, decltype(&CloseHandle)> fileHandle{
       CreateFileW(
-          Microsoft::Common::Unicode::Utf8ToUtf16(filenameUtf8).c_str(),
+          filename.c_str(),
           GENERIC_READ,
           FILE_SHARE_READ,
           nullptr /* lpSecurityAttributes */,
@@ -189,8 +184,8 @@ FileMappingBigString::FileMappingBigString(const std::string &filenameUtf8, uint
   }
 }
 
-std::unique_ptr<const FileMappingBigString> FileMappingBigString::fromPath(const std::string &filenameUtf8) {
-  return std::make_unique<FileMappingBigString>(filenameUtf8);
+std::unique_ptr<const FileMappingBigString> FileMappingBigString::fromPath(const std::wstring &filename) {
+  return std::make_unique<FileMappingBigString>(filename);
 }
 
 } // namespace react

package/Chakra/ChakraUtils.h

@@ -29,7 +29,7 @@ JsValueRefUniquePtr jsArrayBufferFromBigString(const std::shared_ptr<const JSBig
 // page-file backed,  null-terminated buffer
 class FileMappingBigString : public JSBigString {
  public:
-  FileMappingBigString(const std::string &filenameUtf8, uint32_t offset = 0);
+  FileMappingBigString(const std::wstring &filename, uint32_t offset = 0);
 
   bool isAscii() const override {
     return false;
@@ -53,7 +53,7 @@ class FileMappingBigString : public JSBigString {
     return m_fileSize;
   }
 
-  static std::unique_ptr<const FileMappingBigString> fromPath(const std::string &filenameUtf8);
+  static std::unique_ptr<const FileMappingBigString> fromPath(const std::wstring &filename);
 
  private:
   static void fileDataDeleter(void *p) {

package/Common/packages.lock.json

@@ -10,9 +10,9 @@
       },
       "Microsoft.Windows.CppWinRT": {
         "type": "Direct",
-        "requested": "[2.0.211028.7, )",
-        "resolved": "2.0.211028.7",
-        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+        "requested": "[2.0.230706.1, )",
+        "resolved": "2.0.230706.1",
+        "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ=="
       }
     },
     "native,Version=v0.0/win10-arm": {},

package/Directory.Build.props

@@ -16,13 +16,13 @@
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
     <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit and build Folly.vcxproj (to update its cgmanifest.json) too. -->
-    <FollyVersion>2023.03.06.00</FollyVersion>
-    <FollyCommitHash>ce2b95715de229fcb51bd97410469a3ad4d2bfb2</FollyCommitHash>
+    <FollyVersion>2023.11.06.00</FollyVersion>
+    <FollyCommitHash>d62707bf4dc8c58bcc317260611b8cbe25c7f444</FollyCommitHash>
     <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
     <FmtVersion>10.1.0</FmtVersion>
     <FmtCommitHash>ca2e3685b160617d3d95fcd9e789c4e06ca88</FmtCommitHash>
     <!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
-    <NodeApiJsiCommitHash>53b897b03c1c7e57c3372acc6234447a44e150d6</NodeApiJsiCommitHash>
+    <NodeApiJsiCommitHash>83cfef428a97627c9185c73da097e42742de56eb</NodeApiJsiCommitHash>
   </PropertyGroup>
 
   <!--
@@ -30,7 +30,7 @@
     [MSBuild]::NormalizeDirectory on relative paths since cwd is not always correct. This logic should prefer to operate
     on full paths and avoid extra normalization.
   -->
-  <PropertyGroup>
+  <PropertyGroup Label="NodeNativeDeps" Condition="'$(IgnoreNodeNativeDeps)' != 'true'">
     <ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$(MSBuildThisFileDirectory)</ReactNativeWindowsDir>
 
     <ReactNativeDir Condition="'$(ReactNativeDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\</ReactNativeDir>
@@ -80,4 +80,4 @@
     <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.6')) AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
-</Project>
+</Project>

package/Folly/Folly.vcxproj

@@ -254,7 +254,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ReactNativeWindowsDir)stubs;$(FollyDir);$(FmtDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>FOLLY_NO_CONFIG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WINAPI_PARTITION_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FOLLY_CFG_NO_COROUTINES;FOLLY_NO_CONFIG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WINAPI_PARTITION_APP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedUsingFiles />
       <DisableSpecificWarnings>4251;4293;4305;4800;4804;4310;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
@@ -328,4 +328,4 @@
   <ItemGroup>
     <ProjectReference Include="..\Fmt\Fmt.vcxproj" Project="{14b93DC8-FD93-4A6D-81CB-8BC96644501C}" />
   </ItemGroup>
-</Project>
+</Project>

package/Folly/Folly.vcxproj.filters

@@ -83,6 +83,13 @@
     </ClCompile>
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="$(FollyDir)\folly\system\AtFork.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\SharedMutex.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\concurrency\CacheLocality.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\detail\Futex.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\synchronization\ParkingLot.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\synchronization\SanitizeThread.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\portability\SysResource.cpp" />
+    <ClCompile Include="$(FollyDir)\folly\portability\Unistd.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(FollyDir)\folly\portability\Asm.h">

package/Folly/TEMP_UntilFollyUpdate/dynamic-inl.h

@@ -393,6 +393,20 @@ dynamic::dynamic(Iterator first, Iterator last) : type_(ARRAY) {
   new (&u_.array) Array(first, last);
 }
 
+template <
+    class T,
+    class NumericType /* = typename NumericTypeHelper<T>::type */>
+dynamic& dynamic::operator=(T t) {
+  const auto newType = TypeInfo<NumericType>::type;
+  if (type_ == newType) {
+    *getAddress<NumericType>() = t;
+  } else {
+    destroy();
+    new (getAddress<NumericType>()) NumericType(t);
+    type_ = newType;
+  }
+  return *this;
+}
 //////////////////////////////////////////////////////////////////////
 
 inline dynamic::const_iterator dynamic::begin() const {
@@ -846,6 +860,13 @@ inline dynamic::iterator dynamic::insert(const_iterator pos, T&& value) {
   return arr.insert(pos, std::forward<T>(value));
 }
 
+template <class InputIt>
+inline dynamic::iterator dynamic::insert(
+    const_iterator pos, InputIt first, InputIt last) {
+  auto& arr = get<Array>();
+  return arr.insert(pos, first, last);
+}
+
 inline void dynamic::update(const dynamic& mergeObj) {
   if (!isObject() || !mergeObj.isObject()) {
     throw_exception<TypeError>("object", type(), mergeObj.type());
@@ -1415,4 +1436,4 @@ class FormatValue<detail::DefaultValueWrapper<dynamic, V>> {
 
 } // namespace folly
 
-#undef FB_DYNAMIC_APPLY
+#undef FB_DYNAMIC_APPLY

package/Folly/TEMP_UntilFollyUpdate/lang/SafeAssert.h

@@ -140,10 +140,13 @@ struct safe_assert_msg_types<safe_assert_msg_type_s<A...>> {
   using value_type = c_array<safe_assert_msg_type, sizeof...(A) + 1>;
   static constexpr value_type value = {{A..., safe_assert_msg_type::term}};
 };
+
+#if FOLLY_CPLUSPLUS < 201703L
 template <safe_assert_msg_type... A>
 constexpr
     typename safe_assert_msg_types<safe_assert_msg_type_s<A...>>::value_type
         safe_assert_msg_types<safe_assert_msg_type_s<A...>>::value;
+#endif
 
 struct safe_assert_arg {
   char const* expr;
@@ -164,7 +167,7 @@ template <bool P>
 [[noreturn]] FOLLY_COLD FOLLY_NOINLINE void safe_assert_terminate(
     safe_assert_arg const* arg, ...) noexcept; // the true backing function
 
-// [Win - Fixes Error C2908 explicit specialization; 'void folly::detail::safe_assert_terminate<false>(const folly::detail::safe_assert_arg *,...) noexcept' has already been instantiated 
+// [Win - Fixes Error C2908 explicit specialization; 'void folly::detail::safe_assert_terminate<false>(const folly::detail::safe_assert_arg *,...) noexcept' has already been instantiated
 template <>
 [[noreturn]] FOLLY_COLD FOLLY_NOINLINE void safe_assert_terminate<0>(
     safe_assert_arg const* arg, ...) noexcept;

package/Folly/cgmanifest.json

@@ -6,7 +6,7 @@
                 "Type": "git",
                 "Git": {
                   "RepositoryUrl": "https://github.com/facebook/folly",
-                  "CommitHash": "ce2b95715de229fcb51bd97410469a3ad4d2bfb2"
+                  "CommitHash": "d62707bf4dc8c58bcc317260611b8cbe25c7f444"
                 }
             },
             "DevelopmentDependency": false

package/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts

@@ -74,6 +74,12 @@ export interface ActionSheetIOSStatic {
     failureCallback: (error: Error) => void,
     successCallback: (success: boolean, method: string) => void,
   ) => void;
+
+  /**
+   * Dismisses the most upper iOS action sheet presented, if no action sheet is
+   * present a warning is displayed.
+   */
+  dismissActionSheet: () => void;
 }
 
 export const ActionSheetIOS: ActionSheetIOSStatic;

package/Libraries/ActionSheetIOS/ActionSheetIOS.js

@@ -89,7 +89,9 @@ const ActionSheetIOS = {
     RCTActionSheetManager.showActionSheetWithOptions(
       {
         ...remainingOptions,
+        // $FlowFixMe[incompatible-call]
         tintColor: processedTintColor,
+        // $FlowFixMe[incompatible-call]
         cancelButtonTintColor: processedCancelButtonTintColor,
         destructiveButtonIndices,
       },
@@ -145,6 +147,10 @@ const ActionSheetIOS = {
     );
   },
 
+  /**
+   * Dismisses the most upper iOS action sheet presented, if no action sheet is
+   * present a warning is displayed.
+   */
   dismissActionSheet: () => {
     invariant(RCTActionSheetManager, "ActionSheetManager doesn't exist");
     if (typeof RCTActionSheetManager.dismissActionSheet === 'function') {

package/Libraries/ActionSheetIOS/NativeActionSheetManager.js

@@ -4,51 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {||};
-  +showActionSheetWithOptions: (
-    options: {|
-      +title?: ?string,
-      +message?: ?string,
-      +options: ?Array<string>,
-      +destructiveButtonIndices?: ?Array<number>,
-      +cancelButtonIndex?: ?number,
-      +anchor?: ?number,
-      +tintColor?: ?number,
-      +cancelButtonTintColor?: ?number,
-      +userInterfaceStyle?: ?string,
-      +disabledButtonIndices?: Array<number>,
-    |},
-    callback: (buttonIndex: number) => void,
-  ) => void;
-  +showShareActionSheetWithOptions: (
-    options: {|
-      +message?: ?string,
-      +url?: ?string,
-      +subject?: ?string,
-      +anchor?: ?number,
-      +tintColor?: ?number,
-      +cancelButtonTintColor?: ?number,
-      +excludedActivityTypes?: ?Array<string>,
-      +userInterfaceStyle?: ?string,
-    |},
-    failureCallback: (error: {|
-      +domain: string,
-      +code: string,
-      +userInfo?: ?Object,
-      +message: string,
-    |}) => void,
-    successCallback: (completed: boolean, activityType: ?string) => void,
-  ) => void;
-  +dismissActionSheet?: () => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('ActionSheetManager'): ?Spec);
+export * from '../../src/private/specs/modules/NativeActionSheetManager';
+import NativeActionSheetManager from '../../src/private/specs/modules/NativeActionSheetManager';
+export default NativeActionSheetManager;

package/Libraries/Alert/Alert.windows.js

@@ -4,10 +4,9 @@
  * @flow
  * @format
  */
-
-import type {DialogOptions} from './NativeDialogManagerWindows';
+import type {DialogOptions} from '../NativeModules/specs/NativeDialogManagerWindows';
 const NativeDialogManagerWindows =
-  require('./NativeDialogManagerWindows').default;
+  require('../NativeModules/specs/NativeDialogManagerWindows').default;
 
 export type AlertType =
   | 'default'

package/Libraries/Alert/NativeAlertManager.js

@@ -4,32 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export type Args = {|
-  title?: string,
-  message?: string,
-  buttons?: Array<Object>, // TODO(T67565166): have a better type
-  type?: string,
-  defaultValue?: string,
-  cancelButtonKey?: string,
-  destructiveButtonKey?: string,
-  preferredButtonKey?: string,
-  keyboardType?: string,
-  userInterfaceStyle?: string,
-|};
-
-export interface Spec extends TurboModule {
-  +alertWithArgs: (
-    args: Args,
-    callback: (id: number, value: string) => void,
-  ) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('AlertManager'): ?Spec);
+export * from '../../src/private/specs/modules/NativeAlertManager';
+import NativeAlertManager from '../../src/private/specs/modules/NativeAlertManager';
+export default NativeAlertManager;

package/Libraries/Animated/Animated.js

@@ -21,9 +21,9 @@ import Platform from '../Utilities/Platform';
 import AnimatedImplementation from './AnimatedImplementation';
 import AnimatedMock from './AnimatedMock';
 
-const Animated = ((Platform.isDisableAnimations
+const Animated: typeof AnimatedImplementation = Platform.isDisableAnimations
   ? AnimatedMock
-  : AnimatedImplementation): typeof AnimatedImplementation);
+  : AnimatedImplementation;
 
 export default {
   get FlatList(): AnimatedFlatList {

package/Libraries/Animated/AnimatedPlatformConfig.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 

package/Libraries/Animated/NativeAnimatedHelper.js

@@ -18,9 +18,9 @@ import type {
 } from './NativeAnimatedModule';
 import type {InterpolationConfigType} from './nodes/AnimatedInterpolation';
 
+import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags';
 import NativeEventEmitter from '../EventEmitter/NativeEventEmitter';
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
 import Platform from '../Utilities/Platform';
 import NativeAnimatedNonTurboModule from './NativeAnimatedModule';
 import NativeAnimatedTurboModule from './NativeAnimatedTurboModule';
@@ -48,10 +48,10 @@ const useSingleOpBatching =
 let flushQueueTimeout = null;
 
 const eventListenerGetValueCallbacks: {
-  [$FlowFixMe | number]: ((value: number) => void) | void,
+  [number]: (value: number) => void,
 } = {};
 const eventListenerAnimationFinishedCallbacks: {
-  [$FlowFixMe | number]: EndCallback | void,
+  [number]: EndCallback,
 } = {};
 let globalEventEmitterGetValueListener: ?EventSubscription = null;
 let globalEventEmitterAnimationFinishedListener: ?EventSubscription = null;
@@ -339,7 +339,7 @@ const API = {
 function setupGlobalEventEmitterListeners() {
   globalEventEmitterGetValueListener = RCTDeviceEventEmitter.addListener(
     'onNativeAnimatedModuleGetValue',
-    function (params) {
+    params => {
       const {tag} = params;
       const callback = eventListenerGetValueCallbacks[tag];
       if (!callback) {
@@ -352,14 +352,17 @@ function setupGlobalEventEmitterListeners() {
   globalEventEmitterAnimationFinishedListener =
     RCTDeviceEventEmitter.addListener(
       'onNativeAnimatedModuleAnimationFinished',
-      function (params) {
-        const {animationId} = params;
-        const callback = eventListenerAnimationFinishedCallbacks[animationId];
-        if (!callback) {
-          return;
+      params => {
+        // TODO: remove Array.isArray once native changes have propagated
+        const animations = Array.isArray(params) ? params : [params];
+        for (const animation of animations) {
+          const {animationId} = animation;
+          const callback = eventListenerAnimationFinishedCallbacks[animationId];
+          if (callback) {
+            callback(animation);
+            delete eventListenerAnimationFinishedCallbacks[animationId];
+          }
         }
-        callback(params);
-        delete eventListenerAnimationFinishedCallbacks[animationId];
       },
     );
 }

package/Libraries/Animated/NativeAnimatedModule.js

@@ -4,74 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-import shouldUseTurboAnimatedModule from './shouldUseTurboAnimatedModule';
-
-type EndResult = {finished: boolean, value?: number, ...};
-type EndCallback = (result: EndResult) => void;
-type SaveValueCallback = (value: number) => void;
-
-export type EventMapping = {|
-  nativeEventPath: Array<string>,
-  animatedValueTag: ?number,
-|};
-
-// The config has different keys depending on the type of the Node
-// TODO(T54896888): Make these types strict
-export type AnimatedNodeConfig = Object;
-export type AnimatingNodeConfig = Object;
-
-export interface Spec extends TurboModule {
-  +startOperationBatch: () => void;
-  +finishOperationBatch: () => void;
-  +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
-  +updateAnimatedNodeConfig?: (tag: number, config: AnimatedNodeConfig) => void;
-  +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
-  +startListeningToAnimatedNodeValue: (tag: number) => void;
-  +stopListeningToAnimatedNodeValue: (tag: number) => void;
-  +connectAnimatedNodes: (parentTag: number, childTag: number) => void;
-  +disconnectAnimatedNodes: (parentTag: number, childTag: number) => void;
-  +startAnimatingNode: (
-    animationId: number,
-    nodeTag: number,
-    config: AnimatingNodeConfig,
-    endCallback: EndCallback,
-  ) => void;
-  +stopAnimation: (animationId: number) => void;
-  +setAnimatedNodeValue: (nodeTag: number, value: number) => void;
-  +setAnimatedNodeOffset: (nodeTag: number, offset: number) => void;
-  +flattenAnimatedNodeOffset: (nodeTag: number) => void;
-  +extractAnimatedNodeOffset: (nodeTag: number) => void;
-  +connectAnimatedNodeToView: (nodeTag: number, viewTag: number) => void;
-  +disconnectAnimatedNodeFromView: (nodeTag: number, viewTag: number) => void;
-  +restoreDefaultValues: (nodeTag: number) => void;
-  +dropAnimatedNode: (tag: number) => void;
-  +addAnimatedEventToView: (
-    viewTag: number,
-    eventName: string,
-    eventMapping: EventMapping,
-  ) => void;
-  +removeAnimatedEventFromView: (
-    viewTag: number,
-    eventName: string,
-    animatedNodeTag: number,
-  ) => void;
-
-  // Events
-  +addListener: (eventName: string) => void;
-  +removeListeners: (count: number) => void;
-
-  // All of the above in a batched mode
-  +queueAndExecuteBatchedOperations?: (operationsAndArgs: Array<any>) => void;
-}
-
-const NativeModule: ?Spec = !shouldUseTurboAnimatedModule()
-  ? TurboModuleRegistry.get<Spec>('NativeAnimatedModule')
-  : null;
-export default NativeModule;
+export * from '../../src/private/specs/modules/NativeAnimatedModule';
+import NativeAnimatedModule from '../../src/private/specs/modules/NativeAnimatedModule';
+export default NativeAnimatedModule;

package/Libraries/Animated/NativeAnimatedTurboModule.js

@@ -4,75 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-import shouldUseTurboAnimatedModule from './shouldUseTurboAnimatedModule';
-
-type EndResult = {finished: boolean, value?: number, ...};
-type EndCallback = (result: EndResult) => void;
-type SaveValueCallback = (value: number) => void;
-
-export type EventMapping = {|
-  nativeEventPath: Array<string>,
-  animatedValueTag: ?number,
-|};
-
-// The config has different keys depending on the type of the Node
-// TODO(T54896888): Make these types strict
-export type AnimatedNodeConfig = Object;
-export type AnimatingNodeConfig = Object;
-
-export interface Spec extends TurboModule {
-  +startOperationBatch: () => void;
-  +finishOperationBatch: () => void;
-  +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
-  +updateAnimatedNodeConfig?: (tag: number, config: AnimatedNodeConfig) => void;
-  +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
-  +startListeningToAnimatedNodeValue: (tag: number) => void;
-  +stopListeningToAnimatedNodeValue: (tag: number) => void;
-  +connectAnimatedNodes: (parentTag: number, childTag: number) => void;
-  +disconnectAnimatedNodes: (parentTag: number, childTag: number) => void;
-  +startAnimatingNode: (
-    animationId: number,
-    nodeTag: number,
-    config: AnimatingNodeConfig,
-    endCallback: EndCallback,
-  ) => void;
-  +stopAnimation: (animationId: number) => void;
-  +setAnimatedNodeValue: (nodeTag: number, value: number) => void;
-  +setAnimatedNodeOffset: (nodeTag: number, offset: number) => void;
-  +flattenAnimatedNodeOffset: (nodeTag: number) => void;
-  +extractAnimatedNodeOffset: (nodeTag: number) => void;
-  +connectAnimatedNodeToView: (nodeTag: number, viewTag: number) => void;
-  +disconnectAnimatedNodeFromView: (nodeTag: number, viewTag: number) => void;
-  +restoreDefaultValues: (nodeTag: number) => void;
-  +dropAnimatedNode: (tag: number) => void;
-  +addAnimatedEventToView: (
-    viewTag: number,
-    eventName: string,
-    eventMapping: EventMapping,
-  ) => void;
-  +removeAnimatedEventFromView: (
-    viewTag: number,
-    eventName: string,
-    animatedNodeTag: number,
-  ) => void;
-
-  // Events
-  +addListener: (eventName: string) => void;
-  +removeListeners: (count: number) => void;
-
-  // All of the above in a batched mode
-  +queueAndExecuteBatchedOperations?: (operationsAndArgs: Array<any>) => void;
-}
-
-const NativeModule: ?Spec = shouldUseTurboAnimatedModule()
-  ? TurboModuleRegistry.get<Spec>('NativeAnimatedTurboModule')
-  : null;
-
-export default NativeModule;
+export * from '../../src/private/specs/modules/NativeAnimatedTurboModule';
+import NativeAnimatedTurboModule from '../../src/private/specs/modules/NativeAnimatedTurboModule';
+export default NativeAnimatedTurboModule;