From cdde150646d27645263e172b9c3bcfa1329732f8 Mon Sep 17 00:00:00 2001 From: James Ide Date: Wed, 22 May 2019 14:44:03 -0700 Subject: [PATCH] [standards] Replace more Haste imports with path-based imports This is another step in moving RN towards standard path-based requires, updating more code to use path-based requires. See the umbrella issue at https://github.com/facebook/react-native/issues/24316 for more detail. --- Libraries/AppState/NativeAppState.js | 4 +- Libraries/Blob/NativeBlobModule.js | 4 +- Libraries/Blob/NativeFileReaderModule.js | 4 +- .../NativeAccessibilityInfo.js | 4 +- .../AppleTV/NativeTVNavigationEventEmitter.js | 4 +- .../NativeDatePickerAndroid.js | 4 +- .../Keyboard/NativeKeyboardObserver.js | 4 +- .../NativeTimePickerAndroid.js | 4 +- .../View/ReactNativeViewViewConfig.js | 56 +++++++++---------- .../Components/View/ViewAccessibility.js | 2 +- Libraries/Core/NativeExceptionsManager.js | 4 +- Libraries/Core/Timers/NativeTiming.js | 4 +- Libraries/HeapCapture/NativeHeapCapture.js | 4 +- Libraries/Linking/NativeLinking.js | 6 +- .../specs/NativeAnimationsDebugModule.js | 4 +- .../specs/NativeDeviceEventManager.js | 4 +- Libraries/NativeModules/specs/NativeRedBox.js | 4 +- .../NativeModules/specs/NativeSourceCode.js | 4 +- .../Performance/NativeJSCSamplingProfiler.js | 4 +- .../NativeHeadlessJsTaskSupport.js | 4 +- Libraries/Utilities/NativeDevLoadingView.js | 4 +- Libraries/Utilities/NativeJSDevSupport.js | 4 +- ...erifyComponentAttributeEquivalence-test.js | 6 +- .../verifyComponentAttributeEquivalence.js | 4 +- RNTester/js/TextExample.ios.js | 2 +- 25 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Libraries/AppState/NativeAppState.js b/Libraries/AppState/NativeAppState.js index d5d13a392acb..ffea188b92bc 100644 --- a/Libraries/AppState/NativeAppState.js +++ b/Libraries/AppState/NativeAppState.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Blob/NativeBlobModule.js b/Libraries/Blob/NativeBlobModule.js index e2f8450e2360..cb44600c642a 100644 --- a/Libraries/Blob/NativeBlobModule.js +++ b/Libraries/Blob/NativeBlobModule.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; 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 b784d8c6f825..2291c2e60ad2 100644 --- a/Libraries/Blob/NativeFileReaderModule.js +++ b/Libraries/Blob/NativeFileReaderModule.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +readAsDataURL: (data: Object) => Promise; diff --git a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js index 894a0804a9fa..2f51c3c183de 100644 --- a/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js +++ b/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +isReduceMotionEnabled: ( diff --git a/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js b/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js index 4870931e0dc6..27f33bd7270d 100644 --- a/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js +++ b/Libraries/Components/AppleTV/NativeTVNavigationEventEmitter.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +addListener: (eventName: string) => void; diff --git a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js index ccc7a33f68d3..a0676f033291 100644 --- a/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js +++ b/Libraries/Components/DatePickerAndroid/NativeDatePickerAndroid.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +open: (options: Object) => Promise; diff --git a/Libraries/Components/Keyboard/NativeKeyboardObserver.js b/Libraries/Components/Keyboard/NativeKeyboardObserver.js index 792cf7c07572..04d95a6b69b2 100644 --- a/Libraries/Components/Keyboard/NativeKeyboardObserver.js +++ b/Libraries/Components/Keyboard/NativeKeyboardObserver.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +addListener: (eventName: string) => void; diff --git a/Libraries/Components/TimePickerAndroid/NativeTimePickerAndroid.js b/Libraries/Components/TimePickerAndroid/NativeTimePickerAndroid.js index 7d0d9a429dc2..a23de52629f1 100644 --- a/Libraries/Components/TimePickerAndroid/NativeTimePickerAndroid.js +++ b/Libraries/Components/TimePickerAndroid/NativeTimePickerAndroid.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export type TimePickerOptions = {| hour?: number, diff --git a/Libraries/Components/View/ReactNativeViewViewConfig.js b/Libraries/Components/View/ReactNativeViewViewConfig.js index 7a70e54eebed..0a65d0188203 100644 --- a/Libraries/Components/View/ReactNativeViewViewConfig.js +++ b/Libraries/Components/View/ReactNativeViewViewConfig.js @@ -117,25 +117,25 @@ const ReactNativeViewConfig = { alignSelf: true, aspectRatio: true, backfaceVisibility: true, - backgroundColor: {process: require('processColor')}, - borderBottomColor: {process: require('processColor')}, + backgroundColor: {process: require('../../StyleSheet/processColor')}, + borderBottomColor: {process: require('../../StyleSheet/processColor')}, borderBottomEndRadius: true, borderBottomLeftRadius: true, borderBottomRightRadius: true, borderBottomStartRadius: true, borderBottomWidth: true, - borderColor: {process: require('processColor')}, - borderEndColor: {process: require('processColor')}, + borderColor: {process: require('../../StyleSheet/processColor')}, + borderEndColor: {process: require('../../StyleSheet/processColor')}, borderEndWidth: true, - borderLeftColor: {process: require('processColor')}, + borderLeftColor: {process: require('../../StyleSheet/processColor')}, borderLeftWidth: true, borderRadius: true, - borderRightColor: {process: require('processColor')}, + borderRightColor: {process: require('../../StyleSheet/processColor')}, borderRightWidth: true, - borderStartColor: {process: require('processColor')}, + borderStartColor: {process: require('../../StyleSheet/processColor')}, borderStartWidth: true, borderStyle: true, - borderTopColor: {process: require('processColor')}, + borderTopColor: {process: require('../../StyleSheet/processColor')}, borderTopEndRadius: true, borderTopLeftRadius: true, borderTopRightRadius: true, @@ -156,7 +156,7 @@ const ReactNativeViewConfig = { flexShrink: true, flexWrap: true, height: true, - hitSlop: {diff: (require('insetsDiffer'): any)}, + hitSlop: {diff: (require('../../Utilities/differ/insetsDiffer'): any)}, importantForAccessibility: true, justifyContent: true, left: true, @@ -199,8 +199,8 @@ const ReactNativeViewConfig = { rotation: true, scaleX: true, scaleY: true, - shadowColor: {process: require('processColor')}, - shadowOffset: {diff: require('sizesDiffer')}, + shadowColor: {process: require('../../StyleSheet/processColor')}, + shadowOffset: {diff: require('../../Utilities/differ/sizesDiffer')}, shadowOpacity: true, shadowRadius: true, shouldRasterizeIOS: true, @@ -211,25 +211,25 @@ const ReactNativeViewConfig = { alignSelf: true, aspectRatio: true, backfaceVisibility: true, - backgroundColor: {process: require('processColor')}, - borderBottomColor: {process: require('processColor')}, + backgroundColor: {process: require('../../StyleSheet/processColor')}, + borderBottomColor: {process: require('../../StyleSheet/processColor')}, borderBottomEndRadius: true, borderBottomLeftRadius: true, borderBottomRightRadius: true, borderBottomStartRadius: true, borderBottomWidth: true, - borderColor: {process: require('processColor')}, - borderEndColor: {process: require('processColor')}, + borderColor: {process: require('../../StyleSheet/processColor')}, + borderEndColor: {process: require('../../StyleSheet/processColor')}, borderEndWidth: true, - borderLeftColor: {process: require('processColor')}, + borderLeftColor: {process: require('../../StyleSheet/processColor')}, borderLeftWidth: true, borderRadius: true, - borderRightColor: {process: require('processColor')}, + borderRightColor: {process: require('../../StyleSheet/processColor')}, borderRightWidth: true, - borderStartColor: {process: require('processColor')}, + borderStartColor: {process: require('../../StyleSheet/processColor')}, borderStartWidth: true, borderStyle: true, - borderTopColor: {process: require('processColor')}, + borderTopColor: {process: require('../../StyleSheet/processColor')}, borderTopEndRadius: true, borderTopLeftRadius: true, borderTopRightRadius: true, @@ -237,7 +237,7 @@ const ReactNativeViewConfig = { borderTopWidth: true, borderWidth: true, bottom: true, - color: {process: require('processColor')}, + color: {process: require('../../StyleSheet/processColor')}, decomposedMatrix: true, direction: true, display: true, @@ -275,7 +275,7 @@ const ReactNativeViewConfig = { minWidth: true, opacity: true, overflow: true, - overlayColor: {process: require('processColor')}, + overlayColor: {process: require('../../StyleSheet/processColor')}, padding: true, paddingBottom: true, paddingEnd: true, @@ -291,23 +291,23 @@ const ReactNativeViewConfig = { rotation: true, scaleX: true, scaleY: true, - shadowColor: {process: require('processColor')}, - shadowOffset: {diff: require('sizesDiffer')}, + shadowColor: {process: require('../../StyleSheet/processColor')}, + shadowOffset: {diff: require('../../Utilities/differ/sizesDiffer')}, shadowOpacity: true, shadowRadius: true, start: true, textAlign: true, textAlignVertical: true, - textDecorationColor: {process: require('processColor')}, + textDecorationColor: {process: require('../../StyleSheet/processColor')}, textDecorationLine: true, textDecorationStyle: true, - textShadowColor: {process: require('processColor')}, + textShadowColor: {process: require('../../StyleSheet/processColor')}, textShadowOffset: true, textShadowRadius: true, textTransform: true, - tintColor: {process: require('processColor')}, + tintColor: {process: require('../../StyleSheet/processColor')}, top: true, - transform: {diff: require('matricesDiffer')}, + transform: {diff: require('../../Utilities/differ/matricesDiffer')}, transformMatrix: true, translateX: true, translateY: true, @@ -317,7 +317,7 @@ const ReactNativeViewConfig = { }, testID: true, top: true, - transform: {diff: require('matricesDiffer')}, + transform: {diff: require('../../Utilities/differ/matricesDiffer')}, translateX: true, translateY: true, width: true, diff --git a/Libraries/Components/View/ViewAccessibility.js b/Libraries/Components/View/ViewAccessibility.js index ab23281eecea..6f40d3d3c78c 100644 --- a/Libraries/Components/View/ViewAccessibility.js +++ b/Libraries/Components/View/ViewAccessibility.js @@ -10,7 +10,7 @@ 'use strict'; -import type {SyntheticEvent} from 'CoreEventTypes'; +import type {SyntheticEvent} from '../../Types/CoreEventTypes'; // This must be kept in sync with the AccessibilityRolesMask in RCTViewManager.m export type AccessibilityRole = diff --git a/Libraries/Core/NativeExceptionsManager.js b/Libraries/Core/NativeExceptionsManager.js index f9a82ec6389e..e2528fd7ec77 100644 --- a/Libraries/Core/NativeExceptionsManager.js +++ b/Libraries/Core/NativeExceptionsManager.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export type StackFrame = {| column: ?number, diff --git a/Libraries/Core/Timers/NativeTiming.js b/Libraries/Core/Timers/NativeTiming.js index 7f8f1d806ccc..f02c71e6fca6 100644 --- a/Libraries/Core/Timers/NativeTiming.js +++ b/Libraries/Core/Timers/NativeTiming.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +createTimer: ( diff --git a/Libraries/HeapCapture/NativeHeapCapture.js b/Libraries/HeapCapture/NativeHeapCapture.js index a68a967d4ab6..95c2f7f7cff7 100644 --- a/Libraries/HeapCapture/NativeHeapCapture.js +++ b/Libraries/HeapCapture/NativeHeapCapture.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { // Common interface diff --git a/Libraries/Linking/NativeLinking.js b/Libraries/Linking/NativeLinking.js index 2fa0d78d349b..d0d648553f55 100644 --- a/Libraries/Linking/NativeLinking.js +++ b/Libraries/Linking/NativeLinking.js @@ -10,9 +10,9 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; -import Platform from 'Platform'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; +import Platform from '../Utilities/Platform'; export interface Spec extends TurboModule { // Common interface diff --git a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js index 792a6d47d03a..cb653ffe9ad0 100644 --- a/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js +++ b/Libraries/NativeModules/specs/NativeAnimationsDebugModule.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +startRecordingFps: () => void; diff --git a/Libraries/NativeModules/specs/NativeDeviceEventManager.js b/Libraries/NativeModules/specs/NativeDeviceEventManager.js index 8f32816d8d3e..1755ba1fc403 100644 --- a/Libraries/NativeModules/specs/NativeDeviceEventManager.js +++ b/Libraries/NativeModules/specs/NativeDeviceEventManager.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +invokeDefaultBackPressHandler: () => void; diff --git a/Libraries/NativeModules/specs/NativeRedBox.js b/Libraries/NativeModules/specs/NativeRedBox.js index 55fa1ab93285..336caca5dcf5 100644 --- a/Libraries/NativeModules/specs/NativeRedBox.js +++ b/Libraries/NativeModules/specs/NativeRedBox.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +setExtraData: (extraData: Object, identifier: string) => void; diff --git a/Libraries/NativeModules/specs/NativeSourceCode.js b/Libraries/NativeModules/specs/NativeSourceCode.js index 3db328618ef2..e0383ace4a87 100644 --- a/Libraries/NativeModules/specs/NativeSourceCode.js +++ b/Libraries/NativeModules/specs/NativeSourceCode.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Performance/NativeJSCSamplingProfiler.js b/Libraries/Performance/NativeJSCSamplingProfiler.js index 9ac1fad140d8..944d68383bce 100644 --- a/Libraries/Performance/NativeJSCSamplingProfiler.js +++ b/Libraries/Performance/NativeJSCSamplingProfiler.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +operationComplete: (token: number, result: ?string, error: ?string) => void; diff --git a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js index 4d1cf841486a..686ababaa9ae 100644 --- a/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js +++ b/Libraries/ReactNative/NativeHeadlessJsTaskSupport.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +notifyTaskFinished: (taskId: number) => void; diff --git a/Libraries/Utilities/NativeDevLoadingView.js b/Libraries/Utilities/NativeDevLoadingView.js index b22399bea278..7141bb660c9a 100644 --- a/Libraries/Utilities/NativeDevLoadingView.js +++ b/Libraries/Utilities/NativeDevLoadingView.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +showMessage: ( diff --git a/Libraries/Utilities/NativeJSDevSupport.js b/Libraries/Utilities/NativeJSDevSupport.js index ae7217be760d..ffbf9aa65595 100644 --- a/Libraries/Utilities/NativeJSDevSupport.js +++ b/Libraries/Utilities/NativeJSDevSupport.js @@ -10,8 +10,8 @@ 'use strict'; -import type {TurboModule} from 'RCTExport'; -import * as TurboModuleRegistry from 'TurboModuleRegistry'; +import type {TurboModule} from '../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +getConstants: () => {| diff --git a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js index fade9976f660..57e0d00e8a1f 100644 --- a/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js +++ b/Libraries/Utilities/__tests__/verifyComponentAttributeEquivalence-test.js @@ -10,10 +10,10 @@ 'use strict'; -const getNativeComponentAttributes = require('getNativeComponentAttributes'); -const verifyComponentAttributeEquivalence = require('verifyComponentAttributeEquivalence'); +const getNativeComponentAttributes = require('../../ReactNative/getNativeComponentAttributes'); +const verifyComponentAttributeEquivalence = require('../verifyComponentAttributeEquivalence'); -jest.mock('getNativeComponentAttributes', () => () => ({ +jest.mock('../../ReactNative/getNativeComponentAttributes', () => () => ({ NativeProps: { value: 'BOOL', }, diff --git a/Libraries/Utilities/verifyComponentAttributeEquivalence.js b/Libraries/Utilities/verifyComponentAttributeEquivalence.js index f950b6cf13ee..296b7837cbd7 100644 --- a/Libraries/Utilities/verifyComponentAttributeEquivalence.js +++ b/Libraries/Utilities/verifyComponentAttributeEquivalence.js @@ -10,9 +10,9 @@ 'use strict'; -const getNativeComponentAttributes = require('getNativeComponentAttributes'); +const getNativeComponentAttributes = require('../ReactNative/getNativeComponentAttributes'); -import type {ReactNativeBaseComponentViewConfig} from 'ReactNativeTypes'; +import type {ReactNativeBaseComponentViewConfig} from '../Renderer/shims/ReactNativeTypes'; const IGNORED_KEYS = ['transform']; /** diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js index b229b9bc2893..281403e2a493 100644 --- a/RNTester/js/TextExample.ios.js +++ b/RNTester/js/TextExample.ios.js @@ -19,7 +19,7 @@ const { TextInput, View, } = require('react-native'); -const TextAncestor = require('TextAncestor'); +const TextAncestor = require('../../Libraries/Text/TextAncestor'); const TextInlineView = require('./Shared/TextInlineView'); const TextLegend = require('./Shared/TextLegend');