From dd06f85bd00632309eaa1df30c5efd2db1502641 Mon Sep 17 00:00:00 2001 From: Kevin Gozali Date: Mon, 4 Nov 2019 18:49:04 -0800 Subject: [PATCH] TM JS: cleaned up TurboModuleRegistry types [2] Summary: Changelog: [Internal] Moved the imports for `TurboModuleRegistry` and `TurboModule` from `react-native`. This was a jscodeshift with the script: P120688078 Reviewed By: yungsters Differential Revision: D18262538 fbshipit-source-id: 48fac15229c897408928511c5ecbb42f17ec7b42 --- .../NativeActionSheetManager.js | 3 +- Libraries/Alert/NativeAlertManager.js | 3 +- .../Animated/src/NativeAnimatedModule.js | 3 +- Libraries/AppState/NativeAppState.js | 3 +- Libraries/Blob/NativeBlobModule.js | 3 +- Libraries/Blob/NativeFileReaderModule.js | 3 +- Libraries/BugReporting/NativeBugReporting.js | 5 ++- .../NativeAccessibilityInfo.js | 3 +- .../NativeAccessibilityManager.js | 3 +- .../AppleTV/NativeTVNavigationEventEmitter.js | 3 +- .../Components/Clipboard/NativeClipboard.js | 3 +- .../NativeDatePickerAndroid.js | 3 +- .../Keyboard/NativeKeyboardObserver.js | 3 +- .../Components/Sound/NativeSoundManager.js | 3 +- .../NativeStatusBarManagerAndroid.js | 3 +- .../StatusBar/NativeStatusBarManagerIOS.js | 3 +- .../ToastAndroid/NativeToastAndroid.js | 3 +- Libraries/Core/NativeExceptionsManager.js | 3 +- Libraries/Core/Timers/NativeTiming.js | 3 +- Libraries/HeapCapture/NativeHeapCapture.js | 3 +- Libraries/Image/NativeImageLoader.js | 3 +- Libraries/Image/NativeImagePickerIOS.js | 3 +- .../Interaction/NativeFrameRateLogger.js | 3 +- Libraries/Linking/NativeLinking.js | 3 +- Libraries/Modal/NativeModalManager.js | 3 +- .../specs/NativeAnimationsDebugModule.js | 3 +- .../NativeModules/specs/NativeDevSettings.js | 3 +- .../specs/NativeDeviceEventManager.js | 3 +- .../specs/NativeDialogManagerAndroid.js | 3 +- Libraries/NativeModules/specs/NativeRedBox.js | 3 +- .../NativeModules/specs/NativeSourceCode.js | 3 +- Libraries/Network/NativeNetworkingAndroid.js | 3 +- Libraries/Network/NativeNetworkingIOS.js | 3 +- .../Performance/NativeJSCSamplingProfiler.js | 3 +- .../NativePermissionsAndroid.js | 3 +- .../NativePushNotificationManagerIOS.js | 7 +-- .../NativeHeadlessJsTaskSupport.js | 3 +- Libraries/ReactNative/NativeI18nManager.js | 3 +- Libraries/ReactNative/NativeUIManager.js | 3 +- Libraries/Settings/NativeSettingsManager.js | 3 +- Libraries/Share/NativeShareModule.js | 3 +- Libraries/Storage/NativeAsyncStorage.js | 3 +- Libraries/TurboModule/TurboModuleRegistry.js | 2 +- .../samples/NativeSampleTurboModule.js | 3 +- Libraries/Utilities/NativeAppearance.js | 3 +- Libraries/Utilities/NativeDevLoadingView.js | 3 +- Libraries/Utilities/NativeDeviceInfo.js | 3 +- Libraries/Utilities/NativeJSDevSupport.js | 3 +- .../NativePlatformConstantsAndroid.js | 3 +- .../Utilities/NativePlatformConstantsIOS.js | 3 +- Libraries/Vibration/NativeVibration.js | 3 +- Libraries/WebSocket/NativeWebSocketModule.js | 3 +- .../NativeScreenshotManager.js | 3 +- .../modules/NativeArrayTurboModule.js | 3 +- .../modules/NativeBooleanTurboModule.js | 3 +- .../modules/NativeCallbackTurboModule.js | 3 +- .../modules/NativeNullableTurboModule.js | 3 +- .../modules/NativeNumberTurboModule.js | 3 +- .../modules/NativeObjectTurboModule.js | 3 +- .../NativeOptionalObjectTurboModule.js | 3 +- .../modules/NativePromiseTurboModule.js | 3 +- .../modules/NativeSampleTurboModule.js | 3 +- .../modules/NativeStringTurboModule.js | 3 +- .../modules/__test_fixtures__/failures.js | 32 ++++++------- .../modules/__test_fixtures__/fixtures.js | 45 +++++++------------ 65 files changed, 99 insertions(+), 172 deletions(-) diff --git a/Libraries/ActionSheetIOS/NativeActionSheetManager.js b/Libraries/ActionSheetIOS/NativeActionSheetManager.js index afc2b82f97a..c2c1a772aec 100644 --- a/Libraries/ActionSheetIOS/NativeActionSheetManager.js +++ b/Libraries/ActionSheetIOS/NativeActionSheetManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js index 452be85c5b1..f1cc6c09917 100644 --- a/Libraries/Alert/NativeAlertManager.js +++ b/Libraries/Alert/NativeAlertManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type Args = {| title?: string, diff --git a/Libraries/Animated/src/NativeAnimatedModule.js b/Libraries/Animated/src/NativeAnimatedModule.js index aa9e1257d2c..61b4b4a20b0 100644 --- a/Libraries/Animated/src/NativeAnimatedModule.js +++ b/Libraries/Animated/src/NativeAnimatedModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type EndResult = {finished: boolean}; type EndCallback = (result: EndResult) => void; diff --git a/Libraries/AppState/NativeAppState.js b/Libraries/AppState/NativeAppState.js index 76f3b71619e..e80f65d1ed2 100644 --- a/Libraries/AppState/NativeAppState.js +++ b/Libraries/AppState/NativeAppState.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Blob/NativeBlobModule.js b/Libraries/Blob/NativeBlobModule.js index 4810cd89f88..ecc836a80b3 100644 --- a/Libraries/Blob/NativeBlobModule.js +++ b/Libraries/Blob/NativeBlobModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {|BLOB_URI_SCHEME: string, BLOB_URI_HOST: ?string|}; diff --git a/Libraries/Blob/NativeFileReaderModule.js b/Libraries/Blob/NativeFileReaderModule.js index ac135db7394..d6a49910676 100644 --- a/Libraries/Blob/NativeFileReaderModule.js +++ b/Libraries/Blob/NativeFileReaderModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +readAsDataURL: (data: Object) => Promise; diff --git a/Libraries/BugReporting/NativeBugReporting.js b/Libraries/BugReporting/NativeBugReporting.js index 02ff311cc50..10b45a5400e 100644 --- a/Libraries/BugReporting/NativeBugReporting.js +++ b/Libraries/BugReporting/NativeBugReporting.js @@ -8,8 +8,9 @@ * @flow */ -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +'use strict'; + +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +startReportAProblemFlow: () => void; diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js index ef2b9686520..afc20dd1ca5 100644 --- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js +++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +isReduceMotionEnabled: ( diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js index 0a1abe57924..243bbf0f380 100644 --- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js +++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getCurrentBoldTextState: ( diff --git a/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js b/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js index 97edfcdf99c..11112c90aac 100644 --- a/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js +++ b/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +addListener: (eventName: string) => void; diff --git a/Libraries/Components/Clipboard/NativeClipboard.js b/Libraries/Components/Clipboard/NativeClipboard.js index 93fc92873ee..de3412feecf 100644 --- a/Libraries/Components/Clipboard/NativeClipboard.js +++ b/Libraries/Components/Clipboard/NativeClipboard.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js index 778befa4ebc..a9348837595 100644 --- a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js +++ b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +open: (options: Object) => Promise; diff --git a/Libraries/Components/Keyboard/NativeKeyboardObserver.js b/Libraries/Components/Keyboard/NativeKeyboardObserver.js index e26598dd4ce..57c94d4e21a 100644 --- a/Libraries/Components/Keyboard/NativeKeyboardObserver.js +++ b/Libraries/Components/Keyboard/NativeKeyboardObserver.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +addListener: (eventName: string) => void; diff --git a/Libraries/Components/Sound/NativeSoundManager.js b/Libraries/Components/Sound/NativeSoundManager.js index 195a5abfab9..4e856955851 100644 --- a/Libraries/Components/Sound/NativeSoundManager.js +++ b/Libraries/Components/Sound/NativeSoundManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; /** * Native Module used for playing sounds in native platform. diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js index c964337e0c9..04efc82facf 100644 --- a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js +++ b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js index 45bcc1a3a4a..262a2b20de8 100644 --- a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js +++ b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Components/ToastAndroid/NativeToastAndroid.js b/Libraries/Components/ToastAndroid/NativeToastAndroid.js index f61d11bbc03..89c4a99c503 100644 --- a/Libraries/Components/ToastAndroid/NativeToastAndroid.js +++ b/Libraries/Components/ToastAndroid/NativeToastAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Core/NativeExceptionsManager.js b/Libraries/Core/NativeExceptionsManager.js index 779fe2db258..8bc4d3ca6c1 100644 --- a/Libraries/Core/NativeExceptionsManager.js +++ b/Libraries/Core/NativeExceptionsManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type StackFrame = {| column: ?number, diff --git a/Libraries/Core/Timers/NativeTiming.js b/Libraries/Core/Timers/NativeTiming.js index 0070adb906e..9ce8f113a41 100644 --- a/Libraries/Core/Timers/NativeTiming.js +++ b/Libraries/Core/Timers/NativeTiming.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +createTimer: ( diff --git a/Libraries/HeapCapture/NativeHeapCapture.js b/Libraries/HeapCapture/NativeHeapCapture.js index 7374cd35729..7b55e4088d4 100644 --- a/Libraries/HeapCapture/NativeHeapCapture.js +++ b/Libraries/HeapCapture/NativeHeapCapture.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // Common interface diff --git a/Libraries/Image/NativeImageLoader.js b/Libraries/Image/NativeImageLoader.js index e11c9d5507a..7d378869231 100644 --- a/Libraries/Image/NativeImageLoader.js +++ b/Libraries/Image/NativeImageLoader.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/Image/NativeImagePickerIOS.js b/Libraries/Image/NativeImagePickerIOS.js index 6101c7b0380..cb391602e77 100644 --- a/Libraries/Image/NativeImagePickerIOS.js +++ b/Libraries/Image/NativeImagePickerIOS.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/Interaction/NativeFrameRateLogger.js b/Libraries/Interaction/NativeFrameRateLogger.js index d1829065f47..24cf1960363 100644 --- a/Libraries/Interaction/NativeFrameRateLogger.js +++ b/Libraries/Interaction/NativeFrameRateLogger.js @@ -8,8 +8,7 @@ * @flow */ -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +setGlobalOptions: (options: {| diff --git a/Libraries/Linking/NativeLinking.js b/Libraries/Linking/NativeLinking.js index cbb7c1a00bd..0c5b56dc3a0 100644 --- a/Libraries/Linking/NativeLinking.js +++ b/Libraries/Linking/NativeLinking.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; import Platform from '../Utilities/Platform'; export interface Spec extends TurboModule { diff --git a/Libraries/Modal/NativeModalManager.js b/Libraries/Modal/NativeModalManager.js index 5f4e6c146fc..34da2d5042f 100644 --- a/Libraries/Modal/NativeModalManager.js +++ b/Libraries/Modal/NativeModalManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // RCTEventEmitter diff --git a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js index f814d567df0..0377afeca27 100644 --- a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js +++ b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +startRecordingFps: () => void; diff --git a/Libraries/NativeModules/specs/NativeDevSettings.js b/Libraries/NativeModules/specs/NativeDevSettings.js index a23a2521136..a3ef4657f50 100644 --- a/Libraries/NativeModules/specs/NativeDevSettings.js +++ b/Libraries/NativeModules/specs/NativeDevSettings.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +reload: () => void; diff --git a/Libraries/NativeModules/specs/NativeDeviceEventManager.js b/Libraries/NativeModules/specs/NativeDeviceEventManager.js index 342115dd0e4..7901c52348c 100644 --- a/Libraries/NativeModules/specs/NativeDeviceEventManager.js +++ b/Libraries/NativeModules/specs/NativeDeviceEventManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +invokeDefaultBackPressHandler: () => void; diff --git a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js index 4ca12692fa1..3e6c3bf173e 100644 --- a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js +++ b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; /* 'buttonClicked' | 'dismissed' */ type DialogAction = string; diff --git a/Libraries/NativeModules/specs/NativeRedBox.js b/Libraries/NativeModules/specs/NativeRedBox.js index 469465e3436..064c2d8ab8a 100644 --- a/Libraries/NativeModules/specs/NativeRedBox.js +++ b/Libraries/NativeModules/specs/NativeRedBox.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +setExtraData: (extraData: Object, forIdentifier: string) => void; diff --git a/Libraries/NativeModules/specs/NativeSourceCode.js b/Libraries/NativeModules/specs/NativeSourceCode.js index 2ba94687afb..b7e60eaba55 100644 --- a/Libraries/NativeModules/specs/NativeSourceCode.js +++ b/Libraries/NativeModules/specs/NativeSourceCode.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Network/NativeNetworkingAndroid.js b/Libraries/Network/NativeNetworkingAndroid.js index 3d65967736d..be9e3bc7240 100644 --- a/Libraries/Network/NativeNetworkingAndroid.js +++ b/Libraries/Network/NativeNetworkingAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type Header = [string, string]; diff --git a/Libraries/Network/NativeNetworkingIOS.js b/Libraries/Network/NativeNetworkingIOS.js index 59b3da849a9..e17cacf2726 100644 --- a/Libraries/Network/NativeNetworkingIOS.js +++ b/Libraries/Network/NativeNetworkingIOS.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +sendRequest: ( diff --git a/Libraries/Performance/NativeJSCSamplingProfiler.js b/Libraries/Performance/NativeJSCSamplingProfiler.js index a40e8e30152..93fe973868b 100644 --- a/Libraries/Performance/NativeJSCSamplingProfiler.js +++ b/Libraries/Performance/NativeJSCSamplingProfiler.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +operationComplete: (token: number, result: ?string, error: ?string) => void; diff --git a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js index 843c0aeaa98..e50687d6725 100644 --- a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js +++ b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; // TODO: Use proper enum types. export type PermissionStatus = string; diff --git a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js index 8eb50951636..3ffa994da86 100644 --- a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js +++ b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js @@ -4,12 +4,13 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @format * @flow + * @format */ -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +'use strict'; + +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type Permissions = {| alert: boolean, diff --git a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js index 290957fd7f2..c719bc6c706 100644 --- a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js +++ b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +notifyTaskFinished: (taskId: number) => void; diff --git a/Libraries/ReactNative/NativeI18nManager.js b/Libraries/ReactNative/NativeI18nManager.js index afaab21dfce..a300b9f6a45 100644 --- a/Libraries/ReactNative/NativeI18nManager.js +++ b/Libraries/ReactNative/NativeI18nManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/ReactNative/NativeUIManager.js b/Libraries/ReactNative/NativeUIManager.js index 717e63dbc12..c12118010d7 100644 --- a/Libraries/ReactNative/NativeUIManager.js +++ b/Libraries/ReactNative/NativeUIManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => Object; diff --git a/Libraries/Settings/NativeSettingsManager.js b/Libraries/Settings/NativeSettingsManager.js index 1edd6187218..ddb697a9a90 100644 --- a/Libraries/Settings/NativeSettingsManager.js +++ b/Libraries/Settings/NativeSettingsManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Share/NativeShareModule.js b/Libraries/Share/NativeShareModule.js index 88293b8ce87..dda1caa900c 100644 --- a/Libraries/Share/NativeShareModule.js +++ b/Libraries/Share/NativeShareModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/Storage/NativeAsyncStorage.js b/Libraries/Storage/NativeAsyncStorage.js index e7c8e567bbf..4c76042d9f4 100644 --- a/Libraries/Storage/NativeAsyncStorage.js +++ b/Libraries/Storage/NativeAsyncStorage.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/TurboModule/TurboModuleRegistry.js b/Libraries/TurboModule/TurboModuleRegistry.js index b3b1135f98b..b7b4a8b27ea 100644 --- a/Libraries/TurboModule/TurboModuleRegistry.js +++ b/Libraries/TurboModule/TurboModuleRegistry.js @@ -11,7 +11,7 @@ 'use strict'; const NativeModules = require('../BatchedBridge/NativeModules'); -import type {TurboModule} from './RCTExport'; +import {type TurboModule} from 'react-native'; import invariant from 'invariant'; const turboModuleProxy = global.__turboModuleProxy; diff --git a/Libraries/TurboModule/samples/NativeSampleTurboModule.js b/Libraries/TurboModule/samples/NativeSampleTurboModule.js index f82a8e81087..6a6bc22cdb1 100644 --- a/Libraries/TurboModule/samples/NativeSampleTurboModule.js +++ b/Libraries/TurboModule/samples/NativeSampleTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // Exported methods. diff --git a/Libraries/Utilities/NativeAppearance.js b/Libraries/Utilities/NativeAppearance.js index 5d37b8aded3..2149fe2ab3d 100644 --- a/Libraries/Utilities/NativeAppearance.js +++ b/Libraries/Utilities/NativeAppearance.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type ColorSchemeName = 'light' | 'dark'; diff --git a/Libraries/Utilities/NativeDevLoadingView.js b/Libraries/Utilities/NativeDevLoadingView.js index e672771778b..10ea3883d4c 100644 --- a/Libraries/Utilities/NativeDevLoadingView.js +++ b/Libraries/Utilities/NativeDevLoadingView.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +showMessage: ( diff --git a/Libraries/Utilities/NativeDeviceInfo.js b/Libraries/Utilities/NativeDeviceInfo.js index b29b68e0cdd..cdbf3554c88 100644 --- a/Libraries/Utilities/NativeDeviceInfo.js +++ b/Libraries/Utilities/NativeDeviceInfo.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type DisplayMetricsAndroid = {| width: number, diff --git a/Libraries/Utilities/NativeJSDevSupport.js b/Libraries/Utilities/NativeJSDevSupport.js index 3128d3d83bd..691d702eaa0 100644 --- a/Libraries/Utilities/NativeJSDevSupport.js +++ b/Libraries/Utilities/NativeJSDevSupport.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Utilities/NativePlatformConstantsAndroid.js b/Libraries/Utilities/NativePlatformConstantsAndroid.js index dcf276ae2ac..2ba90f2cb06 100644 --- a/Libraries/Utilities/NativePlatformConstantsAndroid.js +++ b/Libraries/Utilities/NativePlatformConstantsAndroid.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Utilities/NativePlatformConstantsIOS.js b/Libraries/Utilities/NativePlatformConstantsIOS.js index fd73bcffadb..913d0750963 100644 --- a/Libraries/Utilities/NativePlatformConstantsIOS.js +++ b/Libraries/Utilities/NativePlatformConstantsIOS.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Vibration/NativeVibration.js b/Libraries/Vibration/NativeVibration.js index 2e28c03756f..3c7680d3577 100644 --- a/Libraries/Vibration/NativeVibration.js +++ b/Libraries/Vibration/NativeVibration.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/Libraries/WebSocket/NativeWebSocketModule.js b/Libraries/WebSocket/NativeWebSocketModule.js index da2c57fdabc..441117d248b 100644 --- a/Libraries/WebSocket/NativeWebSocketModule.js +++ b/Libraries/WebSocket/NativeWebSocketModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +connect: ( diff --git a/RNTester/NativeModuleExample/NativeScreenshotManager.js b/RNTester/NativeModuleExample/NativeScreenshotManager.js index effd2a470e0..8ba2be32e16 100644 --- a/RNTester/NativeModuleExample/NativeScreenshotManager.js +++ b/RNTester/NativeModuleExample/NativeScreenshotManager.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from '../../Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from '../../Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {||}; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js index cd21a54d719..45c9084e72a 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type ArrayType = string; type AnotherArray = Array; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js index f698ed71c56..5a7d257ae38 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type Boolean = boolean; type AnotherBoolean = Boolean; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js index c23cfa77a1b..745d15d6540 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type String = string; type CB = (value: String) => void; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js index 3ccc8876b45..dee40edbf33 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNullableTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getBool: (a: ?boolean) => ?boolean; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js index 41ce0787712..10621dcc3c0 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeNumberTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type Number = number; type AnotherNumber = Number; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js index 6400942e175..b566c3ef0bf 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeObjectTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type GenericObject = Object; type AnotherGenericObject = GenericObject; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js index b697ab954dd..a2c7d7a7386 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js index 2ccd30546a2..75fd1bb358b 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativePromiseTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type String = string; type AnotherPromise = Promise; diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js index ee6c0983afb..6a6bc22cdb1 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // Exported methods. diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js index 4c844d39056..d0f559ac70a 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeStringTurboModule.js @@ -10,8 +10,7 @@ 'use strict'; -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type String = string; type AnotherString = String; diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/failures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/failures.js index 9970e859437..0c69e95a0ad 100644 --- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/failures.js +++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/failures.js @@ -23,8 +23,8 @@ const NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { getString: (arg: string) => Array; @@ -47,8 +47,8 @@ const NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT_AS_PARAM = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { getString: (arg : Array) => string; @@ -71,8 +71,8 @@ const NATIVE_MODULES_WITH_READ_ONLY_OBJECT_NO_TYPE_FOR_CONTENT = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { getString: (arg : $ReadOnly<>) => string; @@ -95,8 +95,8 @@ const NATIVE_MODULES_WITH_NOT_ONLY_METHODS = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { +getBool: (arg: boolean) => boolean; @@ -123,8 +123,8 @@ const NATIVE_MODULES_WITH_UNNAMED_PARAMS = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { +getBool: (boolean) => boolean; @@ -148,8 +148,8 @@ const NATIVE_MODULES_WITH_PROMISE_WITHOUT_TYPE = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { +getBool: (arg: boolean) => Promise; @@ -173,8 +173,8 @@ const TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export default TurboModuleRegistry.getEnforcing('SampleTurboModule1'); @@ -195,8 +195,8 @@ const TWO_NATIVE_EXTENDING_TURBO_MODULE = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import type {TurboModule} from 'RCTExport'; +import TurboModuleRegistry from 'TurboModuleRegistry'; export interface Spec extends TurboModule { +getSth: (a : ?number) => void diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js index bb8007b8621..66e675437f9 100644 --- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js +++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js @@ -23,8 +23,7 @@ const EMPTY_NATIVE_MODULE = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // mo methods @@ -47,8 +46,7 @@ const NATIVE_MODULE_WITH_COMPLEX_OBJECTS = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type String = string; @@ -82,8 +80,7 @@ const NATIVE_MODULE_WITH_COMPLEX_OBJECTS_WITH_NULLABLE_KEY = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getConstants: () => {| @@ -118,8 +115,7 @@ const NATIVE_MODULE_WITH_BASIC_PARAM_TYPES = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +passBool?: (arg: boolean) => void; @@ -145,8 +141,7 @@ const NATIVE_MODULE_WITH_WITH_ALIASES = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type NumNum = number; export type Num = (arg: NumNum) => void; @@ -179,8 +174,7 @@ const NATIVE_MODULE_WITH_WITH_FLOAT_AND_INT32 = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; import type {Int32, Float} from 'react-native/Libraries/Types/CodegenTypes'; export interface Spec extends TurboModule { @@ -204,8 +198,7 @@ const NATIVE_MODULE_WITH_SIMPLE_OBJECT = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getObject: (o : Object) => Object, @@ -228,8 +221,7 @@ const NATIVE_MODULE_WITH_NULLABLE_PARAM = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // Exported methods. @@ -253,8 +245,7 @@ const NATIVE_MODULE_WITH_BASIC_ARRAY = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getArray: (arg: Array) => Array; @@ -278,8 +269,7 @@ const NATIVE_MODULE_WITH_OBJECT_WITH_OBJECT_DEIFNED_IN_FILE_AS_PROPERTY = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; type DisplayMetricsAndroid = {| width: number, @@ -314,8 +304,7 @@ const NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getArray: (arg: Array<[string, string]>) => Array; @@ -338,8 +327,7 @@ const NATIVE_MODULE_WITH_ARRAY_WITH_ALIAS = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type SomeString = string; @@ -364,8 +352,7 @@ const NATIVE_MODULE_WITH_COMPLEX_ARRAY = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { +getArray: (arg: Array>>>>) => Array>>; @@ -387,8 +374,7 @@ const NATIVE_MODULE_WITH_PROMISE = `/** 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export type String = string; export type SomeObj = {| a: string |}; @@ -416,8 +402,7 @@ const NATIVE_MODULE_WITH_CALLBACK = ` 'use strict'; -import type {TurboModule} from '../RCTExport'; -import * as TurboModuleRegistry from '../TurboModuleRegistry'; +import {TurboModuleRegistry, type TurboModule} from 'react-native'; export interface Spec extends TurboModule { // Exported methods.