From 7c08d0711580b8fcb0cbebe68247ba5ef43c66b7 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Tue, 27 Sep 2022 09:22:58 -0700 Subject: [PATCH] RN: Change Internal Imports to Relative Paths Summary: Fixes all internal import statements directly referencing the `react-native` package to instead use relative paths. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D39831223 fbshipit-source-id: 510123e5fc8f6845f96d1b55c67e0e59cb401beb --- .../DatePicker/RCTDatePickerNativeComponent.js | 6 +++--- .../AndroidDrawerLayoutNativeComponent.js | 12 ++++++------ .../Pressable/useAndroidRippleForView.js | 4 +++- .../AndroidSwipeRefreshLayoutNativeComponent.js | 2 +- .../PullToRefreshViewNativeComponent.js | 2 +- .../Components/ScrollView/ScrollViewCommands.js | 2 +- .../Switch/AndroidSwitchNativeComponent.js | 11 ++++------- .../Components/Switch/SwitchNativeComponent.js | 2 +- Libraries/Components/Touchable/TouchableBounce.js | 3 ++- .../Touchable/TouchableNativeFeedback.js | 4 ++-- Libraries/Components/Touchable/TouchableOpacity.js | 8 ++++---- Libraries/Image/Image.ios.js | 2 +- Libraries/Lists/VirtualizedSectionList.js | 3 ++- Libraries/LogBox/LogBoxInspectorContainer.js | 3 ++- Libraries/LogBox/UI/AnsiHighlight.js | 6 ++++-- .../__tests__/__fixtures__/ReactWarningFixtures.js | 2 +- Libraries/NativeModules/specs/NativeLogBox.js | 4 ++-- .../NewAppScreen/components/DebugInstructions.js | 4 +++- Libraries/NewAppScreen/components/Header.js | 5 ++++- Libraries/NewAppScreen/components/HermesBadge.js | 5 ++++- .../NewAppScreen/components/LearnMoreLinks.js | 14 ++++++-------- .../NewAppScreen/components/ReloadInstructions.js | 4 +++- Libraries/ReactNative/AppRegistry.js | 2 +- Libraries/ReactNative/BridgelessUIManager.js | 4 ++-- Libraries/ReactNative/FabricUIManager.js | 2 +- Libraries/ReactNative/PaperUIManager.js | 2 +- Libraries/ReactNative/UIManager.js | 2 +- Libraries/Utilities/ReactNativeTestTools.js | 12 +++++------- .../__tests__/ReactNativeTestTools-test.js | 5 ++++- .../__tests__/codegenNativeComponent-test.js | 2 +- Libraries/Utilities/__tests__/useMergeRefs-test.js | 2 +- Libraries/Utilities/__tests__/useRefEffect-test.js | 2 +- 32 files changed, 78 insertions(+), 65 deletions(-) diff --git a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js index c7ae082d19b..53216170701 100644 --- a/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js +++ b/Libraries/Components/DatePicker/RCTDatePickerNativeComponent.js @@ -10,14 +10,14 @@ import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import type {ViewProps} from '../View/ViewPropTypes'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; import * as React from 'react'; import type { Float, WithDefault, BubblingEventHandler, -} from 'react-native/Libraries/Types/CodegenTypes'; +} from '../../Types/CodegenTypes'; type Event = $ReadOnly<{| timestamp: Float, diff --git a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js index c0c1bf05375..f08ec3a0c16 100644 --- a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js +++ b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js @@ -8,17 +8,17 @@ * @flow strict-local */ -import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes'; -import type {ColorValue} from 'react-native/Libraries/StyleSheet/StyleSheet'; +import type {ViewProps} from '../View/ViewPropTypes'; +import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type { WithDefault, DirectEventHandler, Int32, Float, -} from 'react-native/Libraries/Types/CodegenTypes'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; +} from '../../Types/CodegenTypes'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import * as React from 'react'; type DrawerStateEvent = $ReadOnly<{| diff --git a/Libraries/Components/Pressable/useAndroidRippleForView.js b/Libraries/Components/Pressable/useAndroidRippleForView.js index e9682d7027a..459c2628b36 100644 --- a/Libraries/Components/Pressable/useAndroidRippleForView.js +++ b/Libraries/Components/Pressable/useAndroidRippleForView.js @@ -12,7 +12,9 @@ import invariant from 'invariant'; import {Commands} from '../View/ViewNativeComponent'; import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {PressEvent} from '../../Types/CoreEventTypes'; -import {Platform, View, processColor} from 'react-native'; +import Platform from '../../Utilities/Platform'; +import View from '../View/View'; +import processColor from '../../StyleSheet/processColor'; import * as React from 'react'; import {useMemo} from 'react'; diff --git a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js index 0ef1fdc208c..34ff49636f4 100644 --- a/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js +++ b/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutNativeComponent.js @@ -10,7 +10,7 @@ import * as React from 'react'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; diff --git a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js index 0ebd98469e0..50c7edbbc5d 100644 --- a/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js +++ b/Libraries/Components/RefreshControl/PullToRefreshViewNativeComponent.js @@ -19,7 +19,7 @@ import * as React from 'react'; import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; type NativeProps = $ReadOnly<{| ...ViewProps, diff --git a/Libraries/Components/ScrollView/ScrollViewCommands.js b/Libraries/Components/ScrollView/ScrollViewCommands.js index a18c4b08921..c506cdf3435 100644 --- a/Libraries/Components/ScrollView/ScrollViewCommands.js +++ b/Libraries/Components/ScrollView/ScrollViewCommands.js @@ -10,7 +10,7 @@ import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import * as React from 'react'; -import type {Double} from 'react-native/Libraries/Types/CodegenTypes'; +import type {Double} from '../../Types/CodegenTypes'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; diff --git a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js index 200c5230d66..c2980101cc4 100644 --- a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js +++ b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js @@ -10,14 +10,11 @@ import * as React from 'react'; -import type { - WithDefault, - BubblingEventHandler, -} from 'react-native/Libraries/Types/CodegenTypes'; +import type {WithDefault, BubblingEventHandler} from '../../Types/CodegenTypes'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; +import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {ViewProps} from '../View/ViewPropTypes'; diff --git a/Libraries/Components/Switch/SwitchNativeComponent.js b/Libraries/Components/Switch/SwitchNativeComponent.js index 5187656915d..55dbe218247 100644 --- a/Libraries/Components/Switch/SwitchNativeComponent.js +++ b/Libraries/Components/Switch/SwitchNativeComponent.js @@ -14,7 +14,7 @@ import type {ViewProps} from '../View/ViewPropTypes'; import * as React from 'react'; import codegenNativeComponent from '../../Utilities/codegenNativeComponent'; -import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; +import codegenNativeCommands from '../../Utilities/codegenNativeCommands'; import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes'; type SwitchChangeEvent = $ReadOnly<{| diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js index e66b208b5e2..ea512bad3eb 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -14,7 +14,8 @@ import Pressability, { import {PressabilityDebugView} from '../../Pressability/PressabilityDebug'; import type {ViewStyleProp} from '../../StyleSheet/StyleSheet'; import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback'; -import {Animated, Platform} from 'react-native'; +import Animated from '../../Animated/Animated'; +import Platform from '../../Utilities/Platform'; import * as React from 'react'; type Props = $ReadOnly<{| diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js index 5e32ed37cbf..ff7b8f3b421 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js @@ -13,9 +13,9 @@ import Pressability, { } from '../../Pressability/Pressability'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug'; import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback'; -import {Commands} from 'react-native/Libraries/Components/View/ViewNativeComponent'; +import {Commands} from '../View/ViewNativeComponent'; import {findHostInstance_DEPRECATED} from '../../ReactNative/RendererProxy'; -import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes'; +import type {PressEvent} from '../../Types/CoreEventTypes'; import Platform from '../../Utilities/Platform'; import View from '../../Components/View/View'; import processColor from '../../StyleSheet/processColor'; diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js index d9de2b3c2b6..5809514533e 100644 --- a/Libraries/Components/Touchable/TouchableOpacity.js +++ b/Libraries/Components/Touchable/TouchableOpacity.js @@ -13,10 +13,10 @@ import Pressability, { } from '../../Pressability/Pressability'; import {PressabilityDebugView} from '../../Pressability/PressabilityDebug'; import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback'; -import Animated from 'react-native/Libraries/Animated/Animated'; -import Easing from 'react-native/Libraries/Animated/Easing'; -import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet'; -import flattenStyle from 'react-native/Libraries/StyleSheet/flattenStyle'; +import Animated from '../../Animated/Animated'; +import Easing from '../../Animated/Easing'; +import type {ViewStyleProp} from '../../StyleSheet/StyleSheet'; +import flattenStyle from '../../StyleSheet/flattenStyle'; import Platform from '../../Utilities/Platform'; import * as React from 'react'; diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js index 456fae9de5d..edf82964cb0 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -24,7 +24,7 @@ import NativeImageLoaderIOS from './NativeImageLoaderIOS'; import {convertObjectFitToResizeMode} from './ImageUtils'; import ImageViewNativeComponent from './ImageViewNativeComponent'; -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; +import type {RootTag} from '../Types/RootTagTypes'; import {getImageSourcesFromImageProps} from './ImageSourceUtils'; function getSize( diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js index 8430e183386..da4da1b2f73 100644 --- a/Libraries/Lists/VirtualizedSectionList.js +++ b/Libraries/Lists/VirtualizedSectionList.js @@ -13,7 +13,8 @@ import type {ViewToken} from './ViewabilityHelper'; import {keyExtractor as defaultKeyExtractor} from './VirtualizeUtils'; import invariant from 'invariant'; import * as React from 'react'; -import {View, VirtualizedList} from 'react-native'; +import View from '../Components/View/View'; +import VirtualizedList from './VirtualizedList'; type Item = any; diff --git a/Libraries/LogBox/LogBoxInspectorContainer.js b/Libraries/LogBox/LogBoxInspectorContainer.js index c163ba77333..968a58ad39d 100644 --- a/Libraries/LogBox/LogBoxInspectorContainer.js +++ b/Libraries/LogBox/LogBoxInspectorContainer.js @@ -9,7 +9,8 @@ */ import * as React from 'react'; -import {View, StyleSheet} from 'react-native'; +import StyleSheet from '../StyleSheet/StyleSheet'; +import View from '../Components/View/View'; import * as LogBoxData from './Data/LogBoxData'; import LogBoxInspector from './UI/LogBoxInspector'; import type LogBoxLog from './Data/LogBoxLog'; diff --git a/Libraries/LogBox/UI/AnsiHighlight.js b/Libraries/LogBox/UI/AnsiHighlight.js index 4095298dbbd..60b643521a0 100644 --- a/Libraries/LogBox/UI/AnsiHighlight.js +++ b/Libraries/LogBox/UI/AnsiHighlight.js @@ -10,9 +10,11 @@ import {ansiToJson} from 'anser'; import * as React from 'react'; -import {StyleSheet, Text, View} from 'react-native'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import View from '../../Components/View/View'; -import type {TextStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet'; +import type {TextStyleProp} from '../../StyleSheet/StyleSheet'; // Afterglow theme from https://iterm2colorschemes.com/ const COLORS = { diff --git a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js index 4ccab88b705..51b85b1fbe1 100644 --- a/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js +++ b/Libraries/LogBox/__tests__/__fixtures__/ReactWarningFixtures.js @@ -8,7 +8,7 @@ * @oncall react_native */ -import {Text} from 'react-native'; +import Text from '../../../Text/Text'; import * as React from 'react'; export const DoesNotUseKey = () => { diff --git a/Libraries/NativeModules/specs/NativeLogBox.js b/Libraries/NativeModules/specs/NativeLogBox.js index 65a9f5242ef..281ff85bde5 100644 --- a/Libraries/NativeModules/specs/NativeLogBox.js +++ b/Libraries/NativeModules/specs/NativeLogBox.js @@ -8,8 +8,8 @@ * @format */ -import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport'; -import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry'; +import type {TurboModule} from '../../TurboModule/RCTExport'; +import * as TurboModuleRegistry from '../../TurboModule/TurboModuleRegistry'; export interface Spec extends TurboModule { +show: () => void; diff --git a/Libraries/NewAppScreen/components/DebugInstructions.js b/Libraries/NewAppScreen/components/DebugInstructions.js index 35bb4a80dac..24b3da52006 100644 --- a/Libraries/NewAppScreen/components/DebugInstructions.js +++ b/Libraries/NewAppScreen/components/DebugInstructions.js @@ -9,7 +9,9 @@ */ import type {Node} from 'react'; -import {Platform, StyleSheet, Text} from 'react-native'; +import Platform from '../../Utilities/Platform'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; import React from 'react'; const styles = StyleSheet.create({ diff --git a/Libraries/NewAppScreen/components/Header.js b/Libraries/NewAppScreen/components/Header.js index 490746601aa..501d7eba321 100644 --- a/Libraries/NewAppScreen/components/Header.js +++ b/Libraries/NewAppScreen/components/Header.js @@ -9,7 +9,10 @@ */ import type {Node} from 'react'; -import {ImageBackground, StyleSheet, Text, useColorScheme} from 'react-native'; +import ImageBackground from '../../Image/ImageBackground'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import useColorScheme from '../../Utilities/useColorScheme'; import React from 'react'; import Colors from './Colors'; import HermesBadge from './HermesBadge'; diff --git a/Libraries/NewAppScreen/components/HermesBadge.js b/Libraries/NewAppScreen/components/HermesBadge.js index 9ead0caf910..3860e37682e 100644 --- a/Libraries/NewAppScreen/components/HermesBadge.js +++ b/Libraries/NewAppScreen/components/HermesBadge.js @@ -10,7 +10,10 @@ import React from 'react'; import type {Node} from 'react'; -import {StyleSheet, Text, useColorScheme, View} from 'react-native'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import View from '../../Components/View/View'; +import useColorScheme from '../../Utilities/useColorScheme'; import Colors from './Colors'; const HermesBadge = (): Node => { diff --git a/Libraries/NewAppScreen/components/LearnMoreLinks.js b/Libraries/NewAppScreen/components/LearnMoreLinks.js index b2d170e69f8..e2ad243f8d7 100644 --- a/Libraries/NewAppScreen/components/LearnMoreLinks.js +++ b/Libraries/NewAppScreen/components/LearnMoreLinks.js @@ -10,14 +10,12 @@ import Colors from './Colors'; import type {Node} from 'react'; -import openURLInBrowser from 'react-native/Libraries/Core/Devtools/openURLInBrowser'; -import { - StyleSheet, - Text, - TouchableOpacity, - useColorScheme, - View, -} from 'react-native'; +import openURLInBrowser from '../../Core/Devtools/openURLInBrowser'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; +import TouchableOpacity from '../../Components/Touchable/TouchableOpacity'; +import View from '../../Components/View/View'; +import useColorScheme from '../../Utilities/useColorScheme'; import React, {Fragment} from 'react'; const links = [ diff --git a/Libraries/NewAppScreen/components/ReloadInstructions.js b/Libraries/NewAppScreen/components/ReloadInstructions.js index 0294113b3c5..359ef3dda62 100644 --- a/Libraries/NewAppScreen/components/ReloadInstructions.js +++ b/Libraries/NewAppScreen/components/ReloadInstructions.js @@ -9,7 +9,9 @@ */ import type {Node} from 'react'; -import {Platform, StyleSheet, Text} from 'react-native'; +import Platform from '../../Utilities/Platform'; +import StyleSheet from '../../StyleSheet/StyleSheet'; +import Text from '../../Text/Text'; import React from 'react'; const styles = StyleSheet.create({ diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js index cb494e15f15..beb37f1e45c 100644 --- a/Libraries/ReactNative/AppRegistry.js +++ b/Libraries/ReactNative/AppRegistry.js @@ -9,7 +9,7 @@ */ import type {IPerformanceLogger} from '../Utilities/createPerformanceLogger'; -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; +import type {RootTag} from '../Types/RootTagTypes'; import BatchedBridge from '../BatchedBridge/BatchedBridge'; import BugReporting from '../BugReporting/BugReporting'; diff --git a/Libraries/ReactNative/BridgelessUIManager.js b/Libraries/ReactNative/BridgelessUIManager.js index 3347b6a91bc..4ed4f2195ff 100644 --- a/Libraries/ReactNative/BridgelessUIManager.js +++ b/Libraries/ReactNative/BridgelessUIManager.js @@ -10,8 +10,8 @@ 'use strict'; -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; -import {unstable_hasComponent} from 'react-native/Libraries/NativeComponent/NativeComponentRegistryUnstable'; +import type {RootTag} from '../Types/RootTagTypes'; +import {unstable_hasComponent} from '../NativeComponent/NativeComponentRegistryUnstable'; const errorMessageForMethod = (methodName: string): string => "[ReactNative Architecture][JS] '" + diff --git a/Libraries/ReactNative/FabricUIManager.js b/Libraries/ReactNative/FabricUIManager.js index 9e5b625a778..cbf95deb5c6 100644 --- a/Libraries/ReactNative/FabricUIManager.js +++ b/Libraries/ReactNative/FabricUIManager.js @@ -16,7 +16,7 @@ import type { MeasureLayoutOnSuccessCallback, LayoutAnimationConfig, } from '../Renderer/shims/ReactNativeTypes'; -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; +import type {RootTag} from '../Types/RootTagTypes'; // TODO: type these properly. type Node = {...}; diff --git a/Libraries/ReactNative/PaperUIManager.js b/Libraries/ReactNative/PaperUIManager.js index b331ca2e952..0247ca55ed3 100644 --- a/Libraries/ReactNative/PaperUIManager.js +++ b/Libraries/ReactNative/PaperUIManager.js @@ -8,7 +8,7 @@ * @format */ -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; +import type {RootTag} from '../Types/RootTagTypes'; import NativeUIManager from './NativeUIManager'; diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js index fc9da190bef..d6268768d1b 100644 --- a/Libraries/ReactNative/UIManager.js +++ b/Libraries/ReactNative/UIManager.js @@ -9,7 +9,7 @@ */ import type {Spec} from './NativeUIManager'; -import type {RootTag} from 'react-native/Libraries/Types/RootTagTypes'; +import type {RootTag} from '../Types/RootTagTypes'; export interface UIManagerJSInterface extends Spec { +getViewManagerConfig: (viewManagerName: string) => Object; diff --git a/Libraries/Utilities/ReactNativeTestTools.js b/Libraries/Utilities/ReactNativeTestTools.js index dfbb46780bc..508872a1efd 100644 --- a/Libraries/Utilities/ReactNativeTestTools.js +++ b/Libraries/Utilities/ReactNativeTestTools.js @@ -36,13 +36,11 @@ export type ReactTestRendererJSON = * delete this comment and run Flow. */ $ReturnType; -const { - Switch, - Text, - TextInput, - View, - VirtualizedList, -} = require('react-native'); +const Switch = require('../Components/Switch/Switch').default; +const Text = require('../Text/Text'); +const TextInput = require('../Components/TextInput/TextInput'); +const View = require('../Components/View/View'); +const VirtualizedList = require('../Lists/VirtualizedList'); function byClickable(): Predicate { return withMessage( diff --git a/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js b/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js index 4762583526f..9556a9ae559 100644 --- a/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js +++ b/Libraries/Utilities/__tests__/ReactNativeTestTools-test.js @@ -12,7 +12,10 @@ import * as React from 'react'; import {byTestID, byTextMatching, enter, tap} from '../ReactNativeTestTools'; -import {Text, TextInput, TouchableWithoutFeedback, View} from 'react-native'; +import Text from '../../Text/Text'; +import TextInput from '../../Components/TextInput/TextInput'; +import TouchableWithoutFeedback from '../../Components/Touchable/TouchableWithoutFeedback'; +import View from '../../Components/View/View'; const ReactTestRenderer = require('react-test-renderer'); diff --git a/Libraries/Utilities/__tests__/codegenNativeComponent-test.js b/Libraries/Utilities/__tests__/codegenNativeComponent-test.js index 91081c7c2cd..b4246ea9be2 100644 --- a/Libraries/Utilities/__tests__/codegenNativeComponent-test.js +++ b/Libraries/Utilities/__tests__/codegenNativeComponent-test.js @@ -11,7 +11,7 @@ 'use strict'; const codegenNativeComponent = require('../codegenNativeComponent').default; -const {UIManager} = require('react-native'); +const UIManager = require('../../ReactNative/UIManager'); // We need to unmock requireNativeComponent since it's under test. // Instead, we mock the function it calls, createReactNativeComponentClass, diff --git a/Libraries/Utilities/__tests__/useMergeRefs-test.js b/Libraries/Utilities/__tests__/useMergeRefs-test.js index 15cc573049a..badfc3bf249 100644 --- a/Libraries/Utilities/__tests__/useMergeRefs-test.js +++ b/Libraries/Utilities/__tests__/useMergeRefs-test.js @@ -11,7 +11,7 @@ import useMergeRefs from '../useMergeRefs'; import * as React from 'react'; -import {View} from 'react-native'; +import View from '../../Components/View/View'; import {act, create} from 'react-test-renderer'; /** diff --git a/Libraries/Utilities/__tests__/useRefEffect-test.js b/Libraries/Utilities/__tests__/useRefEffect-test.js index 670555100c1..69c9ae0be80 100644 --- a/Libraries/Utilities/__tests__/useRefEffect-test.js +++ b/Libraries/Utilities/__tests__/useRefEffect-test.js @@ -11,7 +11,7 @@ import useRefEffect from '../useRefEffect'; import * as React from 'react'; -import {View} from 'react-native'; +import View from '../../Components/View/View'; import {act, create} from 'react-test-renderer'; /**