From 16cee00f28c2d9362d1891d8a0d45051ca7dae41 Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Fri, 1 Sep 2017 15:02:12 -0700 Subject: [PATCH 1/3] [exp] Convert Haste requires to relative requires --- IntegrationTests/AccessibilityManagerTest.js | 2 +- IntegrationTests/AppEventsTest.js | 2 +- IntegrationTests/AsyncStorageTest.js | 2 +- IntegrationTests/IntegrationTestsApp.js | 2 +- IntegrationTests/LayoutEventsTest.js | 2 +- IntegrationTests/LoggingTestModule.js | 2 +- .../ReactContentSizeUpdateTest.js | 4 +- IntegrationTests/SizeFlexibilityUpdateTest.js | 4 +- Libraries/ART/ReactNativeART.js | 10 +- Libraries/ActionSheetIOS/ActionSheetIOS.js | 4 +- Libraries/Alert/Alert.js | 6 +- Libraries/Alert/AlertIOS.js | 2 +- Libraries/Alert/RCTAlertManager.android.js | 2 +- Libraries/Alert/RCTAlertManager.ios.js | 2 +- Libraries/Animated/src/Animated.js | 10 +- .../Animated/src/AnimatedImplementation.js | 22 +-- Libraries/Animated/src/AnimatedWeb.js | 2 +- Libraries/Animated/src/Easing.js | 2 +- Libraries/Animated/src/Interpolation.js | 2 +- .../Animated/src/NativeAnimatedHelper.js | 4 +- .../Animated/src/__tests__/Animated-test.js | 10 +- .../src/__tests__/AnimatedNative-test.js | 20 +- .../Animated/src/__tests__/Easing-test.js | 2 +- .../src/__tests__/Interpolation-test.js | 4 +- .../Animated/src/__tests__/bezier-test.js | 2 +- Libraries/AppState/AppState.js | 8 +- Libraries/BatchedBridge/BatchedBridge.js | 2 +- Libraries/BatchedBridge/MessageQueue.js | 10 +- Libraries/BatchedBridge/NativeModules.js | 4 +- .../__tests__/MessageQueue-test.js | 2 +- .../__tests__/NativeModules-test.js | 12 +- Libraries/Blob/Blob.js | 2 +- Libraries/Blob/URL.js | 4 +- Libraries/BugReporting/BugReporting.js | 10 +- Libraries/CameraRoll/CameraRoll.js | 4 +- Libraries/CameraRoll/ImagePickerIOS.js | 2 +- .../AccessibilityInfo.android.js | 4 +- .../AccessibilityInfo.ios.js | 6 +- .../ActivityIndicator/ActivityIndicator.js | 16 +- .../Components/AppleTV/TVEventHandler.ios.js | 6 +- Libraries/Components/Button.js | 16 +- Libraries/Components/Clipboard/Clipboard.js | 2 +- .../DatePicker/DatePickerIOS.android.js | 8 +- .../DatePicker/DatePickerIOS.ios.js | 12 +- .../DatePickerAndroid.android.js | 2 +- .../DrawerLayoutAndroid.android.js | 24 +-- .../DrawerAndroid/DrawerLayoutAndroid.ios.js | 2 +- Libraries/Components/Keyboard/Keyboard.js | 6 +- .../Keyboard/KeyboardAvoidingView.js | 12 +- Libraries/Components/LazyRenderer.js | 2 +- .../MaskedView/MaskedViewIOS.android.js | 2 +- .../MaskedView/MaskedViewIOS.ios.js | 10 +- .../Navigation/NavigatorIOS.android.js | 2 +- .../Components/Navigation/NavigatorIOS.ios.js | 24 +-- Libraries/Components/Picker/Picker.js | 20 +- .../Picker/PickerAndroid.android.js | 16 +- .../Components/Picker/PickerAndroid.ios.js | 2 +- .../Components/Picker/PickerIOS.android.js | 2 +- Libraries/Components/Picker/PickerIOS.ios.js | 18 +- .../ProgressBarAndroid.android.js | 10 +- .../ProgressBarAndroid.ios.js | 2 +- .../ProgressViewIOS.android.js | 8 +- .../ProgressViewIOS/ProgressViewIOS.ios.js | 12 +- .../RefreshControl/RefreshControl.js | 14 +- .../__mocks__/RefreshControlMock.js | 4 +- Libraries/Components/ScrollResponder.js | 18 +- Libraries/Components/ScrollView/ScrollView.js | 36 ++-- .../ScrollView/ScrollViewStickyHeader.js | 6 +- .../ScrollView/__mocks__/ScrollViewMock.js | 6 +- .../SegmentedControlIOS.android.js | 8 +- .../SegmentedControlIOS.ios.js | 10 +- Libraries/Components/Slider/Slider.js | 18 +- Libraries/Components/StaticContainer.react.js | 2 +- Libraries/Components/StaticRenderer.js | 2 +- Libraries/Components/StatusBar/StatusBar.js | 10 +- .../StatusBar/StatusBarIOS.android.js | 2 +- .../Components/StatusBar/StatusBarIOS.ios.js | 4 +- Libraries/Components/Switch/Switch.js | 14 +- .../Components/TabBarIOS/TabBarIOS.android.js | 8 +- .../Components/TabBarIOS/TabBarIOS.ios.js | 12 +- .../TabBarIOS/TabBarItemIOS.android.js | 6 +- .../Components/TabBarIOS/TabBarItemIOS.ios.js | 16 +- Libraries/Components/TextInput/TextInput.js | 28 +-- .../Components/TextInput/TextInputState.js | 4 +- .../TimePickerAndroid.android.js | 2 +- .../ToastAndroid/ToastAndroid.android.js | 2 +- .../ToolbarAndroid/ToolbarAndroid.android.js | 18 +- .../ToolbarAndroid/ToolbarAndroid.ios.js | 2 +- .../Touchable/BoundingDimensions.js | 2 +- Libraries/Components/Touchable/Position.js | 2 +- Libraries/Components/Touchable/Touchable.js | 18 +- .../Components/Touchable/TouchableBounce.js | 10 +- .../Touchable/TouchableHighlight.js | 24 +-- .../TouchableNativeFeedback.android.js | 16 +- .../Touchable/TouchableNativeFeedback.ios.js | 8 +- .../Components/Touchable/TouchableOpacity.js | 16 +- .../Touchable/TouchableWithoutFeedback.js | 10 +- .../__tests__/TouchableHighlight-test.js | 6 +- .../UnimplementedViews/UnimplementedView.js | 6 +- .../View/PlatformViewPropTypes.ios.js | 4 +- .../View/ReactNativeStyleAttributes.js | 12 +- .../View/ReactNativeViewAttributes.js | 2 +- .../Components/View/ShadowPropTypesIOS.js | 2 +- Libraries/Components/View/View.js | 16 +- Libraries/Components/View/ViewPropTypes.js | 10 +- .../Components/View/ViewStylePropTypes.js | 8 +- .../ViewPager/ViewPagerAndroid.android.js | 12 +- .../ViewPager/ViewPagerAndroid.ios.js | 2 +- .../Components/WebView/WebView.android.js | 22 +-- Libraries/Components/WebView/WebView.ios.js | 32 +-- .../__tests__/parseErrorStack-test.js | 2 +- Libraries/Core/Devtools/getDevServer.js | 2 +- Libraries/Core/Devtools/openFileInEditor.js | 2 +- Libraries/Core/Devtools/setupDevtools.js | 8 +- .../Core/Devtools/symbolicateStackTrace.js | 6 +- Libraries/Core/ExceptionsManager.js | 8 +- Libraries/Core/InitializeCore.js | 68 +++---- Libraries/Core/Timers/JSTimers.js | 8 +- .../MissingNativeEventEmitterShim.js | 4 +- Libraries/EventEmitter/NativeEventEmitter.js | 6 +- .../EventEmitter/RCTDeviceEventEmitter.js | 4 +- Libraries/EventEmitter/RCTEventEmitter.js | 2 +- .../EventEmitter/RCTNativeAppEventEmitter.js | 2 +- .../__mocks__/NativeEventEmitter.js | 4 +- Libraries/Experimental/Incremental.js | 6 +- Libraries/Experimental/IncrementalExample.js | 8 +- Libraries/Experimental/IncrementalGroup.js | 6 +- .../Experimental/IncrementalPresenter.js | 8 +- .../SwipeableRow/SwipeableListView.js | 8 +- .../SwipeableListViewDataSource.js | 2 +- .../SwipeableQuickActionButton.js | 12 +- .../SwipeableRow/SwipeableQuickActions.js | 8 +- .../Experimental/SwipeableRow/SwipeableRow.js | 12 +- Libraries/Experimental/WindowedListView.js | 26 +-- Libraries/Geolocation/Geolocation.js | 10 +- Libraries/Image/AssetSourceResolver.js | 4 +- Libraries/Image/Image.android.js | 32 +-- Libraries/Image/Image.ios.js | 26 +-- Libraries/Image/ImageBackground.js | 10 +- Libraries/Image/ImageEditor.js | 2 +- Libraries/Image/ImageStore.js | 2 +- Libraries/Image/ImageStylePropTypes.js | 10 +- Libraries/Image/RelativeImageStub.js | 2 +- .../__tests__/resolveAssetSource-test.js | 6 +- Libraries/Image/nativeImageSource.js | 2 +- Libraries/Image/resolveAssetSource.js | 6 +- Libraries/Inspector/BorderBox.js | 4 +- Libraries/Inspector/BoxInspector.js | 10 +- Libraries/Inspector/ElementBox.js | 12 +- Libraries/Inspector/ElementProperties.js | 22 +-- Libraries/Inspector/Inspector.js | 22 +-- Libraries/Inspector/InspectorOverlay.js | 12 +- Libraries/Inspector/InspectorPanel.js | 18 +- Libraries/Inspector/NetworkOverlay.js | 18 +- Libraries/Inspector/PerformanceOverlay.js | 10 +- Libraries/Inspector/StyleInspector.js | 8 +- Libraries/Interaction/Batchinator.js | 2 +- .../Interaction/BridgeSpyStallHandler.js | 6 +- Libraries/Interaction/FrameRateLogger.js | 2 +- Libraries/Interaction/InteractionManager.js | 10 +- Libraries/Interaction/InteractionMixin.js | 2 +- .../Interaction/InteractionStallDebugger.js | 6 +- Libraries/Interaction/JSEventLoopWatchdog.js | 2 +- Libraries/Interaction/PanResponder.js | 2 +- .../Interaction/ReactPerfStallHandler.js | 4 +- Libraries/Interaction/TaskQueue.js | 2 +- .../Interaction/__tests__/Batchinator-test.js | 6 +- .../__tests__/InteractionManager-test.js | 10 +- .../__tests__/InteractionMixin-test.js | 6 +- .../Interaction/__tests__/TaskQueue-test.js | 2 +- Libraries/JSInspector/NetworkAgent.js | 8 +- Libraries/LayoutAnimation/LayoutAnimation.js | 2 +- Libraries/Linking/Linking.js | 6 +- Libraries/Lists/FlatList.js | 8 +- Libraries/Lists/ListView/ListView.js | 22 +-- .../Lists/ListView/ListViewDataSource.js | 2 +- .../Lists/ListView/__mocks__/ListViewMock.js | 8 +- Libraries/Lists/MetroListView.js | 8 +- Libraries/Lists/SectionList.js | 8 +- Libraries/Lists/VirtualizedList.js | 26 +-- Libraries/Lists/VirtualizedSectionList.js | 6 +- .../Lists/__flowtests__/FlatList-flowtest.js | 2 +- .../__flowtests__/SectionList-flowtest.js | 2 +- .../Lists/__tests__/FillRateHelper-test.js | 2 +- Libraries/Lists/__tests__/FlatList-test.js | 4 +- Libraries/Lists/__tests__/SectionList-test.js | 4 +- .../Lists/__tests__/ViewabilityHelper-test.js | 2 +- .../Lists/__tests__/VirtualizeUtils-test.js | 2 +- .../Lists/__tests__/VirtualizedList-test.js | 4 +- Libraries/Modal/Modal.js | 16 +- Libraries/Network/NetInfo.js | 8 +- Libraries/Network/RCTNetworking.android.js | 8 +- Libraries/Network/RCTNetworking.ios.js | 8 +- Libraries/Network/XHRInterceptor.js | 2 +- Libraries/Network/XMLHttpRequest.js | 2 +- Libraries/Network/__tests__/FormData-test.js | 2 +- .../Network/__tests__/XMLHttpRequest-test.js | 8 +- Libraries/Network/convertRequestBody.js | 4 +- Libraries/Performance/SamplingProfiler.js | 2 +- .../PermissionsAndroid/PermissionsAndroid.js | 2 +- .../PushNotificationIOS.js | 4 +- Libraries/RCTTest/SnapshotViewIOS.android.js | 2 +- Libraries/RCTTest/SnapshotViewIOS.ios.js | 14 +- Libraries/ReactNative/AppContainer.js | 16 +- Libraries/ReactNative/AppRegistry.js | 14 +- Libraries/ReactNative/I18nManager.js | 2 +- Libraries/ReactNative/UIManager.js | 6 +- Libraries/ReactNative/UIManagerStatTracker.js | 2 +- Libraries/ReactNative/YellowBox.js | 40 ++-- Libraries/ReactNative/queryLayoutByID.js | 2 +- Libraries/ReactNative/renderApplication.js | 8 +- .../ReactNative/requireNativeComponent.js | 24 +-- Libraries/ReactNative/verifyPropTypes.js | 2 +- Libraries/Renderer/ReactNativeFiber-dev.js | 14 +- Libraries/Renderer/ReactNativeFiber-prod.js | 18 +- Libraries/Renderer/ReactNativeStack-dev.js | 14 +- Libraries/Renderer/ReactNativeStack-prod.js | 18 +- .../Renderer/shims/NativeMethodsMixin.js | 2 +- Libraries/Renderer/shims/ReactDebugTool.js | 2 +- .../Renderer/shims/ReactGlobalSharedState.js | 2 +- Libraries/Renderer/shims/ReactNative.js | 10 +- .../shims/ReactNativeComponentTree.js | 2 +- .../Renderer/shims/ReactNativePropRegistry.js | 2 +- Libraries/Renderer/shims/ReactPerf.js | 2 +- Libraries/Renderer/shims/TouchHistoryMath.js | 2 +- .../shims/createReactNativeComponentClass.js | 2 +- Libraries/Renderer/shims/takeSnapshot.js | 2 +- Libraries/Sample/Sample.ios.js | 2 +- Libraries/Settings/Settings.ios.js | 4 +- Libraries/Share/Share.js | 6 +- Libraries/Storage/AsyncStorage.js | 2 +- Libraries/StyleSheet/ColorPropType.js | 2 +- Libraries/StyleSheet/EdgeInsetsPropType.js | 2 +- Libraries/StyleSheet/PointPropType.js | 2 +- Libraries/StyleSheet/StyleSheet.js | 10 +- Libraries/StyleSheet/StyleSheetPropType.js | 4 +- Libraries/StyleSheet/StyleSheetValidation.js | 6 +- Libraries/StyleSheet/TransformPropTypes.js | 2 +- .../StyleSheet/__tests__/flattenStyle-test.js | 2 +- .../__tests__/normalizeColor-test.js | 2 +- .../StyleSheet/__tests__/processColor-test.js | 4 +- .../__tests__/processTransform-test.js | 2 +- .../__tests__/setNormalizedColorAlpha-test.js | 4 +- Libraries/StyleSheet/flattenStyle.js | 2 +- Libraries/StyleSheet/processColor.js | 4 +- Libraries/StyleSheet/processTransform.js | 6 +- Libraries/Text/Text.js | 24 +-- Libraries/Text/TextStylePropTypes.js | 4 +- Libraries/Utilities/BackAndroid.js | 2 +- Libraries/Utilities/BackHandler.android.js | 4 +- Libraries/Utilities/BackHandler.ios.js | 4 +- Libraries/Utilities/DeviceInfo.js | 2 +- Libraries/Utilities/Dimensions.js | 8 +- Libraries/Utilities/HMRClient.js | 10 +- Libraries/Utilities/HMRLoadingView.android.js | 2 +- Libraries/Utilities/HMRLoadingView.ios.js | 4 +- Libraries/Utilities/HeapCapture.js | 2 +- Libraries/Utilities/PerformanceLogger.js | 4 +- Libraries/Utilities/PixelRatio.js | 2 +- Libraries/Utilities/Platform.android.js | 2 +- Libraries/Utilities/Platform.ios.js | 2 +- .../Utilities/__tests__/MatrixMath-test.js | 2 +- .../Utilities/__tests__/SceneTracker-test.js | 2 +- .../__tests__/buildStyleInterpolator-test.js | 2 +- .../deepFreezeAndThrowOnMutationInDev-test.js | 2 +- .../Utilities/__tests__/groupByEveryN-test.js | 2 +- .../__tests__/mapWithSeparator-test.js | 2 +- .../Utilities/__tests__/truncate-test.js | 2 +- .../Utilities/createStrictShapeTypeChecker.js | 2 +- Libraries/Utilities/deprecatedPropType.js | 2 +- .../differ/__tests__/deepDiffer-test.js | 2 +- Libraries/Utilities/dismissKeyboard.js | 2 +- Libraries/Vibration/Vibration.js | 4 +- Libraries/Vibration/VibrationIOS.ios.js | 2 +- Libraries/WebSocket/WebSocket.js | 12 +- Libraries/WebSocket/WebSocketInterceptor.js | 4 +- .../WebSocket/__tests__/WebSocket-test.js | 6 +- Libraries/promiseRejectionIsError.js | 2 +- .../react-native-implementation.js | 186 +++++++++--------- Libraries/vendor/core/Map.js | 6 +- Libraries/vendor/core/Set.js | 6 +- Libraries/vendor/core/merge.js | 2 +- Libraries/vendor/core/mergeInto.js | 2 +- .../selection/DocumentSelectionState.js | 2 +- .../vendor/emitter/EmitterSubscription.js | 2 +- Libraries/vendor/emitter/EventEmitter.js | 4 +- Libraries/vendor/emitter/mixInEventEmitter.js | 8 +- RNTester/js/AnimatedGratuitousApp/AnExApp.js | 2 +- RNTester/js/CameraRollView.js | 4 +- RNTester/js/FlatListExample.js | 4 +- RNTester/js/ImageCapInsetsExample.js | 2 +- RNTester/js/KeyboardAvoidingViewExample.js | 2 +- RNTester/js/ListViewPagingExample.js | 2 +- RNTester/js/MaskedViewExample.js | 4 +- RNTester/js/MultiColumnExample.js | 2 +- RNTester/js/NativeAnimationsExample.js | 6 +- RNTester/js/NavigatorIOSExample.js | 2 +- RNTester/js/PickerExample.js | 6 +- .../js/ProgressBarAndroidExample.android.js | 8 +- RNTester/js/PushNotificationIOSExample.js | 4 +- RNTester/js/RCTRootViewIOSExample.js | 2 +- RNTester/js/RNTesterApp.android.js | 24 +-- RNTester/js/RNTesterApp.ios.js | 6 +- RNTester/js/RNTesterExampleList.js | 14 +- RNTester/js/RNTesterSettingSwitchRow.js | 10 +- RNTester/js/RNTesterStatePersister.js | 4 +- RNTester/js/RTLExample.js | 2 +- RNTester/js/SectionListExample.js | 2 +- RNTester/js/TextExample.ios.js | 2 +- RNTester/js/ToastAndroidExample.android.js | 4 +- RNTester/js/ToolbarAndroidExample.android.js | 6 +- RNTester/js/TouchableExample.js | 2 +- RNTester/js/ViewExample.js | 2 +- RNTester/js/XHRExampleCookies.js | 2 +- jest/setup.js | 38 ++-- 315 files changed, 1227 insertions(+), 1227 deletions(-) diff --git a/IntegrationTests/AccessibilityManagerTest.js b/IntegrationTests/AccessibilityManagerTest.js index 8f82374baa18e6..00942a08c55da6 100644 --- a/IntegrationTests/AccessibilityManagerTest.js +++ b/IntegrationTests/AccessibilityManagerTest.js @@ -14,7 +14,7 @@ const React = require('react'); const ReactNative = require('react-native'); const { View } = ReactNative; -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +const RCTDeviceEventEmitter = require('../Libraries/EventEmitter/RCTDeviceEventEmitter'); const { TestModule, AccessibilityManager, diff --git a/IntegrationTests/AppEventsTest.js b/IntegrationTests/AppEventsTest.js index 95f5026bb3d397..9393626eff0080 100644 --- a/IntegrationTests/AppEventsTest.js +++ b/IntegrationTests/AppEventsTest.js @@ -21,7 +21,7 @@ var { } = ReactNative; var { TestModule } = ReactNative.NativeModules; -var deepDiffer = require('deepDiffer'); +var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer'); var TEST_PAYLOAD = {foo: 'bar'}; diff --git a/IntegrationTests/AsyncStorageTest.js b/IntegrationTests/AsyncStorageTest.js index d87517c37388f1..69cb8c89de6336 100644 --- a/IntegrationTests/AsyncStorageTest.js +++ b/IntegrationTests/AsyncStorageTest.js @@ -20,7 +20,7 @@ var { } = ReactNative; var { TestModule } = ReactNative.NativeModules; -var deepDiffer = require('deepDiffer'); +var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer'); var DEBUG = false; diff --git a/IntegrationTests/IntegrationTestsApp.js b/IntegrationTests/IntegrationTestsApp.js index e371b9c819f88c..0509ba73382dfd 100644 --- a/IntegrationTests/IntegrationTestsApp.js +++ b/IntegrationTests/IntegrationTestsApp.js @@ -44,7 +44,7 @@ TESTS.forEach( ); // Modules required for integration tests -require('LoggingTestModule'); +require('../IntegrationTests/LoggingTestModule'); type Test = any; diff --git a/IntegrationTests/LayoutEventsTest.js b/IntegrationTests/LayoutEventsTest.js index 220701c4e8687b..4a32fc43bf11fc 100644 --- a/IntegrationTests/LayoutEventsTest.js +++ b/IntegrationTests/LayoutEventsTest.js @@ -23,7 +23,7 @@ var { } = ReactNative; var { TestModule } = ReactNative.NativeModules; -var deepDiffer = require('deepDiffer'); +var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer'); function debug(...args) { // console.log.apply(null, arguments); diff --git a/IntegrationTests/LoggingTestModule.js b/IntegrationTests/LoggingTestModule.js index ec07f3271bf700..a15c46f36d8f59 100644 --- a/IntegrationTests/LoggingTestModule.js +++ b/IntegrationTests/LoggingTestModule.js @@ -10,7 +10,7 @@ */ 'use strict'; -var BatchedBridge = require('BatchedBridge'); +var BatchedBridge = require('../Libraries/BatchedBridge/BatchedBridge'); var warning = require('fbjs/lib/warning'); var invariant = require('fbjs/lib/invariant'); diff --git a/IntegrationTests/ReactContentSizeUpdateTest.js b/IntegrationTests/ReactContentSizeUpdateTest.js index 07ae0ed661ce15..6b77ea31bdda20 100644 --- a/IntegrationTests/ReactContentSizeUpdateTest.js +++ b/IntegrationTests/ReactContentSizeUpdateTest.js @@ -12,8 +12,8 @@ var React = require('react'); var createReactClass = require('create-react-class'); var ReactNative = require('react-native'); -var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter'); -var Subscribable = require('Subscribable'); +var RCTNativeAppEventEmitter = require('../Libraries/EventEmitter/RCTNativeAppEventEmitter'); +var Subscribable = require('../Libraries/Components/Subscribable'); var TimerMixin = require('react-timer-mixin'); var { View } = ReactNative; diff --git a/IntegrationTests/SizeFlexibilityUpdateTest.js b/IntegrationTests/SizeFlexibilityUpdateTest.js index 5d580f8fc6a028..83e815983a2454 100644 --- a/IntegrationTests/SizeFlexibilityUpdateTest.js +++ b/IntegrationTests/SizeFlexibilityUpdateTest.js @@ -12,8 +12,8 @@ var React = require('react'); var createReactClass = require('create-react-class'); var ReactNative = require('react-native'); -var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter'); -var Subscribable = require('Subscribable'); +var RCTNativeAppEventEmitter = require('../Libraries/EventEmitter/RCTNativeAppEventEmitter'); +var Subscribable = require('../Libraries/Components/Subscribable'); var { View } = ReactNative; var { TestModule } = ReactNative.NativeModules; diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js index a54fafdfe5091c..ad6ae4f8129487 100644 --- a/Libraries/ART/ReactNativeART.js +++ b/Libraries/ART/ReactNativeART.js @@ -11,15 +11,15 @@ 'use strict'; var Color = require('art/core/color'); -var Path = require('ARTSerializablePath'); +var Path = require('./ARTSerializablePath'); var Transform = require('art/core/transform'); -var React = require('React'); +var React = require('../react-native/React'); var PropTypes = require('prop-types'); -var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); +var ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes'); -var createReactNativeComponentClass = require('createReactNativeComponentClass'); -var merge = require('merge'); +var createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass'); +var merge = require('../vendor/core/merge'); var invariant = require('fbjs/lib/invariant'); // Diff Helpers diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js index d7e666be901021..6fc42aa0d666e6 100644 --- a/Libraries/ActionSheetIOS/ActionSheetIOS.js +++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js @@ -11,10 +11,10 @@ */ 'use strict'; -var RCTActionSheetManager = require('NativeModules').ActionSheetManager; +var RCTActionSheetManager = require('../BatchedBridge/NativeModules').ActionSheetManager; var invariant = require('fbjs/lib/invariant'); -var processColor = require('processColor'); +var processColor = require('../StyleSheet/processColor'); var ActionSheetIOS = { /** diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js index bd7d46f51bea0c..4f5e5cc60de88a 100644 --- a/Libraries/Alert/Alert.js +++ b/Libraries/Alert/Alert.js @@ -11,9 +11,9 @@ */ 'use strict'; -const AlertIOS = require('AlertIOS'); -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); +const AlertIOS = require('./AlertIOS'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const Platform = require('../Utilities/Platform'); import type { AlertType, AlertButtonStyle } from 'AlertIOS'; diff --git a/Libraries/Alert/AlertIOS.js b/Libraries/Alert/AlertIOS.js index 4a8143024a14ca..a95938cf3ebcf5 100644 --- a/Libraries/Alert/AlertIOS.js +++ b/Libraries/Alert/AlertIOS.js @@ -12,7 +12,7 @@ */ 'use strict'; -var RCTAlertManager = require('NativeModules').AlertManager; +var RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager; /** * An Alert button type diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js index f8ad604e16da60..61c8abb42ee4c6 100644 --- a/Libraries/Alert/RCTAlertManager.android.js +++ b/Libraries/Alert/RCTAlertManager.android.js @@ -10,7 +10,7 @@ */ 'use strict'; -var NativeModules = require('NativeModules'); +var NativeModules = require('../BatchedBridge/NativeModules'); function emptyCallback() {} diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js index 409ecf5caf0430..0406c0c692f1c0 100644 --- a/Libraries/Alert/RCTAlertManager.ios.js +++ b/Libraries/Alert/RCTAlertManager.ios.js @@ -11,6 +11,6 @@ */ 'use strict'; -var RCTAlertManager = require('NativeModules').AlertManager; +var RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager; module.exports = RCTAlertManager; diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js index 1eacd03c48c66e..f9c430a76faf8c 100644 --- a/Libraries/Animated/src/Animated.js +++ b/Libraries/Animated/src/Animated.js @@ -12,10 +12,10 @@ 'use strict'; -var AnimatedImplementation = require('AnimatedImplementation'); -var Image = require('Image'); -var Text = require('Text'); -var View = require('View'); +var AnimatedImplementation = require('./AnimatedImplementation'); +var Image = require('../../Image/Image'); +var Text = require('../../Text/Text'); +var View = require('../../Components/View/View'); let AnimatedScrollView; @@ -26,7 +26,7 @@ const Animated = { get ScrollView() { // Make this lazy to avoid circular reference. if (!AnimatedScrollView) { - AnimatedScrollView = AnimatedImplementation.createAnimatedComponent(require('ScrollView')); + AnimatedScrollView = AnimatedImplementation.createAnimatedComponent(require('../../Components/ScrollView/ScrollView')); } return AnimatedScrollView; }, diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js index 765044fdff45a2..5217943dc56353 100644 --- a/Libraries/Animated/src/AnimatedImplementation.js +++ b/Libraries/Animated/src/AnimatedImplementation.js @@ -12,16 +12,16 @@ */ 'use strict'; -var InteractionManager = require('InteractionManager'); -var Interpolation = require('Interpolation'); -var NativeAnimatedHelper = require('NativeAnimatedHelper'); -var React = require('React'); -var ReactNative = require('ReactNative'); -var Set = require('Set'); -var SpringConfig = require('SpringConfig'); -var ViewStylePropTypes = require('ViewStylePropTypes'); - -var flattenStyle = require('flattenStyle'); +var InteractionManager = require('../../Interaction/InteractionManager'); +var Interpolation = require('./Interpolation'); +var NativeAnimatedHelper = require('./NativeAnimatedHelper'); +var React = require('../../react-native/React'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var Set = require('../../vendor/core/Set'); +var SpringConfig = require('./SpringConfig'); +var ViewStylePropTypes = require('../../Components/View/ViewStylePropTypes'); + +var flattenStyle = require('../../StyleSheet/flattenStyle'); var invariant = require('fbjs/lib/invariant'); var requestAnimationFrame = require('fbjs/lib/requestAnimationFrame'); @@ -247,7 +247,7 @@ type TimingAnimationConfigSingle = AnimationConfig & { let _easeInOut; function easeInOut() { if (!_easeInOut) { - const Easing = require('Easing'); + const Easing = require('./Easing'); _easeInOut = Easing.inOut(Easing.ease); } return _easeInOut; diff --git a/Libraries/Animated/src/AnimatedWeb.js b/Libraries/Animated/src/AnimatedWeb.js index b88acb940bd65b..91154706a55f04 100644 --- a/Libraries/Animated/src/AnimatedWeb.js +++ b/Libraries/Animated/src/AnimatedWeb.js @@ -11,7 +11,7 @@ */ 'use strict'; -var AnimatedImplementation = require('AnimatedImplementation'); +var AnimatedImplementation = require('./AnimatedImplementation'); module.exports = { ...AnimatedImplementation, diff --git a/Libraries/Animated/src/Easing.js b/Libraries/Animated/src/Easing.js index 03c40917597baa..f5c316d1c9a87d 100644 --- a/Libraries/Animated/src/Easing.js +++ b/Libraries/Animated/src/Easing.js @@ -225,7 +225,7 @@ class Easing { x2: number, y2: number ): (t: number) => number { - const _bezier = require('bezier'); + const _bezier = require('./bezier'); return _bezier(x1, y1, x2, y2); } diff --git a/Libraries/Animated/src/Interpolation.js b/Libraries/Animated/src/Interpolation.js index 6a28246ca73ff4..2956f6110a3dd1 100644 --- a/Libraries/Animated/src/Interpolation.js +++ b/Libraries/Animated/src/Interpolation.js @@ -13,7 +13,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); -var normalizeColor = require('normalizeColor'); +var normalizeColor = require('../../StyleSheet/normalizeColor'); type ExtrapolateType = 'extend' | 'identity' | 'clamp'; diff --git a/Libraries/Animated/src/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js index 72c22ef63af1c8..8f6dfee047dbe1 100644 --- a/Libraries/Animated/src/NativeAnimatedHelper.js +++ b/Libraries/Animated/src/NativeAnimatedHelper.js @@ -11,8 +11,8 @@ */ 'use strict'; -const NativeAnimatedModule = require('NativeModules').NativeAnimatedModule; -const NativeEventEmitter = require('NativeEventEmitter'); +const NativeAnimatedModule = require('../../BatchedBridge/NativeModules').NativeAnimatedModule; +const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js index d839bc3e7ef312..ac548093a26070 100644 --- a/Libraries/Animated/src/__tests__/Animated-test.js +++ b/Libraries/Animated/src/__tests__/Animated-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var Animated = require('Animated'); +var Animated = require('../Animated'); describe('Animated tests', () => { beforeEach(() => { jest.resetModules(); @@ -560,13 +560,13 @@ describe('Animated tests', () => { var InteractionManager; beforeEach(() => { - jest.mock('InteractionManager'); - Animated = require('Animated'); - InteractionManager = require('InteractionManager'); + jest.mock('../../../Interaction/InteractionManager'); + Animated = require('../Animated'); + InteractionManager = require('../../../Interaction/InteractionManager'); }); afterEach(()=> { - jest.unmock('InteractionManager'); + jest.unmock('../../../Interaction/InteractionManager'); }); it('registers an interaction by default', () => { diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js index 28a32c89ec4b3c..4a6fe9c2df2360 100644 --- a/Libraries/Animated/src/__tests__/AnimatedNative-test.js +++ b/Libraries/Animated/src/__tests__/AnimatedNative-test.js @@ -9,19 +9,19 @@ 'use strict'; jest - .setMock('Text', {}) - .setMock('View', {}) - .setMock('Image', {}) - .setMock('React', {Component: class {}}) - .setMock('NativeModules', { + .setMock('../../../Text/Text', {}) + .setMock('../../../Components/View/View', {}) + .setMock('../../../Image/Image', {}) + .setMock('../../../react-native/React', {Component: class {}}) + .setMock('../../../BatchedBridge/NativeModules', { NativeAnimatedModule: {}, }) - .mock('NativeEventEmitter') + .mock('../../../EventEmitter/NativeEventEmitter') // findNodeHandle is imported from ReactNative so mock that whole module. - .setMock('ReactNative', {findNodeHandle: () => 1}); + .setMock('../../../Renderer/shims/ReactNative', {findNodeHandle: () => 1}); -const Animated = require('Animated'); -const NativeAnimatedHelper = require('NativeAnimatedHelper'); +const Animated = require('../Animated'); +const NativeAnimatedHelper = require('../NativeAnimatedHelper'); function createAndMountComponent(ComponentClass, props) { const component = new ComponentClass(); @@ -35,7 +35,7 @@ function createAndMountComponent(ComponentClass, props) { describe('Native Animated', () => { - const nativeAnimatedModule = require('NativeModules').NativeAnimatedModule; + const nativeAnimatedModule = require('../../../BatchedBridge/NativeModules').NativeAnimatedModule; beforeEach(() => { nativeAnimatedModule.addAnimatedEventToView = jest.fn(); diff --git a/Libraries/Animated/src/__tests__/Easing-test.js b/Libraries/Animated/src/__tests__/Easing-test.js index aedc168e9eebff..ba4dd74812af06 100644 --- a/Libraries/Animated/src/__tests__/Easing-test.js +++ b/Libraries/Animated/src/__tests__/Easing-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var Easing = require('Easing'); +var Easing = require('../Easing'); describe('Easing', () => { it('should work with linear', () => { var easing = Easing.linear; diff --git a/Libraries/Animated/src/__tests__/Interpolation-test.js b/Libraries/Animated/src/__tests__/Interpolation-test.js index 442592bd8f608b..e7ce839f4e65c2 100644 --- a/Libraries/Animated/src/__tests__/Interpolation-test.js +++ b/Libraries/Animated/src/__tests__/Interpolation-test.js @@ -8,8 +8,8 @@ */ 'use strict'; -var Interpolation = require('Interpolation'); -var Easing = require('Easing'); +var Interpolation = require('../Interpolation'); +var Easing = require('../Easing'); describe('Interpolation', () => { it('should work with defaults', () => { diff --git a/Libraries/Animated/src/__tests__/bezier-test.js b/Libraries/Animated/src/__tests__/bezier-test.js index 59cf7895cebf17..53d854f7b64b8a 100644 --- a/Libraries/Animated/src/__tests__/bezier-test.js +++ b/Libraries/Animated/src/__tests__/bezier-test.js @@ -10,7 +10,7 @@ 'use strict'; -var bezier = require('bezier'); +var bezier = require('../bezier'); var identity = function (x) { return x; }; diff --git a/Libraries/AppState/AppState.js b/Libraries/AppState/AppState.js index 365b6a58b06774..a73d93d846e9a1 100644 --- a/Libraries/AppState/AppState.js +++ b/Libraries/AppState/AppState.js @@ -11,12 +11,12 @@ */ 'use strict'; -const MissingNativeEventEmitterShim = require('MissingNativeEventEmitterShim'); -const NativeEventEmitter = require('NativeEventEmitter'); -const NativeModules = require('NativeModules'); +const MissingNativeEventEmitterShim = require('../EventEmitter/MissingNativeEventEmitterShim'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const NativeModules = require('../BatchedBridge/NativeModules'); const RCTAppState = NativeModules.AppState; -const logError = require('logError'); +const logError = require('../Utilities/logError'); const invariant = require('fbjs/lib/invariant'); /** diff --git a/Libraries/BatchedBridge/BatchedBridge.js b/Libraries/BatchedBridge/BatchedBridge.js index d4c75e682ec39a..83613ccbfef23d 100644 --- a/Libraries/BatchedBridge/BatchedBridge.js +++ b/Libraries/BatchedBridge/BatchedBridge.js @@ -12,7 +12,7 @@ */ 'use strict'; -const MessageQueue = require('MessageQueue'); +const MessageQueue = require('./MessageQueue'); const BatchedBridge = new MessageQueue(); diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js index 9acf4a91f6fe4f..b6c4d1f3d0da52 100644 --- a/Libraries/BatchedBridge/MessageQueue.js +++ b/Libraries/BatchedBridge/MessageQueue.js @@ -15,12 +15,12 @@ 'use strict'; -const ErrorUtils = require('ErrorUtils'); -const Systrace = require('Systrace'); +const ErrorUtils = require('../vendor/core/ErrorUtils'); +const Systrace = require('../Performance/Systrace'); -const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); +const deepFreezeAndThrowOnMutationInDev = require('../Utilities/deepFreezeAndThrowOnMutationInDev'); const invariant = require('fbjs/lib/invariant'); -const stringifySafe = require('stringifySafe'); +const stringifySafe = require('../Utilities/stringifySafe'); export type SpyData = { type: number, @@ -277,7 +277,7 @@ class MessageQueue { __callImmediates() { Systrace.beginEvent('JSTimers.callImmediates()'); if (!JSTimers) { - JSTimers = require('JSTimers'); + JSTimers = require('../Core/Timers/JSTimers'); } JSTimers.callImmediates(); Systrace.endEvent(); diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js index c943c88e2af7a9..3f0a78aea3b935 100644 --- a/Libraries/BatchedBridge/NativeModules.js +++ b/Libraries/BatchedBridge/NativeModules.js @@ -11,7 +11,7 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); +const BatchedBridge = require('./BatchedBridge'); const invariant = require('fbjs/lib/invariant'); @@ -126,7 +126,7 @@ if (global.nativeModuleProxy) { const bridgeConfig = global.__fbBatchedBridgeConfig; invariant(bridgeConfig, '__fbBatchedBridgeConfig is not set, cannot invoke native modules'); - const defineLazyObjectProperty = require('defineLazyObjectProperty'); + const defineLazyObjectProperty = require('../Utilities/defineLazyObjectProperty'); (bridgeConfig.remoteModuleConfig || []).forEach((config: ModuleConfig, moduleID: number) => { // Initially this config will only contain the module name when running in JSC. The actual // configuration of the module will be lazily loaded. diff --git a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js index d9cd5a4e358a88..37d494f1cc0626 100644 --- a/Libraries/BatchedBridge/__tests__/MessageQueue-test.js +++ b/Libraries/BatchedBridge/__tests__/MessageQueue-test.js @@ -32,7 +32,7 @@ const assertQueue = (flushedQueue, index, moduleID, methodID, params) => { describe('MessageQueue', function() { beforeEach(function() { jest.resetModules(); - MessageQueue = require('MessageQueue'); + MessageQueue = require('../MessageQueue'); MessageQueueTestModule = require('MessageQueueTestModule'); queue = new MessageQueue(); queue.registerCallableModule( diff --git a/Libraries/BatchedBridge/__tests__/NativeModules-test.js b/Libraries/BatchedBridge/__tests__/NativeModules-test.js index 9385830efa8bcc..7ce0cba605f992 100644 --- a/Libraries/BatchedBridge/__tests__/NativeModules-test.js +++ b/Libraries/BatchedBridge/__tests__/NativeModules-test.js @@ -11,10 +11,10 @@ jest .enableAutomock() - .unmock('BatchedBridge') - .unmock('defineLazyObjectProperty') - .unmock('MessageQueue') - .unmock('NativeModules'); + .unmock('../BatchedBridge') + .unmock('../../Utilities/defineLazyObjectProperty') + .unmock('../MessageQueue') + .unmock('../NativeModules'); let BatchedBridge; let NativeModules; @@ -45,8 +45,8 @@ describe('MessageQueue', function() { jest.resetModules(); global.__fbBatchedBridgeConfig = require('MessageQueueTestConfig'); - BatchedBridge = require('BatchedBridge'); - NativeModules = require('NativeModules'); + BatchedBridge = require('../BatchedBridge'); + NativeModules = require('../NativeModules'); }); it('should generate native modules', () => { diff --git a/Libraries/Blob/Blob.js b/Libraries/Blob/Blob.js index 0180e15e2ab35c..7b8ec2af26513c 100644 --- a/Libraries/Blob/Blob.js +++ b/Libraries/Blob/Blob.js @@ -15,7 +15,7 @@ const invariant = require('fbjs/lib/invariant'); const uuid = require('uuid'); -const { BlobModule } = require('NativeModules'); +const { BlobModule } = require('../BatchedBridge/NativeModules'); import type { BlobProps } from 'BlobTypes'; diff --git a/Libraries/Blob/URL.js b/Libraries/Blob/URL.js index 7eac3d5206fcb1..2c5e03589ed4c9 100644 --- a/Libraries/Blob/URL.js +++ b/Libraries/Blob/URL.js @@ -12,9 +12,9 @@ 'use strict'; -const Blob = require('Blob'); +const Blob = require('./Blob'); -const { BlobModule } = require('NativeModules'); +const { BlobModule } = require('../BatchedBridge/NativeModules'); let BLOB_URL_PREFIX = null; diff --git a/Libraries/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js index 277f16b45e1186..a8d0b5e0ce1513 100644 --- a/Libraries/BugReporting/BugReporting.js +++ b/Libraries/BugReporting/BugReporting.js @@ -11,9 +11,9 @@ */ 'use strict'; -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); -const Map = require('Map'); -const infoLog = require('infoLog'); +const RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); +const Map = require('../vendor/core/Map'); +const infoLog = require('../Utilities/infoLog'); import type EmitterSubscription from 'EmitterSubscription'; @@ -22,7 +22,7 @@ type SourceCallback = () => string; type DebugData = { extras: ExtraData, files: ExtraData }; function defaultExtras() { - BugReporting.addFileSource('react_hierarchy.txt', () => require('dumpReactTree')()); + BugReporting.addFileSource('react_hierarchy.txt', () => require('./dumpReactTree')()); } /** @@ -93,7 +93,7 @@ class BugReporting { fileData[key] = callback(); } infoLog('BugReporting extraData:', extraData); - const BugReportingNativeModule = require('NativeModules').BugReporting; + const BugReportingNativeModule = require('../BatchedBridge/NativeModules').BugReporting; BugReportingNativeModule && BugReportingNativeModule.setExtraData && BugReportingNativeModule.setExtraData(extraData, fileData); diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js index 50487873545bd7..89b2327c91564b 100644 --- a/Libraries/CameraRoll/CameraRoll.js +++ b/Libraries/CameraRoll/CameraRoll.js @@ -14,9 +14,9 @@ const PropTypes = require('prop-types'); const {checkPropTypes} = PropTypes; -const RCTCameraRollManager = require('NativeModules').CameraRollManager; +const RCTCameraRollManager = require('../BatchedBridge/NativeModules').CameraRollManager; -const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); +const createStrictShapeTypeChecker = require('../Utilities/createStrictShapeTypeChecker'); const invariant = require('fbjs/lib/invariant'); const GROUP_TYPES_OPTIONS = { diff --git a/Libraries/CameraRoll/ImagePickerIOS.js b/Libraries/CameraRoll/ImagePickerIOS.js index a67884dc843571..53d10d2938cdcd 100644 --- a/Libraries/CameraRoll/ImagePickerIOS.js +++ b/Libraries/CameraRoll/ImagePickerIOS.js @@ -11,7 +11,7 @@ */ 'use strict'; -var RCTImagePicker = require('NativeModules').ImagePickerIOS; +var RCTImagePicker = require('../BatchedBridge/NativeModules').ImagePickerIOS; var ImagePickerIOS = { canRecordVideos: function(callback: Function) { diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js index 47afbe2a3ed36c..dcd144367cfcdf 100644 --- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js +++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js @@ -11,8 +11,8 @@ */ 'use strict'; -var NativeModules = require('NativeModules'); -var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +var NativeModules = require('../../BatchedBridge/NativeModules'); +var RCTDeviceEventEmitter = require('../../EventEmitter/RCTDeviceEventEmitter'); var RCTAccessibilityInfo = NativeModules.AccessibilityInfo; diff --git a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js index 65f7af70d17d26..421e87ce9b9d89 100644 --- a/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js +++ b/Libraries/Components/AccessibilityInfo/AccessibilityInfo.ios.js @@ -11,9 +11,9 @@ */ 'use strict'; -var NativeModules = require('NativeModules'); -var Promise = require('Promise'); -var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +var NativeModules = require('../../BatchedBridge/NativeModules'); +var Promise = require('../../Promise'); +var RCTDeviceEventEmitter = require('../../EventEmitter/RCTDeviceEventEmitter'); var AccessibilityManager = NativeModules.AccessibilityManager; diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js index 4cc7759e4d1499..680f792f9ae43d 100644 --- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js +++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js @@ -11,17 +11,17 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const NativeMethodsMixin = require('NativeMethodsMixin'); -const Platform = require('Platform'); -const React = require('React'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +const Platform = require('../../Utilities/Platform'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); const createReactClass = require('create-react-class'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); const GRAY = '#999999'; diff --git a/Libraries/Components/AppleTV/TVEventHandler.ios.js b/Libraries/Components/AppleTV/TVEventHandler.ios.js index c01f2b065a76fd..3bc3d46525e098 100644 --- a/Libraries/Components/AppleTV/TVEventHandler.ios.js +++ b/Libraries/Components/AppleTV/TVEventHandler.ios.js @@ -11,9 +11,9 @@ */ 'use strict'; -const React = require('React'); -const TVNavigationEventEmitter = require('NativeModules').TVNavigationEventEmitter; -const NativeEventEmitter = require('NativeEventEmitter'); +const React = require('../../react-native/React'); +const TVNavigationEventEmitter = require('../../BatchedBridge/NativeModules').TVNavigationEventEmitter; +const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter'); function TVEventHandler() { this.__nativeTVNavigationEventListener = null; diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js index 6e50e3920a6e07..30a2326bc9f2d1 100644 --- a/Libraries/Components/Button.js +++ b/Libraries/Components/Button.js @@ -11,15 +11,15 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const Platform = require('Platform'); -const React = require('React'); +const ColorPropType = require('../StyleSheet/ColorPropType'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TouchableNativeFeedback = require('TouchableNativeFeedback'); -const TouchableOpacity = require('TouchableOpacity'); -const View = require('View'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Text = require('../Text/Text'); +const TouchableNativeFeedback = require('./Touchable/TouchableNativeFeedback'); +const TouchableOpacity = require('./Touchable/TouchableOpacity'); +const View = require('./View/View'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Components/Clipboard/Clipboard.js b/Libraries/Components/Clipboard/Clipboard.js index ac8641c834701a..da0de9bac2539a 100644 --- a/Libraries/Components/Clipboard/Clipboard.js +++ b/Libraries/Components/Clipboard/Clipboard.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Clipboard = require('NativeModules').Clipboard; +const Clipboard = require('../../BatchedBridge/NativeModules').Clipboard; /** * `Clipboard` gives you an interface for setting and getting content from Clipboard on both iOS and Android diff --git a/Libraries/Components/DatePicker/DatePickerIOS.android.js b/Libraries/Components/DatePicker/DatePickerIOS.android.js index 9a2b2669711b4b..83ff7445831872 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.android.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.android.js @@ -11,10 +11,10 @@ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var Text = require('../../Text/Text'); +var View = require('../View/View'); class DummyDatePickerIOS extends React.Component { render() { diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js index 5ef82af2094bdd..a582c7e197e65c 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js @@ -13,15 +13,15 @@ */ 'use strict'; -const NativeMethodsMixin = require('NativeMethodsMixin'); -const React = require('React'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); const createReactClass = require('create-react-class'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); type DefaultProps = { mode: 'date' | 'time' | 'datetime', diff --git a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js index 11910ead0ad33c..60270ab9f740f6 100644 --- a/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js +++ b/Libraries/Components/DatePickerAndroid/DatePickerAndroid.android.js @@ -11,7 +11,7 @@ */ 'use strict'; -const DatePickerModule = require('NativeModules').DatePickerAndroid; +const DatePickerModule = require('../../BatchedBridge/NativeModules').DatePickerAndroid; /** * Convert a Date to a timestamp. diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js index 98e1f2a9317c70..0d686992974817 100644 --- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js +++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js @@ -10,23 +10,23 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var Platform = require('Platform'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var StatusBar = require('StatusBar'); -var StyleSheet = require('StyleSheet'); -var UIManager = require('UIManager'); -var View = require('View'); -var ViewPropTypes = require('ViewPropTypes'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var StatusBar = require('../StatusBar/StatusBar'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var UIManager = require('../../ReactNative/UIManager'); +var View = require('../View/View'); +var ViewPropTypes = require('../View/ViewPropTypes'); var DrawerConsts = UIManager.AndroidDrawerLayout.Constants; var createReactClass = require('create-react-class'); -var dismissKeyboard = require('dismissKeyboard'); -var requireNativeComponent = require('requireNativeComponent'); +var dismissKeyboard = require('../../Utilities/dismissKeyboard'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var RK_DRAWER_REF = 'drawerlayout'; var INNERVIEW_REF = 'innerView'; diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js index 6c0b34e3b59108..1ea94720e39300 100644 --- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js +++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.ios.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/Keyboard/Keyboard.js b/Libraries/Components/Keyboard/Keyboard.js index b990883ccc1876..951c5013f6f06e 100644 --- a/Libraries/Components/Keyboard/Keyboard.js +++ b/Libraries/Components/Keyboard/Keyboard.js @@ -12,9 +12,9 @@ 'use strict'; const invariant = require('fbjs/lib/invariant'); -const NativeEventEmitter = require('NativeEventEmitter'); -const KeyboardObserver = require('NativeModules').KeyboardObserver; -const dismissKeyboard = require('dismissKeyboard'); +const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter'); +const KeyboardObserver = require('../../BatchedBridge/NativeModules').KeyboardObserver; +const dismissKeyboard = require('../../Utilities/dismissKeyboard'); const KeyboardEventEmitter = new NativeEventEmitter(KeyboardObserver); type KeyboardEventName = diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js index c5afbbefbd3e1b..dc43b69e938506 100644 --- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js +++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js @@ -12,14 +12,14 @@ 'use strict'; const createReactClass = require('create-react-class'); -const Keyboard = require('Keyboard'); -const LayoutAnimation = require('LayoutAnimation'); -const Platform = require('Platform'); +const Keyboard = require('./Keyboard'); +const LayoutAnimation = require('../../LayoutAnimation/LayoutAnimation'); +const Platform = require('../../Utilities/Platform'); const PropTypes = require('prop-types'); -const React = require('React'); +const React = require('../../react-native/React'); const TimerMixin = require('react-timer-mixin'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); import type EmitterSubscription from 'EmitterSubscription'; import type {ViewLayout, ViewLayoutEvent} from 'ViewPropTypes'; diff --git a/Libraries/Components/LazyRenderer.js b/Libraries/Components/LazyRenderer.js index 2d2c225f52ab67..9fd214c434f903 100644 --- a/Libraries/Components/LazyRenderer.js +++ b/Libraries/Components/LazyRenderer.js @@ -10,7 +10,7 @@ */ 'use strict'; -var React = require('React'); +var React = require('../react-native/React'); var createReactClass = require('create-react-class'); var PropTypes = require('prop-types'); var TimerMixin = require('react-timer-mixin'); diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.android.js b/Libraries/Components/MaskedView/MaskedViewIOS.android.js index 57b4be358ff63c..078e45ff879695 100644 --- a/Libraries/Components/MaskedView/MaskedViewIOS.android.js +++ b/Libraries/Components/MaskedView/MaskedViewIOS.android.js @@ -11,4 +11,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js index 3a91efc23fc991..7f4734a5727601 100644 --- a/Libraries/Components/MaskedView/MaskedViewIOS.ios.js +++ b/Libraries/Components/MaskedView/MaskedViewIOS.ios.js @@ -11,11 +11,11 @@ */ const PropTypes = require('prop-types'); -const React = require('React'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); -const requireNativeComponent = require('requireNativeComponent'); +const React = require('../../react-native/React'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); import type { ViewProps } from 'ViewPropTypes'; diff --git a/Libraries/Components/Navigation/NavigatorIOS.android.js b/Libraries/Components/Navigation/NavigatorIOS.android.js index 12699e09c6a9a6..76f792b74e0d17 100644 --- a/Libraries/Components/Navigation/NavigatorIOS.android.js +++ b/Libraries/Components/Navigation/NavigatorIOS.android.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js index 87daa4ffe3a4fe..7e1e80f81bf69d 100644 --- a/Libraries/Components/Navigation/NavigatorIOS.ios.js +++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js @@ -11,22 +11,22 @@ */ 'use strict'; -var EventEmitter = require('EventEmitter'); -var Image = require('Image'); -var RCTNavigatorManager = require('NativeModules').NavigatorManager; -var React = require('React'); +var EventEmitter = require('../../vendor/emitter/EventEmitter'); +var Image = require('../../Image/Image'); +var RCTNavigatorManager = require('../../BatchedBridge/NativeModules').NavigatorManager; +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var StaticContainer = require('StaticContainer.react'); -var StyleSheet = require('StyleSheet'); -var TVEventHandler = require('TVEventHandler'); -var View = require('View'); -var ViewPropTypes = require('ViewPropTypes'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var StaticContainer = require('../StaticContainer.react'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var TVEventHandler = require('../AppleTV/TVEventHandler'); +var View = require('../View/View'); +var ViewPropTypes = require('../View/ViewPropTypes'); var createReactClass = require('create-react-class'); var invariant = require('fbjs/lib/invariant'); -var logError = require('logError'); -var requireNativeComponent = require('requireNativeComponent'); +var logError = require('../../Utilities/logError'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); const keyMirror = require('fbjs/lib/keyMirror'); diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js index 39b2cdfb815709..dc6f7a8e243da1 100644 --- a/Libraries/Components/Picker/Picker.js +++ b/Libraries/Components/Picker/Picker.js @@ -12,17 +12,17 @@ 'use strict'; -var ColorPropType = require('ColorPropType'); -var PickerIOS = require('PickerIOS'); -var PickerAndroid = require('PickerAndroid'); -var Platform = require('Platform'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var PickerIOS = require('./PickerIOS'); +var PickerAndroid = require('./PickerAndroid'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); const PropTypes = require('prop-types'); -var StyleSheetPropType = require('StyleSheetPropType'); -var TextStylePropTypes = require('TextStylePropTypes'); -var UnimplementedView = require('UnimplementedView'); -const ViewPropTypes = require('ViewPropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); +var StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +var TextStylePropTypes = require('../../Text/TextStylePropTypes'); +var UnimplementedView = require('../UnimplementedViews/UnimplementedView'); +const ViewPropTypes = require('../View/ViewPropTypes'); +var ViewStylePropTypes = require('../View/ViewStylePropTypes'); var itemStylePropType = StyleSheetPropType(TextStylePropTypes); diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js index a21463683dee47..2d1065cde92499 100644 --- a/Libraries/Components/Picker/PickerAndroid.android.js +++ b/Libraries/Components/Picker/PickerAndroid.android.js @@ -12,16 +12,16 @@ 'use strict'; -var ColorPropType = require('ColorPropType'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var React = require('../../react-native/React'); var ReactPropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var StyleSheetPropType = require('StyleSheetPropType'); -const ViewPropTypes = require('ViewPropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +const ViewPropTypes = require('../View/ViewPropTypes'); +var ViewStylePropTypes = require('../View/ViewStylePropTypes'); -var processColor = require('processColor'); -var requireNativeComponent = require('requireNativeComponent'); +var processColor = require('../../StyleSheet/processColor'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var REF_PICKER = 'picker'; var MODE_DROPDOWN = 'dropdown'; diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Components/Picker/PickerAndroid.ios.js index fc589882864a71..a96aa243644ae3 100644 --- a/Libraries/Components/Picker/PickerAndroid.ios.js +++ b/Libraries/Components/Picker/PickerAndroid.ios.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/Picker/PickerIOS.android.js b/Libraries/Components/Picker/PickerIOS.android.js index 7c5b39112a9ecf..9edeb16a878062 100644 --- a/Libraries/Components/Picker/PickerIOS.android.js +++ b/Libraries/Components/Picker/PickerIOS.android.js @@ -12,4 +12,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js index 81911b4bc16143..b4310bd438aacc 100644 --- a/Libraries/Components/Picker/PickerIOS.ios.js +++ b/Libraries/Components/Picker/PickerIOS.ios.js @@ -12,19 +12,19 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); const PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var StyleSheetPropType = require('StyleSheetPropType'); -var TextStylePropTypes = require('TextStylePropTypes'); -var View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); -var processColor = require('processColor'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +var TextStylePropTypes = require('../../Text/TextStylePropTypes'); +var View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); +var processColor = require('../../StyleSheet/processColor'); var createReactClass = require('create-react-class'); var itemStylePropType = StyleSheetPropType(TextStylePropTypes); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var PickerIOS = createReactClass({ displayName: 'PickerIOS', diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js index 51b5896353eb32..a61e582de13994 100644 --- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js +++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js @@ -10,14 +10,14 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ViewPropTypes = require('ViewPropTypes'); -var ColorPropType = require('ColorPropType'); +var ViewPropTypes = require('../View/ViewPropTypes'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var STYLE_ATTRIBUTES = [ 'Horizontal', diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js index 99f01c81f36c20..29c21b3469f6eb 100644 --- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js +++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.ios.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js index d4a7da54aa98ec..6bc3088019f9be 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.android.js @@ -12,10 +12,10 @@ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var Text = require('../../Text/Text'); +var View = require('../View/View'); class DummyProgressViewIOS extends React.Component { render() { diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js index 0b6c4f3ee4125d..ca655f72e7d3d0 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js @@ -11,15 +11,15 @@ */ 'use strict'; -var Image = require('Image'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Image = require('../../Image/Image'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var ViewPropTypes = require('ViewPropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var ViewPropTypes = require('../View/ViewPropTypes'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); /** * Use `ProgressViewIOS` to render a UIProgressView on iOS. diff --git a/Libraries/Components/RefreshControl/RefreshControl.js b/Libraries/Components/RefreshControl/RefreshControl.js index 8323ca24bed50c..511847f8938790 100644 --- a/Libraries/Components/RefreshControl/RefreshControl.js +++ b/Libraries/Components/RefreshControl/RefreshControl.js @@ -11,18 +11,18 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const NativeMethodsMixin = require('NativeMethodsMixin'); -const Platform = require('Platform'); -const React = require('React'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +const Platform = require('../../Utilities/Platform'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -const ViewPropTypes = require('ViewPropTypes'); +const ViewPropTypes = require('../View/ViewPropTypes'); const createReactClass = require('create-react-class'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); if (Platform.OS === 'android') { - var RefreshLayoutConsts = require('UIManager').AndroidSwipeRefreshLayout.Constants; + var RefreshLayoutConsts = require('../../ReactNative/UIManager').AndroidSwipeRefreshLayout.Constants; } else { var RefreshLayoutConsts = {SIZE: {}}; } diff --git a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js index e5cd5b83ab7147..2d2e9c393d16a1 100644 --- a/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js +++ b/Libraries/Components/RefreshControl/__mocks__/RefreshControlMock.js @@ -10,9 +10,9 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../../react-native/React'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../../ReactNative/requireNativeComponent'); const RCTRefreshControl = requireNativeComponent('RCTRefreshControl'); diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js index 36f71422804243..7775d63a70a7f4 100644 --- a/Libraries/Components/ScrollResponder.js +++ b/Libraries/Components/ScrollResponder.js @@ -11,21 +11,21 @@ */ 'use strict'; -var Dimensions = require('Dimensions'); -var FrameRateLogger = require('FrameRateLogger'); -var Keyboard = require('Keyboard'); -var ReactNative = require('ReactNative'); -var Subscribable = require('Subscribable'); -var TextInputState = require('TextInputState'); -var UIManager = require('UIManager'); +var Dimensions = require('../Utilities/Dimensions'); +var FrameRateLogger = require('../Interaction/FrameRateLogger'); +var Keyboard = require('./Keyboard/Keyboard'); +var ReactNative = require('../Renderer/shims/ReactNative'); +var Subscribable = require('./Subscribable'); +var TextInputState = require('./TextInput/TextInputState'); +var UIManager = require('../ReactNative/UIManager'); var invariant = require('fbjs/lib/invariant'); var nullthrows = require('fbjs/lib/nullthrows'); var performanceNow = require('fbjs/lib/performanceNow'); var warning = require('fbjs/lib/warning'); -var { ScrollViewManager } = require('NativeModules'); -var { getInstanceFromNode } = require('ReactNativeComponentTree'); +var { ScrollViewManager } = require('../BatchedBridge/NativeModules'); +var { getInstanceFromNode } = require('../Renderer/shims/ReactNativeComponentTree'); /** * Mixin that can be integrated in order to handle scrolling that plays well diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index 0d668a8eab6d48..2ff77e6c5b935b 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -11,28 +11,28 @@ */ 'use strict'; -const Animated = require('Animated'); -const ColorPropType = require('ColorPropType'); -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const Platform = require('Platform'); -const PointPropType = require('PointPropType'); +const Animated = require('../../Animated/src/Animated'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +const Platform = require('../../Utilities/Platform'); +const PointPropType = require('../../StyleSheet/PointPropType'); const PropTypes = require('prop-types'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const ScrollResponder = require('ScrollResponder'); -const ScrollViewStickyHeader = require('ScrollViewStickyHeader'); -const StyleSheet = require('StyleSheet'); -const StyleSheetPropType = require('StyleSheetPropType'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); -const ViewStylePropTypes = require('ViewStylePropTypes'); +const React = require('../../react-native/React'); +const ReactNative = require('../../Renderer/shims/ReactNative'); +const ScrollResponder = require('../ScrollResponder'); +const ScrollViewStickyHeader = require('./ScrollViewStickyHeader'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); +const ViewStylePropTypes = require('../View/ViewStylePropTypes'); const createReactClass = require('create-react-class'); -const dismissKeyboard = require('dismissKeyboard'); -const flattenStyle = require('flattenStyle'); +const dismissKeyboard = require('../../Utilities/dismissKeyboard'); +const flattenStyle = require('../../StyleSheet/flattenStyle'); const invariant = require('fbjs/lib/invariant'); -const processDecelerationRate = require('processDecelerationRate'); -const requireNativeComponent = require('requireNativeComponent'); +const processDecelerationRate = require('./processDecelerationRate'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); const warning = require('fbjs/lib/warning'); import type {NativeMethodsMixinType} from 'ReactNativeTypes'; diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js index b072a67c6bf0fb..c152b6934aad37 100644 --- a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js +++ b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js @@ -11,9 +11,9 @@ */ 'use strict'; -const Animated = require('Animated'); -const React = require('React'); -const StyleSheet = require('StyleSheet'); +const Animated = require('../../Animated/src/Animated'); +const React = require('../../react-native/React'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); type Props = { children?: React.Element<*>, diff --git a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js index b8e77a80770675..5d02921ae44335 100644 --- a/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js +++ b/Libraries/Components/ScrollView/__mocks__/ScrollViewMock.js @@ -10,10 +10,10 @@ */ 'use strict'; -const React = require('React'); -const View = require('View'); +const React = require('../../../react-native/React'); +const View = require('../../View/View'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../../ReactNative/requireNativeComponent'); const RCTScrollView = requireNativeComponent('RCTScrollView'); diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js index 15ac90078588dd..42fa4430df737f 100644 --- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js +++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js @@ -12,10 +12,10 @@ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var Text = require('../../Text/Text'); +var View = require('../View/View'); class DummySegmentedControlIOS extends React.Component { render() { diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js index ba0c52ebbc0e9f..80e3ab95af6063 100644 --- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js +++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js @@ -11,14 +11,14 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var ViewPropTypes = require('ViewPropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var ViewPropTypes = require('../View/ViewPropTypes'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); type DefaultProps = { values: Array, diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js index 712100bffaa611..f7abf6e2f5e804 100644 --- a/Libraries/Components/Slider/Slider.js +++ b/Libraries/Components/Slider/Slider.js @@ -11,18 +11,18 @@ */ 'use strict'; -var Image = require('Image'); -var ColorPropType = require('ColorPropType'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -var Platform = require('Platform'); -var React = require('React'); +var Image = require('../../Image/Image'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var ReactNativeViewAttributes = require('../View/ReactNativeViewAttributes'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var ViewPropTypes = require('ViewPropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var ViewPropTypes = require('../View/ViewPropTypes'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); type Event = Object; diff --git a/Libraries/Components/StaticContainer.react.js b/Libraries/Components/StaticContainer.react.js index a29593ae49136b..fbce02ea07ae07 100644 --- a/Libraries/Components/StaticContainer.react.js +++ b/Libraries/Components/StaticContainer.react.js @@ -11,7 +11,7 @@ */ 'use strict'; -const React = require('React'); +const React = require('../react-native/React'); /** * Renders static content efficiently by allowing React to short-circuit the diff --git a/Libraries/Components/StaticRenderer.js b/Libraries/Components/StaticRenderer.js index afea94ebc3fc12..153b145c72727b 100644 --- a/Libraries/Components/StaticRenderer.js +++ b/Libraries/Components/StaticRenderer.js @@ -11,7 +11,7 @@ */ 'use strict'; -var React = require('React'); +var React = require('../react-native/React'); var PropTypes = require('prop-types'); diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js index b2f52d11ec1de0..66998f49a5d7ce 100644 --- a/Libraries/Components/StatusBar/StatusBar.js +++ b/Libraries/Components/StatusBar/StatusBar.js @@ -11,14 +11,14 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -const ColorPropType = require('ColorPropType'); -const Platform = require('Platform'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const Platform = require('../../Utilities/Platform'); -const processColor = require('processColor'); +const processColor = require('../../StyleSheet/processColor'); -const StatusBarManager = require('NativeModules').StatusBarManager; +const StatusBarManager = require('../../BatchedBridge/NativeModules').StatusBarManager; /** * Status bar style diff --git a/Libraries/Components/StatusBar/StatusBarIOS.android.js b/Libraries/Components/StatusBar/StatusBarIOS.android.js index 2be8f34eaf5fb5..ce356b7e837737 100644 --- a/Libraries/Components/StatusBar/StatusBarIOS.android.js +++ b/Libraries/Components/StatusBar/StatusBarIOS.android.js @@ -11,6 +11,6 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); +const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter'); module.exports = new NativeEventEmitter('StatusBarManager'); diff --git a/Libraries/Components/StatusBar/StatusBarIOS.ios.js b/Libraries/Components/StatusBar/StatusBarIOS.ios.js index a3aceaac7e0988..3aeba8d6eca450 100644 --- a/Libraries/Components/StatusBar/StatusBarIOS.ios.js +++ b/Libraries/Components/StatusBar/StatusBarIOS.ios.js @@ -11,8 +11,8 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const { StatusBarManager } = require('NativeModules'); +const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter'); +const { StatusBarManager } = require('../../BatchedBridge/NativeModules'); /** * Use `StatusBar` for mutating the status bar. diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js index e7b456af98ed9f..4ccaaa137e156c 100644 --- a/Libraries/Components/Switch/Switch.js +++ b/Libraries/Components/Switch/Switch.js @@ -11,16 +11,16 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var Platform = require('Platform'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); const PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -const ViewPropTypes = require('ViewPropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +const ViewPropTypes = require('../View/ViewPropTypes'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); type DefaultProps = { value: boolean, diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.android.js b/Libraries/Components/TabBarIOS/TabBarIOS.android.js index d9efee3ff322b1..d2db4f8d064da7 100644 --- a/Libraries/Components/TabBarIOS/TabBarIOS.android.js +++ b/Libraries/Components/TabBarIOS/TabBarIOS.android.js @@ -12,10 +12,10 @@ 'use strict'; -const React = require('React'); -const StyleSheet = require('StyleSheet'); -const TabBarItemIOS = require('TabBarItemIOS'); -const View = require('View'); +const React = require('../../react-native/React'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const TabBarItemIOS = require('./TabBarItemIOS'); +const View = require('../View/View'); class DummyTabBarIOS extends React.Component { static Item = TabBarItemIOS; diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js index 10f0c028af8eaf..5353378c00bf5a 100644 --- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js +++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js @@ -11,14 +11,14 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var React = require('../../react-native/React'); const PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var TabBarItemIOS = require('TabBarItemIOS'); -const ViewPropTypes = require('ViewPropTypes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var TabBarItemIOS = require('./TabBarItemIOS'); +const ViewPropTypes = require('../View/ViewPropTypes'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); class TabBarIOS extends React.Component { props: { diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js index 43cf6d429e0bfa..ece0603dd8dda9 100644 --- a/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js +++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.android.js @@ -11,9 +11,9 @@ 'use strict'; -var React = require('React'); -var View = require('View'); -var StyleSheet = require('StyleSheet'); +var React = require('../../react-native/React'); +var View = require('../View/View'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); class DummyTab extends React.Component { render() { diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js index 215c4f27edbcda..fd7338397f97d3 100644 --- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js +++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js @@ -11,17 +11,17 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var Image = require('Image'); -var React = require('React'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var Image = require('../../Image/Image'); +var React = require('../../react-native/React'); const PropTypes = require('prop-types'); -var StaticContainer = require('StaticContainer.react'); -var StyleSheet = require('StyleSheet'); -var View = require('View'); +var StaticContainer = require('../StaticContainer.react'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var View = require('../View/View'); -const ViewPropTypes = require('ViewPropTypes'); +const ViewPropTypes = require('../View/ViewPropTypes'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); class TabBarItemIOS extends React.Component { static propTypes = { diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js index 1ef2d9b2f7a28b..f4d6ba7b848734 100644 --- a/Libraries/Components/TextInput/TextInput.js +++ b/Libraries/Components/TextInput/TextInput.js @@ -11,26 +11,26 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const DocumentSelectionState = require('DocumentSelectionState'); -const EventEmitter = require('EventEmitter'); -const NativeMethodsMixin = require('NativeMethodsMixin'); -const Platform = require('Platform'); -const React = require('React'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const DocumentSelectionState = require('../../vendor/document/selection/DocumentSelectionState'); +const EventEmitter = require('../../vendor/emitter/EventEmitter'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +const Platform = require('../../Utilities/Platform'); +const React = require('../../react-native/React'); const createReactClass = require('create-react-class'); const PropTypes = require('prop-types'); -const ReactNative = require('ReactNative'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TextInputState = require('TextInputState'); +const ReactNative = require('../../Renderer/shims/ReactNative'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const Text = require('../../Text/Text'); +const TextInputState = require('./TextInputState'); const TimerMixin = require('react-timer-mixin'); -const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -const UIManager = require('UIManager'); -const ViewPropTypes = require('ViewPropTypes'); +const TouchableWithoutFeedback = require('../Touchable/TouchableWithoutFeedback'); +const UIManager = require('../../ReactNative/UIManager'); +const ViewPropTypes = require('../View/ViewPropTypes'); const emptyFunction = require('fbjs/lib/emptyFunction'); const invariant = require('fbjs/lib/invariant'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); const warning = require('fbjs/lib/warning'); const onlyMultiline = { diff --git a/Libraries/Components/TextInput/TextInputState.js b/Libraries/Components/TextInput/TextInputState.js index 7d17fe639352d6..d6db0db0ca7094 100644 --- a/Libraries/Components/TextInput/TextInputState.js +++ b/Libraries/Components/TextInput/TextInputState.js @@ -15,8 +15,8 @@ */ 'use strict'; -var Platform = require('Platform'); -var UIManager = require('UIManager'); +var Platform = require('../../Utilities/Platform'); +var UIManager = require('../../ReactNative/UIManager'); var TextInputState = { /** diff --git a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js index e1e3f7550d4823..be0997c01cf819 100644 --- a/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js +++ b/Libraries/Components/TimePickerAndroid/TimePickerAndroid.android.js @@ -11,7 +11,7 @@ */ 'use strict'; -const TimePickerModule = require('NativeModules').TimePickerAndroid; +const TimePickerModule = require('../../BatchedBridge/NativeModules').TimePickerAndroid; /** * Opens the standard Android time picker dialog. diff --git a/Libraries/Components/ToastAndroid/ToastAndroid.android.js b/Libraries/Components/ToastAndroid/ToastAndroid.android.js index 36899ca30f5548..88935f04afefea 100644 --- a/Libraries/Components/ToastAndroid/ToastAndroid.android.js +++ b/Libraries/Components/ToastAndroid/ToastAndroid.android.js @@ -11,7 +11,7 @@ 'use strict'; -var RCTToastAndroid = require('NativeModules').ToastAndroid; +var RCTToastAndroid = require('../../BatchedBridge/NativeModules').ToastAndroid; /** * This exposes the native ToastAndroid module as a JS module. This has a function 'show' diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js index 85435eaea6bfa4..5c3881013a7878 100644 --- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js +++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js @@ -11,18 +11,18 @@ 'use strict'; -var Image = require('Image'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Image = require('../../Image/Image'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -var UIManager = require('UIManager'); -var ViewPropTypes = require('ViewPropTypes'); -var ColorPropType = require('ColorPropType'); +var ReactNativeViewAttributes = require('../View/ReactNativeViewAttributes'); +var UIManager = require('../../ReactNative/UIManager'); +var ViewPropTypes = require('../View/ViewPropTypes'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); var createReactClass = require('create-react-class'); -var requireNativeComponent = require('requireNativeComponent'); -var resolveAssetSource = require('resolveAssetSource'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); +var resolveAssetSource = require('../../Image/resolveAssetSource'); var optionalImageSource = PropTypes.oneOfType([ Image.propTypes.source, diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js index 28a8901ff890fd..5a9c264f23d9f0 100644 --- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js +++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.ios.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/Touchable/BoundingDimensions.js b/Libraries/Components/Touchable/BoundingDimensions.js index a5877717b6b651..de2c6a02c4a937 100644 --- a/Libraries/Components/Touchable/BoundingDimensions.js +++ b/Libraries/Components/Touchable/BoundingDimensions.js @@ -11,7 +11,7 @@ 'use strict'; -var PooledClass = require('PooledClass'); +var PooledClass = require('../../Renderer/shims/PooledClass'); var twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js index 77dd3ad11b81e9..1bebe3d4c41bb7 100644 --- a/Libraries/Components/Touchable/Position.js +++ b/Libraries/Components/Touchable/Position.js @@ -11,7 +11,7 @@ 'use strict'; -var PooledClass = require('PooledClass'); +var PooledClass = require('../../Renderer/shims/PooledClass'); var twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js index e8f925e90d5b11..9936a900bea6d1 100644 --- a/Libraries/Components/Touchable/Touchable.js +++ b/Libraries/Components/Touchable/Touchable.js @@ -11,18 +11,18 @@ 'use strict'; -const BoundingDimensions = require('BoundingDimensions'); -const Platform = require('Platform'); -const Position = require('Position'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const TVEventHandler = require('TVEventHandler'); +const BoundingDimensions = require('./BoundingDimensions'); +const Platform = require('../../Utilities/Platform'); +const Position = require('./Position'); +const React = require('../../react-native/React'); +const ReactNative = require('../../Renderer/shims/ReactNative'); +const TVEventHandler = require('../AppleTV/TVEventHandler'); const TouchEventUtils = require('fbjs/lib/TouchEventUtils'); -const UIManager = require('UIManager'); -const View = require('View'); +const UIManager = require('../../ReactNative/UIManager'); +const View = require('../View/View'); const keyMirror = require('fbjs/lib/keyMirror'); -const normalizeColor = require('normalizeColor'); +const normalizeColor = require('../../StyleSheet/normalizeColor'); /** * `Touchable`: Taps done right. diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js index 775c41e284eb2b..ee3e81008b22ea 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -11,13 +11,13 @@ */ 'use strict'; -var Animated = require('Animated'); -var EdgeInsetsPropType = require('EdgeInsetsPropType'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Animated = require('../../Animated/src/Animated'); +var EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var createReactClass = require('create-react-class'); var PropTypes = require('prop-types'); -var Touchable = require('Touchable'); +var Touchable = require('./Touchable'); type Event = Object; diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js index 19e6012474ef09..ffe4344e5012d8 100644 --- a/Libraries/Components/Touchable/TouchableHighlight.js +++ b/Libraries/Components/Touchable/TouchableHighlight.js @@ -11,23 +11,23 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const NativeMethodsMixin = require('NativeMethodsMixin'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); const PropTypes = require('prop-types'); -const React = require('React'); -const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -const StyleSheet = require('StyleSheet'); +const React = require('../../react-native/React'); +const ReactNativeViewAttributes = require('../View/ReactNativeViewAttributes'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); const TimerMixin = require('react-timer-mixin'); -const Touchable = require('Touchable'); -const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +const Touchable = require('./Touchable'); +const TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); +const View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); const createReactClass = require('create-react-class'); -const ensureComponentIsNative = require('ensureComponentIsNative'); -const ensurePositiveDelayProps = require('ensurePositiveDelayProps'); +const ensureComponentIsNative = require('./ensureComponentIsNative'); +const ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); const keyOf = require('fbjs/lib/keyOf'); -const merge = require('merge'); +const merge = require('../../vendor/core/merge'); import type {Event} from 'TouchableWithoutFeedback'; diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js index 7436dd234278ee..20d327c1f74e27 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js @@ -10,17 +10,17 @@ */ 'use strict'; -var Platform = require('Platform'); -var React = require('React'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var Touchable = require('Touchable'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -var UIManager = require('UIManager'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var Touchable = require('./Touchable'); +var TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); +var UIManager = require('../../ReactNative/UIManager'); var createReactClass = require('create-react-class'); -var ensurePositiveDelayProps = require('ensurePositiveDelayProps'); -var processColor = require('processColor'); +var ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); +var processColor = require('../../StyleSheet/processColor'); var rippleBackgroundPropType = PropTypes.shape({ type: PropTypes.oneOf(['RippleAndroid']), diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js index 99abaa3a07055a..bf57fcb0649a1f 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.ios.js @@ -11,10 +11,10 @@ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var Text = require('../../Text/Text'); +var View = require('../View/View'); class DummyTouchableNativeFeedback extends React.Component { render() { diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js index 72735325e16560..756a400cb143ed 100644 --- a/Libraries/Components/Touchable/TouchableOpacity.js +++ b/Libraries/Components/Touchable/TouchableOpacity.js @@ -13,18 +13,18 @@ // Note (avik): add @flow when Flow supports spread properties in propTypes -var Animated = require('Animated'); -var Easing = require('Easing'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Animated = require('../../Animated/src/Animated'); +var Easing = require('../../Animated/src/Easing'); +var NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); var TimerMixin = require('react-timer-mixin'); -var Touchable = require('Touchable'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); +var Touchable = require('./Touchable'); +var TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); var createReactClass = require('create-react-class'); -var ensurePositiveDelayProps = require('ensurePositiveDelayProps'); -var flattenStyle = require('flattenStyle'); +var ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); +var flattenStyle = require('../../StyleSheet/flattenStyle'); type Event = Object; diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js index 8e8fbb00eee9cd..b80aae67f611ff 100755 --- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js +++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js @@ -11,20 +11,20 @@ */ 'use strict'; -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const React = require('React'); +const EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); const TimerMixin = require('react-timer-mixin'); -const Touchable = require('Touchable'); +const Touchable = require('./Touchable'); const createReactClass = require('create-react-class'); -const ensurePositiveDelayProps = require('ensurePositiveDelayProps'); +const ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); const warning = require('fbjs/lib/warning'); const { AccessibilityComponentTypes, AccessibilityTraits, -} = require('ViewAccessibility'); +} = require('../View/ViewAccessibility'); export type Event = Object; diff --git a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js index 857e9a3d1e87d1..7eac8220609c7b 100644 --- a/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js +++ b/Libraries/Components/Touchable/__tests__/TouchableHighlight-test.js @@ -8,10 +8,10 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../../react-native/React'); const ReactTestRenderer = require('react-test-renderer'); -const Text = require('Text'); -const TouchableHighlight = require('TouchableHighlight'); +const Text = require('../../../Text/Text'); +const TouchableHighlight = require('../TouchableHighlight'); describe('TouchableHighlight', () => { it('renders correctly', () => { diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js index ace85ac7fae4aa..eb0dbfd66c71f6 100644 --- a/Libraries/Components/UnimplementedViews/UnimplementedView.js +++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js @@ -12,8 +12,8 @@ */ 'use strict'; -const React = require('React'); -const StyleSheet = require('StyleSheet'); +const React = require('../../react-native/React'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); /** * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner @@ -28,7 +28,7 @@ class UnimplementedView extends React.Component { render() { // Workaround require cycle from requireNativeComponent - const View = require('View'); + const View = require('../View/View'); return ( {this.props.children} diff --git a/Libraries/Components/View/PlatformViewPropTypes.ios.js b/Libraries/Components/View/PlatformViewPropTypes.ios.js index 7957c7b4a90ecf..56a4c1549ea873 100644 --- a/Libraries/Components/View/PlatformViewPropTypes.ios.js +++ b/Libraries/Components/View/PlatformViewPropTypes.ios.js @@ -10,11 +10,11 @@ * @flow */ -const Platform = require('Platform'); +const Platform = require('../../Utilities/Platform'); var TVViewPropTypes = {}; if (Platform.isTVOS) { - TVViewPropTypes = require('TVViewPropTypes'); + TVViewPropTypes = require('../AppleTV/TVViewPropTypes'); } module.exports = TVViewPropTypes; diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js index fd26f3969958ea..1e4b552f585074 100644 --- a/Libraries/Components/View/ReactNativeStyleAttributes.js +++ b/Libraries/Components/View/ReactNativeStyleAttributes.js @@ -12,14 +12,14 @@ 'use strict'; -var ImageStylePropTypes = require('ImageStylePropTypes'); -var TextStylePropTypes = require('TextStylePropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); +var ImageStylePropTypes = require('../../Image/ImageStylePropTypes'); +var TextStylePropTypes = require('../../Text/TextStylePropTypes'); +var ViewStylePropTypes = require('./ViewStylePropTypes'); var keyMirror = require('fbjs/lib/keyMirror'); -var processColor = require('processColor'); -var processTransform = require('processTransform'); -var sizesDiffer = require('sizesDiffer'); +var processColor = require('../../StyleSheet/processColor'); +var processTransform = require('../../StyleSheet/processTransform'); +var sizesDiffer = require('../../Utilities/differ/sizesDiffer'); var ReactNativeStyleAttributes = { ...keyMirror(ViewStylePropTypes), diff --git a/Libraries/Components/View/ReactNativeViewAttributes.js b/Libraries/Components/View/ReactNativeViewAttributes.js index 3a769ca5ed7525..e2e2d4c1397cad 100644 --- a/Libraries/Components/View/ReactNativeViewAttributes.js +++ b/Libraries/Components/View/ReactNativeViewAttributes.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); +var ReactNativeStyleAttributes = require('./ReactNativeStyleAttributes'); var ReactNativeViewAttributes = {}; diff --git a/Libraries/Components/View/ShadowPropTypesIOS.js b/Libraries/Components/View/ShadowPropTypesIOS.js index 8bf7acbfe99f13..8e0e1ffe80b86d 100644 --- a/Libraries/Components/View/ShadowPropTypesIOS.js +++ b/Libraries/Components/View/ShadowPropTypesIOS.js @@ -12,7 +12,7 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); +const ColorPropType = require('../../StyleSheet/ColorPropType'); const ReactPropTypes = require('prop-types'); /** diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js index 206010569100f9..2249174f95c05b 100644 --- a/Libraries/Components/View/View.js +++ b/Libraries/Components/View/View.js @@ -11,17 +11,17 @@ */ 'use strict'; -const NativeMethodsMixin = require('NativeMethodsMixin'); -const Platform = require('Platform'); +const NativeMethodsMixin = require('../../Renderer/shims/NativeMethodsMixin'); +const Platform = require('../../Utilities/Platform'); const PropTypes = require('prop-types'); -const React = require('React'); -const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); -const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -const ViewPropTypes = require('ViewPropTypes'); +const React = require('../../react-native/React'); +const ReactNativeStyleAttributes = require('./ReactNativeStyleAttributes'); +const ReactNativeViewAttributes = require('./ReactNativeViewAttributes'); +const ViewPropTypes = require('./ViewPropTypes'); const createReactClass = require('create-react-class'); const invariant = require('fbjs/lib/invariant'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); import type {ViewProps} from 'ViewPropTypes'; @@ -122,7 +122,7 @@ const RCTView = requireNativeComponent('RCTView', View, { }); if (__DEV__) { - const UIManager = require('UIManager'); + const UIManager = require('../../ReactNative/UIManager'); const viewConfig = UIManager.viewConfigs && UIManager.viewConfigs.RCTView || {}; for (const prop in viewConfig.nativeProps) { const viewAny: any = View; // Appease flow diff --git a/Libraries/Components/View/ViewPropTypes.js b/Libraries/Components/View/ViewPropTypes.js index 30cfc2020083d9..795abf91e88352 100644 --- a/Libraries/Components/View/ViewPropTypes.js +++ b/Libraries/Components/View/ViewPropTypes.js @@ -11,16 +11,16 @@ */ 'use strict'; -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const PlatformViewPropTypes = require('PlatformViewPropTypes'); +const EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +const PlatformViewPropTypes = require('./PlatformViewPropTypes'); const PropTypes = require('prop-types'); -const StyleSheetPropType = require('StyleSheetPropType'); -const ViewStylePropTypes = require('ViewStylePropTypes'); +const StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +const ViewStylePropTypes = require('./ViewStylePropTypes'); const { AccessibilityComponentTypes, AccessibilityTraits, -} = require('ViewAccessibility'); +} = require('./ViewAccessibility'); import type { AccessibilityComponentType, diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js index 49fff29d81883d..111894b4beb563 100644 --- a/Libraries/Components/View/ViewStylePropTypes.js +++ b/Libraries/Components/View/ViewStylePropTypes.js @@ -11,11 +11,11 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var LayoutPropTypes = require('LayoutPropTypes'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var LayoutPropTypes = require('../../StyleSheet/LayoutPropTypes'); var ReactPropTypes = require('prop-types'); -var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); -var TransformPropTypes = require('TransformPropTypes'); +var ShadowPropTypesIOS = require('./ShadowPropTypesIOS'); +var TransformPropTypes = require('../../StyleSheet/TransformPropTypes'); /** * Warning: Some of these properties may not be supported in all releases. diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js index 084b40f2fc5ca8..f650e8a83b31a6 100644 --- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js +++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js @@ -11,14 +11,14 @@ */ 'use strict'; -var React = require('React'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var UIManager = require('UIManager'); -var ViewPropTypes = require('ViewPropTypes'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var UIManager = require('../../ReactNative/UIManager'); +var ViewPropTypes = require('../View/ViewPropTypes'); -var dismissKeyboard = require('dismissKeyboard'); -var requireNativeComponent = require('requireNativeComponent'); +var dismissKeyboard = require('../../Utilities/dismissKeyboard'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var VIEWPAGER_REF = 'viewPager'; diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js index 35d4196b489037..77a8fe321c657a 100644 --- a/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js +++ b/Libraries/Components/ViewPager/ViewPagerAndroid.ios.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../UnimplementedViews/UnimplementedView'); diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js index 1735adf631fbae..c3e795958d06ab 100644 --- a/Libraries/Components/WebView/WebView.android.js +++ b/Libraries/Components/WebView/WebView.android.js @@ -10,20 +10,20 @@ */ 'use strict'; -var EdgeInsetsPropType = require('EdgeInsetsPropType'); -var ActivityIndicator = require('ActivityIndicator'); -var React = require('React'); +var EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +var ActivityIndicator = require('../ActivityIndicator/ActivityIndicator'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var StyleSheet = require('StyleSheet'); -var UIManager = require('UIManager'); -var View = require('View'); -var ViewPropTypes = require('ViewPropTypes'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var UIManager = require('../../ReactNative/UIManager'); +var View = require('../View/View'); +var ViewPropTypes = require('../View/ViewPropTypes'); -var deprecatedPropType = require('deprecatedPropType'); +var deprecatedPropType = require('../../Utilities/deprecatedPropType'); var keyMirror = require('fbjs/lib/keyMirror'); -var requireNativeComponent = require('requireNativeComponent'); -var resolveAssetSource = require('resolveAssetSource'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); +var resolveAssetSource = require('../../Image/resolveAssetSource'); var RCT_WEBVIEW_REF = 'webview'; diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js index 75400ac371f3aa..1ab6379ff6fbc6 100644 --- a/Libraries/Components/WebView/WebView.ios.js +++ b/Libraries/Components/WebView/WebView.ios.js @@ -11,26 +11,26 @@ */ 'use strict'; -var ActivityIndicator = require('ActivityIndicator'); -var EdgeInsetsPropType = require('EdgeInsetsPropType'); -var React = require('React'); +var ActivityIndicator = require('../ActivityIndicator/ActivityIndicator'); +var EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var UIManager = require('UIManager'); -var View = require('View'); -var ViewPropTypes = require('ViewPropTypes'); -var ScrollView = require('ScrollView'); - -var deprecatedPropType = require('deprecatedPropType'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var Text = require('../../Text/Text'); +var UIManager = require('../../ReactNative/UIManager'); +var View = require('../View/View'); +var ViewPropTypes = require('../View/ViewPropTypes'); +var ScrollView = require('../ScrollView/ScrollView'); + +var deprecatedPropType = require('../../Utilities/deprecatedPropType'); var invariant = require('fbjs/lib/invariant'); var keyMirror = require('fbjs/lib/keyMirror'); -var processDecelerationRate = require('processDecelerationRate'); -var requireNativeComponent = require('requireNativeComponent'); -var resolveAssetSource = require('resolveAssetSource'); +var processDecelerationRate = require('../ScrollView/processDecelerationRate'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); +var resolveAssetSource = require('../../Image/resolveAssetSource'); -var RCTWebViewManager = require('NativeModules').WebViewManager; +var RCTWebViewManager = require('../../BatchedBridge/NativeModules').WebViewManager; var BGWASH = 'rgba(255,255,255,0.8)'; var RCT_WEBVIEW_REF = 'webview'; diff --git a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js index 577b88b1c8f7e6..880e7e4e627132 100644 --- a/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js +++ b/Libraries/Core/Devtools/__tests__/parseErrorStack-test.js @@ -9,7 +9,7 @@ 'use strict'; -var parseErrorStack = require('parseErrorStack'); +var parseErrorStack = require('../parseErrorStack'); function getFakeError() { return new Error('Happy Cat'); diff --git a/Libraries/Core/Devtools/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js index ff34314cadd839..bc91db7075648e 100644 --- a/Libraries/Core/Devtools/getDevServer.js +++ b/Libraries/Core/Devtools/getDevServer.js @@ -11,7 +11,7 @@ */ 'use strict'; -const {SourceCode} = require('NativeModules'); +const {SourceCode} = require('../../BatchedBridge/NativeModules'); let _cachedDevServerURL: ?string; const FALLBACK = 'http://localhost:8081/'; diff --git a/Libraries/Core/Devtools/openFileInEditor.js b/Libraries/Core/Devtools/openFileInEditor.js index 650cb568340c4f..38af1084d83fc9 100644 --- a/Libraries/Core/Devtools/openFileInEditor.js +++ b/Libraries/Core/Devtools/openFileInEditor.js @@ -11,7 +11,7 @@ */ 'use strict'; -const getDevServer = require('getDevServer'); +const getDevServer = require('./getDevServer'); function openFileInEditor(file: string, lineNumber: number) { fetch(getDevServer().url + 'open-stack-frame', { diff --git a/Libraries/Core/Devtools/setupDevtools.js b/Libraries/Core/Devtools/setupDevtools.js index de1c9ec67e35ad..2b07d86a6db150 100644 --- a/Libraries/Core/Devtools/setupDevtools.js +++ b/Libraries/Core/Devtools/setupDevtools.js @@ -12,9 +12,9 @@ 'use strict'; if (__DEV__) { - const AppState = require('AppState'); - const WebSocket = require('WebSocket'); - const {PlatformConstants} = require('NativeModules'); + const AppState = require('../../AppState/AppState'); + const WebSocket = require('../../WebSocket/WebSocket'); + const {PlatformConstants} = require('../../BatchedBridge/NativeModules'); const {connectToDevTools} = require('react-devtools-core'); // Initialize dev tools only if the native module for WebSocket is available @@ -34,7 +34,7 @@ if (__DEV__) { // Read the optional global variable for backward compatibility. // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0. port: window.__REACT_DEVTOOLS_PORT__, - resolveRNStyle: require('flattenStyle'), + resolveRNStyle: require('../../StyleSheet/flattenStyle'), }); } } diff --git a/Libraries/Core/Devtools/symbolicateStackTrace.js b/Libraries/Core/Devtools/symbolicateStackTrace.js index 586034b4746c1f..55856377fe5fe4 100644 --- a/Libraries/Core/Devtools/symbolicateStackTrace.js +++ b/Libraries/Core/Devtools/symbolicateStackTrace.js @@ -11,9 +11,9 @@ */ 'use strict'; -const getDevServer = require('getDevServer'); +const getDevServer = require('./getDevServer'); -const {SourceCode} = require('NativeModules'); +const {SourceCode} = require('../../BatchedBridge/NativeModules'); // Avoid requiring fetch on load of this module; see symbolicateStackTrace let fetch; @@ -37,7 +37,7 @@ async function symbolicateStackTrace(stack: Array): Promise { if (prettyStack) { @@ -78,7 +78,7 @@ function reactConsoleErrorHandler() { if (arguments[0] && arguments[0].stack) { reportException(arguments[0], /* isFatal */ false); } else { - const stringifySafe = require('stringifySafe'); + const stringifySafe = require('../Utilities/stringifySafe'); const str = Array.prototype.map.call(arguments, stringifySafe).join(', '); if (str.slice(0, 10) === '"Warning: ') { // React warnings use console.error so that a stack trace is shown, but diff --git a/Libraries/Core/InitializeCore.js b/Libraries/Core/InitializeCore.js index 80b3687b32d3c8..8fcb5d3b6fb61a 100644 --- a/Libraries/Core/InitializeCore.js +++ b/Libraries/Core/InitializeCore.js @@ -36,7 +36,7 @@ if (global.window === undefined) { global.window = global; } -const defineLazyObjectProperty = require('defineLazyObjectProperty'); +const defineLazyObjectProperty = require('../Utilities/defineLazyObjectProperty'); /** * Sets an object's property. If a property with the same name exists, this will @@ -91,17 +91,17 @@ if (!global.process.env.NODE_ENV) { // Setup the Systrace profiling hooks if necessary if (global.__RCTProfileIsProfiling) { - const Systrace = require('Systrace'); + const Systrace = require('../Performance/Systrace'); Systrace.setEnabled(true); } if (__DEV__ && global.performance === undefined) { - const Systrace = require('Systrace'); + const Systrace = require('../Performance/Systrace'); global.performance = Systrace.getUserTimingPolyfill(); } // Set up console -const ExceptionsManager = require('ExceptionsManager'); +const ExceptionsManager = require('./ExceptionsManager'); ExceptionsManager.installConsoleErrorReporter(); // Set up error handler @@ -117,23 +117,23 @@ if (!global.__fbDisableExceptionsManager) { } }; - const ErrorUtils = require('ErrorUtils'); + const ErrorUtils = require('../vendor/core/ErrorUtils'); ErrorUtils.setGlobalHandler(handleError); } // Set up collections -const _shouldPolyfillCollection = require('_shouldPolyfillES6Collection'); +const _shouldPolyfillCollection = require('../vendor/core/_shouldPolyfillES6Collection'); if (_shouldPolyfillCollection('Map')) { - polyfillGlobal('Map', () => require('Map')); + polyfillGlobal('Map', () => require('../vendor/core/Map')); } if (_shouldPolyfillCollection('Set')) { - polyfillGlobal('Set', () => require('Set')); + polyfillGlobal('Set', () => require('../vendor/core/Set')); } // Set up Promise // The native Promise implementation throws the following error: // ERROR: Event loop not supported. -polyfillGlobal('Promise', () => require('Promise')); +polyfillGlobal('Promise', () => require('../Promise')); // Set up regenerator. polyfillGlobal('regeneratorRuntime', () => { @@ -146,7 +146,7 @@ polyfillGlobal('regeneratorRuntime', () => { // Set up timers const defineLazyTimer = name => { - polyfillGlobal(name, () => require('JSTimers')[name]); + polyfillGlobal(name, () => require('./Timers/JSTimers')[name]); }; defineLazyTimer('setTimeout'); defineLazyTimer('setInterval'); @@ -162,23 +162,23 @@ defineLazyTimer('cancelIdleCallback'); // Set up XHR // The native XMLHttpRequest in Chrome dev tools is CORS aware and won't // let you fetch anything from the internet -polyfillGlobal('XMLHttpRequest', () => require('XMLHttpRequest')); -polyfillGlobal('FormData', () => require('FormData')); +polyfillGlobal('XMLHttpRequest', () => require('../Network/XMLHttpRequest')); +polyfillGlobal('FormData', () => require('../Network/FormData')); -polyfillGlobal('fetch', () => require('fetch').fetch); -polyfillGlobal('Headers', () => require('fetch').Headers); -polyfillGlobal('Request', () => require('fetch').Request); -polyfillGlobal('Response', () => require('fetch').Response); -polyfillGlobal('WebSocket', () => require('WebSocket')); -polyfillGlobal('Blob', () => require('Blob')); -polyfillGlobal('URL', () => require('URL')); +polyfillGlobal('fetch', () => require('../Network/fetch').fetch); +polyfillGlobal('Headers', () => require('../Network/fetch').Headers); +polyfillGlobal('Request', () => require('../Network/fetch').Request); +polyfillGlobal('Response', () => require('../Network/fetch').Response); +polyfillGlobal('WebSocket', () => require('../WebSocket/WebSocket')); +polyfillGlobal('Blob', () => require('../Blob/Blob')); +polyfillGlobal('URL', () => require('../Blob/URL')); // Set up alert if (!global.alert) { global.alert = function(text) { // Require Alert on demand. Requiring it too early can lead to issues // with things like Platform not being fully initialized. - require('Alert').alert('Alert', '' + text); + require('../Alert/Alert').alert('Alert', '' + text); }; } @@ -190,33 +190,33 @@ if (navigator === undefined) { // see https://github.com/facebook/react-native/issues/10881 defineLazyProperty(navigator, 'product', () => 'ReactNative'); -defineLazyProperty(navigator, 'geolocation', () => require('Geolocation')); +defineLazyProperty(navigator, 'geolocation', () => require('../Geolocation/Geolocation')); // Just to make sure the JS gets packaged up. Wait until the JS environment has // been initialized before requiring them. -const BatchedBridge = require('BatchedBridge'); -BatchedBridge.registerLazyCallableModule('Systrace', () => require('Systrace')); -BatchedBridge.registerLazyCallableModule('JSTimers', () => require('JSTimers')); -BatchedBridge.registerLazyCallableModule('HeapCapture', () => require('HeapCapture')); -BatchedBridge.registerLazyCallableModule('SamplingProfiler', () => require('SamplingProfiler')); -BatchedBridge.registerLazyCallableModule('RCTLog', () => require('RCTLog')); -BatchedBridge.registerLazyCallableModule('RCTDeviceEventEmitter', () => require('RCTDeviceEventEmitter')); -BatchedBridge.registerLazyCallableModule('RCTNativeAppEventEmitter', () => require('RCTNativeAppEventEmitter')); -BatchedBridge.registerLazyCallableModule('PerformanceLogger', () => require('PerformanceLogger')); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +BatchedBridge.registerLazyCallableModule('Systrace', () => require('../Performance/Systrace')); +BatchedBridge.registerLazyCallableModule('JSTimers', () => require('./Timers/JSTimers')); +BatchedBridge.registerLazyCallableModule('HeapCapture', () => require('../Utilities/HeapCapture')); +BatchedBridge.registerLazyCallableModule('SamplingProfiler', () => require('../Performance/SamplingProfiler')); +BatchedBridge.registerLazyCallableModule('RCTLog', () => require('../Utilities/RCTLog')); +BatchedBridge.registerLazyCallableModule('RCTDeviceEventEmitter', () => require('../EventEmitter/RCTDeviceEventEmitter')); +BatchedBridge.registerLazyCallableModule('RCTNativeAppEventEmitter', () => require('../EventEmitter/RCTNativeAppEventEmitter')); +BatchedBridge.registerLazyCallableModule('PerformanceLogger', () => require('../Utilities/PerformanceLogger')); // Set up devtools if (__DEV__) { if (!global.__RCTProfileIsProfiling) { - BatchedBridge.registerCallableModule('HMRClient', require('HMRClient')); + BatchedBridge.registerCallableModule('HMRClient', require('../Utilities/HMRClient')); // not when debugging in chrome // TODO(t12832058) This check is broken if (!window.document) { - require('setupDevtools'); + require('./Devtools/setupDevtools'); } // Set up inspector - const JSInspector = require('JSInspector'); - JSInspector.registerAgent(require('NetworkAgent')); + const JSInspector = require('../JSInspector/JSInspector'); + JSInspector.registerAgent(require('../JSInspector/NetworkAgent')); } } diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js index 73b6c1235762de..84b307aaeb5891 100644 --- a/Libraries/Core/Timers/JSTimers.js +++ b/Libraries/Core/Timers/JSTimers.js @@ -12,11 +12,11 @@ */ 'use strict'; -const Platform = require('Platform'); -const Systrace = require('Systrace'); +const Platform = require('../../Utilities/Platform'); +const Systrace = require('../../Performance/Systrace'); const invariant = require('fbjs/lib/invariant'); -const {Timing} = require('NativeModules'); +const {Timing} = require('../../BatchedBridge/NativeModules'); import type {ExtendedError} from 'parseErrorStack'; @@ -84,7 +84,7 @@ function _allocateCallback(func: Function, type: JSTimerType): number { callbacks[freeIndex] = func; types[freeIndex] = type; if (__DEV__) { - const parseErrorStack = require('parseErrorStack'); + const parseErrorStack = require('../Devtools/parseErrorStack'); const error: ExtendedError = new Error(); error.framesToPop = 1; const stack = parseErrorStack(error); diff --git a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js index 244b03361b905a..ebba0c85d5aef6 100644 --- a/Libraries/EventEmitter/MissingNativeEventEmitterShim.js +++ b/Libraries/EventEmitter/MissingNativeEventEmitterShim.js @@ -11,8 +11,8 @@ */ 'use strict'; -const EmitterSubscription = require('EmitterSubscription'); -const EventEmitter = require('EventEmitter'); +const EmitterSubscription = require('../vendor/emitter/EmitterSubscription'); +const EventEmitter = require('../vendor/emitter/EventEmitter'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js index be0de96f794946..665f82cc214087 100644 --- a/Libraries/EventEmitter/NativeEventEmitter.js +++ b/Libraries/EventEmitter/NativeEventEmitter.js @@ -11,9 +11,9 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const Platform = require('Platform'); -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +const EventEmitter = require('../vendor/emitter/EventEmitter'); +const Platform = require('../Utilities/Platform'); +const RCTDeviceEventEmitter = require('./RCTDeviceEventEmitter'); const invariant = require('fbjs/lib/invariant'); import type EmitterSubscription from 'EmitterSubscription'; diff --git a/Libraries/EventEmitter/RCTDeviceEventEmitter.js b/Libraries/EventEmitter/RCTDeviceEventEmitter.js index 01e2e0ac5d7741..b2b802f9db4f23 100644 --- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js +++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js @@ -11,8 +11,8 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const EventSubscriptionVendor = require('EventSubscriptionVendor'); +const EventEmitter = require('../vendor/emitter/EventEmitter'); +const EventSubscriptionVendor = require('../vendor/emitter/EventSubscriptionVendor'); import type EmitterSubscription from 'EmitterSubscription'; diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js index 76200db890f062..2d2ac4a1bfd3b1 100644 --- a/Libraries/EventEmitter/RCTEventEmitter.js +++ b/Libraries/EventEmitter/RCTEventEmitter.js @@ -11,7 +11,7 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); const RCTEventEmitter = { register(eventEmitter: any) { diff --git a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js index a940a6ec25bfc8..f8b5291c9f4bb3 100644 --- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js +++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js @@ -11,7 +11,7 @@ */ 'use strict'; -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +const RCTDeviceEventEmitter = require('./RCTDeviceEventEmitter'); /** * Deprecated - subclass NativeEventEmitter to create granular event modules instead of diff --git a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js index e2aa9526571b63..757ded4c35fe9a 100644 --- a/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js +++ b/Libraries/EventEmitter/__mocks__/NativeEventEmitter.js @@ -10,8 +10,8 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +const EventEmitter = require('../../vendor/emitter/EventEmitter'); +const RCTDeviceEventEmitter = require('../RCTDeviceEventEmitter'); /** * Mock the NativeEventEmitter as a normal JS EventEmitter. diff --git a/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js index 82682cbf7fe81d..4afc3aaf6f5190 100644 --- a/Libraries/Experimental/Incremental.js +++ b/Libraries/Experimental/Incremental.js @@ -11,12 +11,12 @@ */ 'use strict'; -const InteractionManager = require('InteractionManager'); -const React = require('React'); +const InteractionManager = require('../Interaction/InteractionManager'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const DEBUG = false; diff --git a/Libraries/Experimental/IncrementalExample.js b/Libraries/Experimental/IncrementalExample.js index 721f2b9d3842c3..718dd2f08c2a2c 100644 --- a/Libraries/Experimental/IncrementalExample.js +++ b/Libraries/Experimental/IncrementalExample.js @@ -22,11 +22,11 @@ const { View, } = ReactNative; -const Incremental = require('Incremental'); -const IncrementalGroup = require('IncrementalGroup'); -const IncrementalPresenter = require('IncrementalPresenter'); +const Incremental = require('./Incremental'); +const IncrementalGroup = require('./IncrementalGroup'); +const IncrementalPresenter = require('./IncrementalPresenter'); -const JSEventLoopWatchdog = require('JSEventLoopWatchdog'); +const JSEventLoopWatchdog = require('../Interaction/JSEventLoopWatchdog'); const performanceNow = require('fbjs/lib/performanceNow'); diff --git a/Libraries/Experimental/IncrementalGroup.js b/Libraries/Experimental/IncrementalGroup.js index bb44b1750c5ba1..622840950f4dca 100644 --- a/Libraries/Experimental/IncrementalGroup.js +++ b/Libraries/Experimental/IncrementalGroup.js @@ -11,12 +11,12 @@ */ 'use strict'; -const Incremental = require('Incremental'); -const React = require('React'); +const Incremental = require('./Incremental'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); let _groupCounter = -1; const DEBUG = false; diff --git a/Libraries/Experimental/IncrementalPresenter.js b/Libraries/Experimental/IncrementalPresenter.js index 953690b2c23de4..83cc2144d370cb 100644 --- a/Libraries/Experimental/IncrementalPresenter.js +++ b/Libraries/Experimental/IncrementalPresenter.js @@ -11,12 +11,12 @@ */ 'use strict'; -const IncrementalGroup = require('IncrementalGroup'); -const React = require('React'); +const IncrementalGroup = require('./IncrementalGroup'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const View = require('View'); +const View = require('../Components/View/View'); -const ViewPropTypes = require('ViewPropTypes'); +const ViewPropTypes = require('../Components/View/ViewPropTypes'); import type {Context} from 'Incremental'; diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListView.js b/Libraries/Experimental/SwipeableRow/SwipeableListView.js index a872600ccef13c..4f6ddf25a1162f 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js @@ -11,11 +11,11 @@ */ 'use strict'; -const ListView = require('ListView'); +const ListView = require('../../Lists/ListView/ListView'); const PropTypes = require('prop-types'); -const React = require('React'); -const SwipeableListViewDataSource = require('SwipeableListViewDataSource'); -const SwipeableRow = require('SwipeableRow'); +const React = require('../../react-native/React'); +const SwipeableListViewDataSource = require('./SwipeableListViewDataSource'); +const SwipeableRow = require('./SwipeableRow'); type DefaultProps = { bounceFirstRowOnMount: boolean, diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js index 506b434160d98e..68ac06582bfbef 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js @@ -10,7 +10,7 @@ */ 'use strict'; -const ListViewDataSource = require('ListViewDataSource'); +const ListViewDataSource = require('../../Lists/ListView/ListViewDataSource'); /** * Data source wrapper around ListViewDataSource to allow for tracking of diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js index afab08319df7ad..fda792baeb2918 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js @@ -11,13 +11,13 @@ */ 'use strict'; -const Image = require('Image'); +const Image = require('../../Image/Image'); const PropTypes = require('prop-types'); -const React = require('React'); -const Text = require('Text'); -const TouchableHighlight = require('TouchableHighlight'); -const View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +const React = require('../../react-native/React'); +const Text = require('../../Text/Text'); +const TouchableHighlight = require('../../Components/Touchable/TouchableHighlight'); +const View = require('../../Components/View/View'); +const ViewPropTypes = require('../../Components/View/ViewPropTypes'); import type {ImageSource} from 'ImageSource'; diff --git a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js index 48b90cea4c4996..eaa6e7efc781eb 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActions.js @@ -11,11 +11,11 @@ */ 'use strict'; -const React = require('React'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); +const React = require('../../react-native/React'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); +const View = require('../../Components/View/View'); -const ViewPropTypes = require('ViewPropTypes'); +const ViewPropTypes = require('../../Components/View/ViewPropTypes'); /** * A thin wrapper around standard quick action buttons that can, if the user diff --git a/Libraries/Experimental/SwipeableRow/SwipeableRow.js b/Libraries/Experimental/SwipeableRow/SwipeableRow.js index 42f34a480a7bab..440501c631ad87 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableRow.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableRow.js @@ -11,14 +11,14 @@ */ 'use strict'; -const Animated = require('Animated'); -const I18nManager = require('I18nManager'); -const PanResponder = require('PanResponder'); -const React = require('React'); +const Animated = require('../../Animated/src/Animated'); +const I18nManager = require('../../ReactNative/I18nManager'); +const PanResponder = require('../../Interaction/PanResponder'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -const StyleSheet = require('StyleSheet'); +const StyleSheet = require('../../StyleSheet/StyleSheet'); const TimerMixin = require('react-timer-mixin'); -const View = require('View'); +const View = require('../../Components/View/View'); const createReactClass = require('create-react-class'); const emptyFunction = require('fbjs/lib/emptyFunction'); diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js index db6840186f669a..cc2da0fd7e4740 100644 --- a/Libraries/Experimental/WindowedListView.js +++ b/Libraries/Experimental/WindowedListView.js @@ -11,19 +11,19 @@ */ 'use strict'; -const Batchinator = require('Batchinator'); -const IncrementalGroup = require('IncrementalGroup'); -const React = require('React'); -const ScrollView = require('ScrollView'); -const Set = require('Set'); -const StyleSheet = require('StyleSheet'); -const Systrace = require('Systrace'); -const View = require('View'); -const ViewabilityHelper = require('ViewabilityHelper'); +const Batchinator = require('../Interaction/Batchinator'); +const IncrementalGroup = require('./IncrementalGroup'); +const React = require('../react-native/React'); +const ScrollView = require('../Components/ScrollView/ScrollView'); +const Set = require('../vendor/core/Set'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Systrace = require('../Performance/Systrace'); +const View = require('../Components/View/View'); +const ViewabilityHelper = require('../Lists/ViewabilityHelper'); -const clamp = require('clamp'); -const deepDiffer = require('deepDiffer'); -const infoLog = require('infoLog'); +const clamp = require('../Utilities/clamp'); +const deepDiffer = require('../Utilities/differ/deepDiffer'); +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); const nullthrows = require('fbjs/lib/nullthrows'); @@ -706,7 +706,7 @@ class CellRenderer extends React.Component { let debug; if (DEBUG) { infoLog('render cell ' + this.props.rowIndex); - const Text = require('Text'); + const Text = require('../Text/Text'); debug = Row: {this.props.rowIndex} ; diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js index 251666f4b1f9c1..d8747fab2ef4f9 100644 --- a/Libraries/Geolocation/Geolocation.js +++ b/Libraries/Geolocation/Geolocation.js @@ -11,17 +11,17 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTLocationObserver = require('NativeModules').LocationObserver; +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const RCTLocationObserver = require('../BatchedBridge/NativeModules').LocationObserver; const invariant = require('fbjs/lib/invariant'); -const logError = require('logError'); +const logError = require('../Utilities/logError'); const warning = require('fbjs/lib/warning'); const LocationEventEmitter = new NativeEventEmitter(RCTLocationObserver); -const Platform = require('Platform'); -const PermissionsAndroid = require('PermissionsAndroid'); +const Platform = require('../Utilities/Platform'); +const PermissionsAndroid = require('../PermissionsAndroid/PermissionsAndroid'); var subscriptions = []; var updatesEnabled = false; diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js index e8a747148eb81a..827b0a2a1a2bf6 100644 --- a/Libraries/Image/AssetSourceResolver.js +++ b/Libraries/Image/AssetSourceResolver.js @@ -21,8 +21,8 @@ export type ResolvedAssetSource = { import type { PackagerAsset } from 'AssetRegistry'; -const PixelRatio = require('PixelRatio'); -const Platform = require('Platform'); +const PixelRatio = require('../Utilities/PixelRatio'); +const Platform = require('../Utilities/Platform'); const assetPathUtils = require('../../local-cli/bundle/assetPathUtils'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js index 8d5ef9c89cbf8c..e937bf78514a72 100644 --- a/Libraries/Image/Image.android.js +++ b/Libraries/Image/Image.android.js @@ -11,26 +11,26 @@ */ 'use strict'; -var ImageResizeMode = require('ImageResizeMode'); -var ImageStylePropTypes = require('ImageStylePropTypes'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var NativeModules = require('NativeModules'); -var React = require('React'); +var ImageResizeMode = require('./ImageResizeMode'); +var ImageStylePropTypes = require('./ImageStylePropTypes'); +var NativeMethodsMixin = require('../Renderer/shims/NativeMethodsMixin'); +var NativeModules = require('../BatchedBridge/NativeModules'); +var React = require('../react-native/React'); var PropTypes = require('prop-types'); -var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -var Set = require('Set'); -var StyleSheet = require('StyleSheet'); -var StyleSheetPropType = require('StyleSheetPropType'); -var View = require('View'); -var ViewPropTypes = require('ViewPropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); +var ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes'); +var Set = require('../vendor/core/Set'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var StyleSheetPropType = require('../StyleSheet/StyleSheetPropType'); +var View = require('../Components/View/View'); +var ViewPropTypes = require('../Components/View/ViewPropTypes'); +var ViewStylePropTypes = require('../Components/View/ViewStylePropTypes'); var createReactClass = require('create-react-class'); var filterObject = require('fbjs/lib/filterObject'); -var flattenStyle = require('flattenStyle'); -var merge = require('merge'); -var requireNativeComponent = require('requireNativeComponent'); -var resolveAssetSource = require('resolveAssetSource'); +var flattenStyle = require('../StyleSheet/flattenStyle'); +var merge = require('../vendor/core/merge'); +var requireNativeComponent = require('../ReactNative/requireNativeComponent'); +var resolveAssetSource = require('./resolveAssetSource'); var { ImageLoader, diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js index 6d37995335ff90..a3ee4a870d39da 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -11,22 +11,22 @@ */ 'use strict'; -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const ImageResizeMode = require('ImageResizeMode'); -const ImageSourcePropType = require('ImageSourcePropType'); -const ImageStylePropTypes = require('ImageStylePropTypes'); -const NativeMethodsMixin = require('NativeMethodsMixin'); -const NativeModules = require('NativeModules'); -const React = require('React'); +const EdgeInsetsPropType = require('../StyleSheet/EdgeInsetsPropType'); +const ImageResizeMode = require('./ImageResizeMode'); +const ImageSourcePropType = require('./ImageSourcePropType'); +const ImageStylePropTypes = require('./ImageStylePropTypes'); +const NativeMethodsMixin = require('../Renderer/shims/NativeMethodsMixin'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -const StyleSheet = require('StyleSheet'); -const StyleSheetPropType = require('StyleSheetPropType'); +const ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const StyleSheetPropType = require('../StyleSheet/StyleSheetPropType'); const createReactClass = require('create-react-class'); -const flattenStyle = require('flattenStyle'); -const requireNativeComponent = require('requireNativeComponent'); -const resolveAssetSource = require('resolveAssetSource'); +const flattenStyle = require('../StyleSheet/flattenStyle'); +const requireNativeComponent = require('../ReactNative/requireNativeComponent'); +const resolveAssetSource = require('./resolveAssetSource'); const ImageViewManager = NativeModules.ImageViewManager; diff --git a/Libraries/Image/ImageBackground.js b/Libraries/Image/ImageBackground.js index 0b10cf17f05fa4..e96403a7a82e80 100644 --- a/Libraries/Image/ImageBackground.js +++ b/Libraries/Image/ImageBackground.js @@ -12,12 +12,12 @@ */ 'use strict'; -const Image = require('Image'); -const React = require('React'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); +const Image = require('./Image'); +const React = require('../react-native/React'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../Components/View/View'); -const ensureComponentIsNative = require('ensureComponentIsNative'); +const ensureComponentIsNative = require('../Components/Touchable/ensureComponentIsNative'); import type {NativeMethodsMixinType} from 'ReactNativeTypes'; diff --git a/Libraries/Image/ImageEditor.js b/Libraries/Image/ImageEditor.js index 3e0a4d3d211167..1a8be37f5c08be 100644 --- a/Libraries/Image/ImageEditor.js +++ b/Libraries/Image/ImageEditor.js @@ -11,7 +11,7 @@ */ 'use strict'; -const RCTImageEditingManager = require('NativeModules').ImageEditingManager; +const RCTImageEditingManager = require('../BatchedBridge/NativeModules').ImageEditingManager; type ImageCropData = { /** diff --git a/Libraries/Image/ImageStore.js b/Libraries/Image/ImageStore.js index f03262d6d08fec..dd1dfd88921b9b 100644 --- a/Libraries/Image/ImageStore.js +++ b/Libraries/Image/ImageStore.js @@ -11,7 +11,7 @@ */ 'use strict'; -const RCTImageStoreManager = require('NativeModules').ImageStoreManager; +const RCTImageStoreManager = require('../BatchedBridge/NativeModules').ImageStoreManager; class ImageStore { /** diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/Image/ImageStylePropTypes.js index 70f21d32d3fbce..67babe2053d6f4 100644 --- a/Libraries/Image/ImageStylePropTypes.js +++ b/Libraries/Image/ImageStylePropTypes.js @@ -11,12 +11,12 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var ImageResizeMode = require('ImageResizeMode'); -var LayoutPropTypes = require('LayoutPropTypes'); +var ColorPropType = require('../StyleSheet/ColorPropType'); +var ImageResizeMode = require('./ImageResizeMode'); +var LayoutPropTypes = require('../StyleSheet/LayoutPropTypes'); var ReactPropTypes = require('prop-types'); -var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); -var TransformPropTypes = require('TransformPropTypes'); +var ShadowPropTypesIOS = require('../Components/View/ShadowPropTypesIOS'); +var TransformPropTypes = require('../StyleSheet/TransformPropTypes'); var ImageStylePropTypes = { ...LayoutPropTypes, diff --git a/Libraries/Image/RelativeImageStub.js b/Libraries/Image/RelativeImageStub.js index e2745cd1705feb..067c50a8d27f43 100644 --- a/Libraries/Image/RelativeImageStub.js +++ b/Libraries/Image/RelativeImageStub.js @@ -14,7 +14,7 @@ // This is a stub for flow to make it understand require('./icon.png') // See metro-bundler/src/Bundler/index.js -var AssetRegistry = require('AssetRegistry'); +var AssetRegistry = require('./AssetRegistry'); module.exports = AssetRegistry.registerAsset({ __packager_asset: true, diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js index 061283cb18c76f..c29d5c574fa2aa 100644 --- a/Libraries/Image/__tests__/resolveAssetSource-test.js +++ b/Libraries/Image/__tests__/resolveAssetSource-test.js @@ -8,9 +8,9 @@ */ 'use strict'; -var AssetRegistry = require('AssetRegistry'); -var Platform = require('Platform'); -var NativeModules = require('NativeModules'); +var AssetRegistry = require('../AssetRegistry'); +var Platform = require('../../Utilities/Platform'); +var NativeModules = require('../../BatchedBridge/NativeModules'); var resolveAssetSource = require('../resolveAssetSource'); function expectResolvesAsset(input, expectedSource) { diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js index d9d71da7cda6ea..6528b2efff9908 100644 --- a/Libraries/Image/nativeImageSource.js +++ b/Libraries/Image/nativeImageSource.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('../Utilities/Platform'); type SourceSpec = { ios?: string, diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js index 71ec3715cb854f..bc0edb5399eba0 100644 --- a/Libraries/Image/resolveAssetSource.js +++ b/Libraries/Image/resolveAssetSource.js @@ -13,9 +13,9 @@ */ 'use strict'; -const AssetRegistry = require('AssetRegistry'); -const AssetSourceResolver = require('AssetSourceResolver'); -const NativeModules = require('NativeModules'); +const AssetRegistry = require('./AssetRegistry'); +const AssetSourceResolver = require('./AssetSourceResolver'); +const NativeModules = require('../BatchedBridge/NativeModules'); import type { ResolvedAssetSource } from 'AssetSourceResolver'; diff --git a/Libraries/Inspector/BorderBox.js b/Libraries/Inspector/BorderBox.js index caee8ccd6b3334..b5fe50f88afa39 100644 --- a/Libraries/Inspector/BorderBox.js +++ b/Libraries/Inspector/BorderBox.js @@ -11,8 +11,8 @@ */ 'use strict'; -var React = require('React'); -var View = require('View'); +var React = require('../react-native/React'); +var View = require('../Components/View/View'); class BorderBox extends React.Component { render() { diff --git a/Libraries/Inspector/BoxInspector.js b/Libraries/Inspector/BoxInspector.js index 7234db08d9746f..df9c25e808ecaf 100644 --- a/Libraries/Inspector/BoxInspector.js +++ b/Libraries/Inspector/BoxInspector.js @@ -11,11 +11,11 @@ */ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); -var resolveBoxStyle = require('resolveBoxStyle'); +var React = require('../react-native/React'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var Text = require('../Text/Text'); +var View = require('../Components/View/View'); +var resolveBoxStyle = require('./resolveBoxStyle'); var blank = { top: 0, diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js index a3851001c2ee45..8ec0addd0d0abd 100644 --- a/Libraries/Inspector/ElementBox.js +++ b/Libraries/Inspector/ElementBox.js @@ -11,13 +11,13 @@ */ 'use strict'; -var React = require('React'); -var View = require('View'); -var StyleSheet = require('StyleSheet'); -var BorderBox = require('BorderBox'); -var resolveBoxStyle = require('resolveBoxStyle'); +var React = require('../react-native/React'); +var View = require('../Components/View/View'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var BorderBox = require('./BorderBox'); +var resolveBoxStyle = require('./resolveBoxStyle'); -var flattenStyle = require('flattenStyle'); +var flattenStyle = require('../StyleSheet/flattenStyle'); class ElementBox extends React.Component { render() { diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js index ac1e1ae4f804ea..0bfddeced03f58 100644 --- a/Libraries/Inspector/ElementProperties.js +++ b/Libraries/Inspector/ElementProperties.js @@ -11,19 +11,19 @@ */ 'use strict'; -const BoxInspector = require('BoxInspector'); +const BoxInspector = require('./BoxInspector'); const PropTypes = require('prop-types'); -const React = require('React'); -const StyleInspector = require('StyleInspector'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TouchableHighlight = require('TouchableHighlight'); -const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -const View = require('View'); +const React = require('../react-native/React'); +const StyleInspector = require('./StyleInspector'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Text = require('../Text/Text'); +const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); +const TouchableWithoutFeedback = require('../Components/Touchable/TouchableWithoutFeedback'); +const View = require('../Components/View/View'); -const flattenStyle = require('flattenStyle'); -const mapWithSeparator = require('mapWithSeparator'); -const openFileInEditor = require('openFileInEditor'); +const flattenStyle = require('../StyleSheet/flattenStyle'); +const mapWithSeparator = require('../Utilities/mapWithSeparator'); +const openFileInEditor = require('../Core/Devtools/openFileInEditor'); class ElementProperties extends React.Component { props: { diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js index fd19cd8d311552..4be4f63a8895e2 100644 --- a/Libraries/Inspector/Inspector.js +++ b/Libraries/Inspector/Inspector.js @@ -14,16 +14,16 @@ 'use strict'; -const Dimensions = require('Dimensions'); -const InspectorOverlay = require('InspectorOverlay'); -const InspectorPanel = require('InspectorPanel'); -const Platform = require('Platform'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const StyleSheet = require('StyleSheet'); -const Touchable = require('Touchable'); -const UIManager = require('UIManager'); -const View = require('View'); +const Dimensions = require('../Utilities/Dimensions'); +const InspectorOverlay = require('./InspectorOverlay'); +const InspectorPanel = require('./InspectorPanel'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/shims/ReactNative'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Touchable = require('../Components/Touchable/Touchable'); +const UIManager = require('../ReactNative/UIManager'); +const View = require('../Components/View/View'); const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); @@ -35,7 +35,7 @@ export type ReactRenderer = { const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__; const renderer: ReactRenderer = findRenderer(); // required for devtools to be able to edit react native styles -hook.resolveRNStyle = require('flattenStyle'); +hook.resolveRNStyle = require('../StyleSheet/flattenStyle'); function findRenderer(): ReactRenderer { const renderers = hook._renderers; diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index 1364000abf22a2..24b827cc93df9a 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -11,13 +11,13 @@ */ 'use strict'; -var Dimensions = require('Dimensions'); -var ElementBox = require('ElementBox'); +var Dimensions = require('../Utilities/Dimensions'); +var ElementBox = require('./ElementBox'); var PropTypes = require('prop-types'); -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var UIManager = require('UIManager'); -var View = require('View'); +var React = require('../react-native/React'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var UIManager = require('../ReactNative/UIManager'); +var View = require('../Components/View/View'); type EventLike = { nativeEvent: Object, diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js index d2a4c3dbd8d927..309812e2f0d594 100644 --- a/Libraries/Inspector/InspectorPanel.js +++ b/Libraries/Inspector/InspectorPanel.js @@ -11,16 +11,16 @@ */ 'use strict'; -const ElementProperties = require('ElementProperties'); -const NetworkOverlay = require('NetworkOverlay'); -const PerformanceOverlay = require('PerformanceOverlay'); -const React = require('React'); +const ElementProperties = require('./ElementProperties'); +const NetworkOverlay = require('./NetworkOverlay'); +const PerformanceOverlay = require('./PerformanceOverlay'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const ScrollView = require('ScrollView'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TouchableHighlight = require('TouchableHighlight'); -const View = require('View'); +const ScrollView = require('../Components/ScrollView/ScrollView'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Text = require('../Text/Text'); +const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); +const View = require('../Components/View/View'); class InspectorPanel extends React.Component { renderWaiting() { diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js index 70a50b6785fd90..072436504881af 100644 --- a/Libraries/Inspector/NetworkOverlay.js +++ b/Libraries/Inspector/NetworkOverlay.js @@ -11,15 +11,15 @@ */ 'use strict'; -const ListView = require('ListView'); -const React = require('React'); -const ScrollView = require('ScrollView'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TouchableHighlight = require('TouchableHighlight'); -const View = require('View'); -const WebSocketInterceptor = require('WebSocketInterceptor'); -const XHRInterceptor = require('XHRInterceptor'); +const ListView = require('../Lists/ListView/ListView'); +const React = require('../react-native/React'); +const ScrollView = require('../Components/ScrollView/ScrollView'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Text = require('../Text/Text'); +const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); +const View = require('../Components/View/View'); +const WebSocketInterceptor = require('../WebSocket/WebSocketInterceptor'); +const XHRInterceptor = require('../Network/XHRInterceptor'); const LISTVIEW_CELL_HEIGHT = 15; const SEPARATOR_THICKNESS = 2; diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js index 9eb51a380c91d5..b7f3f145b99a97 100644 --- a/Libraries/Inspector/PerformanceOverlay.js +++ b/Libraries/Inspector/PerformanceOverlay.js @@ -11,11 +11,11 @@ */ 'use strict'; -var PerformanceLogger = require('PerformanceLogger'); -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var PerformanceLogger = require('../Utilities/PerformanceLogger'); +var React = require('../react-native/React'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var Text = require('../Text/Text'); +var View = require('../Components/View/View'); class PerformanceOverlay extends React.Component { render() { diff --git a/Libraries/Inspector/StyleInspector.js b/Libraries/Inspector/StyleInspector.js index 96db90e8a0763d..fb38bc93df8928 100644 --- a/Libraries/Inspector/StyleInspector.js +++ b/Libraries/Inspector/StyleInspector.js @@ -11,10 +11,10 @@ */ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var Text = require('Text'); -var View = require('View'); +var React = require('../react-native/React'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var Text = require('../Text/Text'); +var View = require('../Components/View/View'); class StyleInspector extends React.Component { render() { diff --git a/Libraries/Interaction/Batchinator.js b/Libraries/Interaction/Batchinator.js index e807e5515e7f81..4263a00ddca315 100644 --- a/Libraries/Interaction/Batchinator.js +++ b/Libraries/Interaction/Batchinator.js @@ -11,7 +11,7 @@ */ 'use strict'; -const InteractionManager = require('InteractionManager'); +const InteractionManager = require('./InteractionManager'); /** * A simple class for batching up invocations of a low-pri callback. A timeout is set to run the diff --git a/Libraries/Interaction/BridgeSpyStallHandler.js b/Libraries/Interaction/BridgeSpyStallHandler.js index 78d61c0321baae..96e47bc77b51c6 100644 --- a/Libraries/Interaction/BridgeSpyStallHandler.js +++ b/Libraries/Interaction/BridgeSpyStallHandler.js @@ -11,10 +11,10 @@ */ 'use strict'; -const JSEventLoopWatchdog = require('JSEventLoopWatchdog'); -const MessageQueue = require('MessageQueue'); +const JSEventLoopWatchdog = require('./JSEventLoopWatchdog'); +const MessageQueue = require('../BatchedBridge/MessageQueue'); -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const BridgeSpyStallHandler = { register: function() { diff --git a/Libraries/Interaction/FrameRateLogger.js b/Libraries/Interaction/FrameRateLogger.js index 3f1265b4140b03..977c521c4c290b 100644 --- a/Libraries/Interaction/FrameRateLogger.js +++ b/Libraries/Interaction/FrameRateLogger.js @@ -11,7 +11,7 @@ */ 'use strict'; -const NativeModules = require('NativeModules'); +const NativeModules = require('../BatchedBridge/NativeModules'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Interaction/InteractionManager.js b/Libraries/Interaction/InteractionManager.js index 5beb56e59c466e..0d3377723b1e3d 100644 --- a/Libraries/Interaction/InteractionManager.js +++ b/Libraries/Interaction/InteractionManager.js @@ -11,12 +11,12 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); -const EventEmitter = require('EventEmitter'); -const Set = require('Set'); -const TaskQueue = require('TaskQueue'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +const EventEmitter = require('../vendor/emitter/EventEmitter'); +const Set = require('../vendor/core/Set'); +const TaskQueue = require('./TaskQueue'); -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); const keyMirror = require('fbjs/lib/keyMirror'); diff --git a/Libraries/Interaction/InteractionMixin.js b/Libraries/Interaction/InteractionMixin.js index b0e3104407ea36..0497b3bc0e45e6 100644 --- a/Libraries/Interaction/InteractionMixin.js +++ b/Libraries/Interaction/InteractionMixin.js @@ -11,7 +11,7 @@ */ 'use strict'; -var InteractionManager = require('InteractionManager'); +var InteractionManager = require('./InteractionManager'); /** * This mixin provides safe versions of InteractionManager start/end methods diff --git a/Libraries/Interaction/InteractionStallDebugger.js b/Libraries/Interaction/InteractionStallDebugger.js index 782abbf7edaeaf..eeff2484208ea4 100644 --- a/Libraries/Interaction/InteractionStallDebugger.js +++ b/Libraries/Interaction/InteractionStallDebugger.js @@ -11,9 +11,9 @@ */ 'use strict'; -const BridgeSpyStallHandler = require('BridgeSpyStallHandler'); -const JSEventLoopWatchdog = require('JSEventLoopWatchdog'); -const ReactPerfStallHandler = require('ReactPerfStallHandler'); +const BridgeSpyStallHandler = require('./BridgeSpyStallHandler'); +const JSEventLoopWatchdog = require('./JSEventLoopWatchdog'); +const ReactPerfStallHandler = require('./ReactPerfStallHandler'); const InteractionStallDebugger = { install: function(options: {thresholdMS: number}) { diff --git a/Libraries/Interaction/JSEventLoopWatchdog.js b/Libraries/Interaction/JSEventLoopWatchdog.js index acd3f7575c52f1..7ff7018e90e12d 100644 --- a/Libraries/Interaction/JSEventLoopWatchdog.js +++ b/Libraries/Interaction/JSEventLoopWatchdog.js @@ -11,7 +11,7 @@ */ 'use strict'; -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const performanceNow = require('fbjs/lib/performanceNow'); type Handler = { diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js index bc6774e985eb66..ff50f005f36d52 100644 --- a/Libraries/Interaction/PanResponder.js +++ b/Libraries/Interaction/PanResponder.js @@ -12,7 +12,7 @@ 'use strict'; const InteractionManager = require('./InteractionManager'); -const TouchHistoryMath = require('TouchHistoryMath'); +const TouchHistoryMath = require('../Renderer/shims/TouchHistoryMath'); const currentCentroidXOfTouchesChangedAfter = TouchHistoryMath.currentCentroidXOfTouchesChangedAfter; const currentCentroidYOfTouchesChangedAfter = TouchHistoryMath.currentCentroidYOfTouchesChangedAfter; diff --git a/Libraries/Interaction/ReactPerfStallHandler.js b/Libraries/Interaction/ReactPerfStallHandler.js index 0644ace6af5eeb..31be31f41aa4dc 100644 --- a/Libraries/Interaction/ReactPerfStallHandler.js +++ b/Libraries/Interaction/ReactPerfStallHandler.js @@ -11,8 +11,8 @@ */ 'use strict'; -const JSEventLoopWatchdog = require('JSEventLoopWatchdog'); -const ReactPerf = require('ReactPerf'); +const JSEventLoopWatchdog = require('./JSEventLoopWatchdog'); +const ReactPerf = require('../Renderer/shims/ReactPerf'); const ReactPerfStallHandler = { register: function() { diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js index 660241fb35bc5a..815a8aa7b055e0 100644 --- a/Libraries/Interaction/TaskQueue.js +++ b/Libraries/Interaction/TaskQueue.js @@ -11,7 +11,7 @@ */ 'use strict'; -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); type SimpleTask = { diff --git a/Libraries/Interaction/__tests__/Batchinator-test.js b/Libraries/Interaction/__tests__/Batchinator-test.js index 474dade852b77f..e3606ae3bf448c 100644 --- a/Libraries/Interaction/__tests__/Batchinator-test.js +++ b/Libraries/Interaction/__tests__/Batchinator-test.js @@ -11,15 +11,15 @@ 'use strict'; jest - .mock('ErrorUtils') - .mock('BatchedBridge'); + .mock('../../vendor/core/ErrorUtils') + .mock('../../BatchedBridge/BatchedBridge'); function expectToBeCalledOnce(fn) { expect(fn.mock.calls.length).toBe(1); } describe('Batchinator', () => { - const Batchinator = require('Batchinator'); + const Batchinator = require('../Batchinator'); it('executes vanilla tasks', () => { const callback = jest.fn(); diff --git a/Libraries/Interaction/__tests__/InteractionManager-test.js b/Libraries/Interaction/__tests__/InteractionManager-test.js index e55fe71047d988..38a38a21868e2c 100644 --- a/Libraries/Interaction/__tests__/InteractionManager-test.js +++ b/Libraries/Interaction/__tests__/InteractionManager-test.js @@ -11,8 +11,8 @@ 'use strict'; jest - .mock('ErrorUtils') - .mock('BatchedBridge'); + .mock('../../vendor/core/ErrorUtils') + .mock('../../BatchedBridge/BatchedBridge'); function expectToBeCalledOnce(fn) { expect(fn.mock.calls.length).toBe(1); @@ -25,7 +25,7 @@ describe('InteractionManager', () => { beforeEach(() => { jest.resetModules(); - InteractionManager = require('InteractionManager'); + InteractionManager = require('../InteractionManager'); interactionStart = jest.fn(); interactionComplete = jest.fn(); @@ -164,8 +164,8 @@ describe('promise tasks', () => { beforeEach(() => { jest.resetModules(); jest.useFakeTimers(); - InteractionManager = require('InteractionManager'); - BatchedBridge = require('BatchedBridge'); + InteractionManager = require('../InteractionManager'); + BatchedBridge = require('../../BatchedBridge/BatchedBridge'); sequenceId = 0; }); diff --git a/Libraries/Interaction/__tests__/InteractionMixin-test.js b/Libraries/Interaction/__tests__/InteractionMixin-test.js index 3e41ff652d9f0f..e7f328309da870 100644 --- a/Libraries/Interaction/__tests__/InteractionMixin-test.js +++ b/Libraries/Interaction/__tests__/InteractionMixin-test.js @@ -9,7 +9,7 @@ */ 'use strict'; -jest.enableAutomock().unmock('InteractionMixin'); +jest.enableAutomock().unmock('../InteractionMixin'); describe('InteractionMixin', () => { var InteractionManager; @@ -18,8 +18,8 @@ describe('InteractionMixin', () => { beforeEach(() => { jest.resetModules(); - InteractionManager = require('InteractionManager'); - InteractionMixin = require('InteractionMixin'); + InteractionManager = require('../InteractionManager'); + InteractionMixin = require('../InteractionMixin'); component = Object.create(InteractionMixin); }); diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js index c9c12100d6db5a..6457ce4171a88d 100644 --- a/Libraries/Interaction/__tests__/TaskQueue-test.js +++ b/Libraries/Interaction/__tests__/TaskQueue-test.js @@ -36,7 +36,7 @@ describe('TaskQueue', () => { beforeEach(() => { jest.resetModules(); onMoreTasks = jest.fn(); - const TaskQueue = require('TaskQueue'); + const TaskQueue = require('../TaskQueue'); taskQueue = new TaskQueue({onMoreTasks}); sequenceId = 0; }); diff --git a/Libraries/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js index 4314411b8e0076..adc5000e12c5c2 100644 --- a/Libraries/JSInspector/NetworkAgent.js +++ b/Libraries/JSInspector/NetworkAgent.js @@ -11,10 +11,10 @@ */ 'use strict'; -const InspectorAgent = require('InspectorAgent'); -const JSInspector = require('JSInspector'); -const Map = require('Map'); -const XMLHttpRequest = require('XMLHttpRequest'); +const InspectorAgent = require('./InspectorAgent'); +const JSInspector = require('./JSInspector'); +const Map = require('../vendor/core/Map'); +const XMLHttpRequest = require('../Network/XMLHttpRequest'); import type EventSender from 'InspectorAgent'; diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js index 1b218201b70a86..c3fbf711a72a76 100644 --- a/Libraries/LayoutAnimation/LayoutAnimation.js +++ b/Libraries/LayoutAnimation/LayoutAnimation.js @@ -13,7 +13,7 @@ 'use strict'; const PropTypes = require('prop-types'); -const UIManager = require('UIManager'); +const UIManager = require('../ReactNative/UIManager'); const keyMirror = require('fbjs/lib/keyMirror'); diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js index 6c8c690e79221b..d37e48958dc1db 100644 --- a/Libraries/Linking/Linking.js +++ b/Libraries/Linking/Linking.js @@ -11,9 +11,9 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const Platform = require('../Utilities/Platform'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js index 5a98157bd058cf..a3344a2ef193c7 100644 --- a/Libraries/Lists/FlatList.js +++ b/Libraries/Lists/FlatList.js @@ -12,10 +12,10 @@ */ 'use strict'; -const MetroListView = require('MetroListView'); // Used as a fallback legacy option -const React = require('React'); -const View = require('View'); -const VirtualizedList = require('VirtualizedList'); +const MetroListView = require('./MetroListView'); // Used as a fallback legacy option +const React = require('../react-native/React'); +const View = require('../Components/View/View'); +const VirtualizedList = require('./VirtualizedList'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Lists/ListView/ListView.js b/Libraries/Lists/ListView/ListView.js index d2f9ff2c332a65..18c0fef7b6ba8d 100644 --- a/Libraries/Lists/ListView/ListView.js +++ b/Libraries/Lists/ListView/ListView.js @@ -12,22 +12,22 @@ */ 'use strict'; -var ListViewDataSource = require('ListViewDataSource'); -var Platform = require('Platform'); -var React = require('React'); +var ListViewDataSource = require('./ListViewDataSource'); +var Platform = require('../../Utilities/Platform'); +var React = require('../../react-native/React'); var PropTypes = require('prop-types'); -var ReactNative = require('ReactNative'); -var RCTScrollViewManager = require('NativeModules').ScrollViewManager; -var ScrollView = require('ScrollView'); -var ScrollResponder = require('ScrollResponder'); -var StaticRenderer = require('StaticRenderer'); +var ReactNative = require('../../Renderer/shims/ReactNative'); +var RCTScrollViewManager = require('../../BatchedBridge/NativeModules').ScrollViewManager; +var ScrollView = require('../../Components/ScrollView/ScrollView'); +var ScrollResponder = require('../../Components/ScrollResponder'); +var StaticRenderer = require('../../Components/StaticRenderer'); var TimerMixin = require('react-timer-mixin'); -var View = require('View'); +var View = require('../../Components/View/View'); var cloneReferencedElement = require('react-clone-referenced-element'); var createReactClass = require('create-react-class'); -var isEmpty = require('isEmpty'); -var merge = require('merge'); +var isEmpty = require('../../vendor/core/isEmpty'); +var merge = require('../../vendor/core/merge'); var DEFAULT_PAGE_SIZE = 1; var DEFAULT_INITIAL_ROWS = 10; diff --git a/Libraries/Lists/ListView/ListViewDataSource.js b/Libraries/Lists/ListView/ListViewDataSource.js index 3675dc396c5469..e535d299615f1d 100644 --- a/Libraries/Lists/ListView/ListViewDataSource.js +++ b/Libraries/Lists/ListView/ListViewDataSource.js @@ -13,7 +13,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); -var isEmpty = require('isEmpty'); +var isEmpty = require('../../vendor/core/isEmpty'); var warning = require('fbjs/lib/warning'); function defaultGetRowData( diff --git a/Libraries/Lists/ListView/__mocks__/ListViewMock.js b/Libraries/Lists/ListView/__mocks__/ListViewMock.js index 405dc517d29a50..8ec2139d912918 100644 --- a/Libraries/Lists/ListView/__mocks__/ListViewMock.js +++ b/Libraries/Lists/ListView/__mocks__/ListViewMock.js @@ -11,10 +11,10 @@ */ 'use strict'; -const ListViewDataSource = require('ListViewDataSource'); -const React = require('React'); -const ScrollView = require('ScrollView'); -const StaticRenderer = require('StaticRenderer'); +const ListViewDataSource = require('../ListViewDataSource'); +const React = require('../../../react-native/React'); +const ScrollView = require('../../../Components/ScrollView/ScrollView'); +const StaticRenderer = require('../../../Components/StaticRenderer'); class ListViewMock extends React.Component { static latestRef: ?ListViewMock; diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js index 48968cdc5ca105..cdce44043b8fc9 100644 --- a/Libraries/Lists/MetroListView.js +++ b/Libraries/Lists/MetroListView.js @@ -12,10 +12,10 @@ */ 'use strict'; -const ListView = require('ListView'); -const React = require('React'); -const RefreshControl = require('RefreshControl'); -const ScrollView = require('ScrollView'); +const ListView = require('./ListView/ListView'); +const React = require('../react-native/React'); +const RefreshControl = require('../Components/RefreshControl/RefreshControl'); +const ScrollView = require('../Components/ScrollView/ScrollView'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Lists/SectionList.js b/Libraries/Lists/SectionList.js index f56673cbe98df1..752243177793b2 100644 --- a/Libraries/Lists/SectionList.js +++ b/Libraries/Lists/SectionList.js @@ -12,10 +12,10 @@ */ 'use strict'; -const MetroListView = require('MetroListView'); -const Platform = require('Platform'); -const React = require('React'); -const VirtualizedSectionList = require('VirtualizedSectionList'); +const MetroListView = require('./MetroListView'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); +const VirtualizedSectionList = require('./VirtualizedSectionList'); import type {ViewToken} from 'ViewabilityHelper'; import type {Props as VirtualizedSectionListProps} from 'VirtualizedSectionList'; diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js index 0638a6b208870a..7de72fbfe474b3 100644 --- a/Libraries/Lists/VirtualizedList.js +++ b/Libraries/Lists/VirtualizedList.js @@ -12,23 +12,23 @@ */ 'use strict'; -const Batchinator = require('Batchinator'); -const FillRateHelper = require('FillRateHelper'); +const Batchinator = require('../Interaction/Batchinator'); +const FillRateHelper = require('./FillRateHelper'); const PropTypes = require('prop-types'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const RefreshControl = require('RefreshControl'); -const ScrollView = require('ScrollView'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); -const ViewabilityHelper = require('ViewabilityHelper'); - -const flattenStyle = require('flattenStyle'); -const infoLog = require('infoLog'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/shims/ReactNative'); +const RefreshControl = require('../Components/RefreshControl/RefreshControl'); +const ScrollView = require('../Components/ScrollView/ScrollView'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../Components/View/View'); +const ViewabilityHelper = require('./ViewabilityHelper'); + +const flattenStyle = require('../StyleSheet/flattenStyle'); +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); const warning = require('fbjs/lib/warning'); -const {computeWindowedRenderLimits} = require('VirtualizeUtils'); +const {computeWindowedRenderLimits} = require('./VirtualizeUtils'); import type {StyleObj} from 'StyleSheetTypes'; import type {ViewabilityConfig, ViewToken} from 'ViewabilityHelper'; diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js index c48d7657f6568e..cace0c2337bcb8 100644 --- a/Libraries/Lists/VirtualizedSectionList.js +++ b/Libraries/Lists/VirtualizedSectionList.js @@ -12,9 +12,9 @@ */ 'use strict'; -const React = require('React'); -const View = require('View'); -const VirtualizedList = require('VirtualizedList'); +const React = require('../react-native/React'); +const View = require('../Components/View/View'); +const VirtualizedList = require('./VirtualizedList'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Lists/__flowtests__/FlatList-flowtest.js b/Libraries/Lists/__flowtests__/FlatList-flowtest.js index 02d744f676dd62..b85c9c34191bd4 100644 --- a/Libraries/Lists/__flowtests__/FlatList-flowtest.js +++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js @@ -12,7 +12,7 @@ 'use strict'; -const FlatList = require('FlatList'); +const FlatList = require('../FlatList'); const React = require('react'); function renderMyListItem(info: {item: {title: string}, index: number}) { diff --git a/Libraries/Lists/__flowtests__/SectionList-flowtest.js b/Libraries/Lists/__flowtests__/SectionList-flowtest.js index dc6be3c469f76d..bd31e35894fc79 100644 --- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js +++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js @@ -13,7 +13,7 @@ 'use strict'; const React = require('react'); -const SectionList = require('SectionList'); +const SectionList = require('../SectionList'); function renderMyListItem(info: {item: {title: string}, index: number}) { return ; diff --git a/Libraries/Lists/__tests__/FillRateHelper-test.js b/Libraries/Lists/__tests__/FillRateHelper-test.js index ffcce7fdf412a7..6c7d1b9ab7dfdf 100644 --- a/Libraries/Lists/__tests__/FillRateHelper-test.js +++ b/Libraries/Lists/__tests__/FillRateHelper-test.js @@ -11,7 +11,7 @@ */ 'use strict'; -const FillRateHelper = require('FillRateHelper'); +const FillRateHelper = require('../FillRateHelper'); let rowFramesGlobal; const dataGlobal = [ diff --git a/Libraries/Lists/__tests__/FlatList-test.js b/Libraries/Lists/__tests__/FlatList-test.js index 15e6eb38b438ab..c18a03be9ab388 100644 --- a/Libraries/Lists/__tests__/FlatList-test.js +++ b/Libraries/Lists/__tests__/FlatList-test.js @@ -11,10 +11,10 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../react-native/React'); const ReactTestRenderer = require('react-test-renderer'); -const FlatList = require('FlatList'); +const FlatList = require('../FlatList'); describe('FlatList', () => { it('renders simple list', () => { diff --git a/Libraries/Lists/__tests__/SectionList-test.js b/Libraries/Lists/__tests__/SectionList-test.js index 301c9de6554a2e..1b805413bcf3fa 100644 --- a/Libraries/Lists/__tests__/SectionList-test.js +++ b/Libraries/Lists/__tests__/SectionList-test.js @@ -11,10 +11,10 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../react-native/React'); const ReactTestRenderer = require('react-test-renderer'); -const SectionList = require('SectionList'); +const SectionList = require('../SectionList'); describe('SectionList', () => { it('renders empty list', () => { diff --git a/Libraries/Lists/__tests__/ViewabilityHelper-test.js b/Libraries/Lists/__tests__/ViewabilityHelper-test.js index 9dbcb2c4de205f..d4b8b46356a2bf 100644 --- a/Libraries/Lists/__tests__/ViewabilityHelper-test.js +++ b/Libraries/Lists/__tests__/ViewabilityHelper-test.js @@ -11,7 +11,7 @@ */ 'use strict'; -const ViewabilityHelper = require('ViewabilityHelper'); +const ViewabilityHelper = require('../ViewabilityHelper'); let rowFrames; let data; diff --git a/Libraries/Lists/__tests__/VirtualizeUtils-test.js b/Libraries/Lists/__tests__/VirtualizeUtils-test.js index 0efa50b71deb26..67269b0b0979f3 100644 --- a/Libraries/Lists/__tests__/VirtualizeUtils-test.js +++ b/Libraries/Lists/__tests__/VirtualizeUtils-test.js @@ -11,7 +11,7 @@ */ 'use strict'; -const {elementsThatOverlapOffsets, newRangeCount} = require('VirtualizeUtils'); +const {elementsThatOverlapOffsets, newRangeCount} = require('../VirtualizeUtils'); describe('newRangeCount', function() { it('handles subset', function() { diff --git a/Libraries/Lists/__tests__/VirtualizedList-test.js b/Libraries/Lists/__tests__/VirtualizedList-test.js index c4e675a739c151..f4aa6321c83e02 100644 --- a/Libraries/Lists/__tests__/VirtualizedList-test.js +++ b/Libraries/Lists/__tests__/VirtualizedList-test.js @@ -11,10 +11,10 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../react-native/React'); const ReactTestRenderer = require('react-test-renderer'); -const VirtualizedList = require('VirtualizedList'); +const VirtualizedList = require('../VirtualizedList'); describe('VirtualizedList', () => { it('renders simple list', () => { diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js index bb74dee3240b8f..e604386a6db754 100644 --- a/Libraries/Modal/Modal.js +++ b/Libraries/Modal/Modal.js @@ -11,16 +11,16 @@ */ 'use strict'; -const AppContainer = require('AppContainer'); -const I18nManager = require('I18nManager'); -const Platform = require('Platform'); -const React = require('React'); +const AppContainer = require('../ReactNative/AppContainer'); +const I18nManager = require('../ReactNative/I18nManager'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../Components/View/View'); -const deprecatedPropType = require('deprecatedPropType'); -const requireNativeComponent = require('requireNativeComponent'); +const deprecatedPropType = require('../Utilities/deprecatedPropType'); +const requireNativeComponent = require('../ReactNative/requireNativeComponent'); const RCTModalHostView = requireNativeComponent('RCTModalHostView', null); /** diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js index 864929e094649d..a3064db7519b5d 100644 --- a/Libraries/Network/NetInfo.js +++ b/Libraries/Network/NetInfo.js @@ -11,10 +11,10 @@ */ 'use strict'; -const Map = require('Map'); -const NativeEventEmitter = require('NativeEventEmitter'); -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); +const Map = require('../vendor/core/Map'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const Platform = require('../Utilities/Platform'); const RCTNetInfo = NativeModules.NetInfo; const NetInfoEventEmitter = new NativeEventEmitter(RCTNetInfo); diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js index e6292ccfefa6ea..facaf8dcda8841 100644 --- a/Libraries/Network/RCTNetworking.android.js +++ b/Libraries/Network/RCTNetworking.android.js @@ -13,10 +13,10 @@ // Do not require the native RCTNetworking module directly! Use this wrapper module instead. // It will add the necessary requestId, so that you don't have to generate it yourself. -const MissingNativeEventEmitterShim = require('MissingNativeEventEmitterShim'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; -const convertRequestBody = require('convertRequestBody'); +const MissingNativeEventEmitterShim = require('../EventEmitter/MissingNativeEventEmitterShim'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const RCTNetworkingNative = require('../BatchedBridge/NativeModules').Networking; +const convertRequestBody = require('./convertRequestBody'); import type {RequestBody} from 'convertRequestBody'; diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js index 35d432dee08222..d740aa7a61dec3 100644 --- a/Libraries/Network/RCTNetworking.ios.js +++ b/Libraries/Network/RCTNetworking.ios.js @@ -11,10 +11,10 @@ */ 'use strict'; -const MissingNativeEventEmitterShim = require('MissingNativeEventEmitterShim'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; -const convertRequestBody = require('convertRequestBody'); +const MissingNativeEventEmitterShim = require('../EventEmitter/MissingNativeEventEmitterShim'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const RCTNetworkingNative = require('../BatchedBridge/NativeModules').Networking; +const convertRequestBody = require('./convertRequestBody'); import type {RequestBody} from 'convertRequestBody'; diff --git a/Libraries/Network/XHRInterceptor.js b/Libraries/Network/XHRInterceptor.js index 0c037c8e0359a7..60d125cc50a9c2 100644 --- a/Libraries/Network/XHRInterceptor.js +++ b/Libraries/Network/XHRInterceptor.js @@ -10,7 +10,7 @@ */ 'use strict'; -const XMLHttpRequest = require('XMLHttpRequest'); +const XMLHttpRequest = require('./XMLHttpRequest'); const originalXHROpen = XMLHttpRequest.prototype.open; const originalXHRSend = XMLHttpRequest.prototype.send; const originalXHRSetRequestHeader = XMLHttpRequest.prototype.setRequestHeader; diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequest.js index 3e7f3953b3b865..8685a8718530da 100644 --- a/Libraries/Network/XMLHttpRequest.js +++ b/Libraries/Network/XMLHttpRequest.js @@ -12,7 +12,7 @@ 'use strict'; const EventTarget = require('event-target-shim'); -const RCTNetworking = require('RCTNetworking'); +const RCTNetworking = require('./RCTNetworking'); const base64 = require('base64-js'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Network/__tests__/FormData-test.js b/Libraries/Network/__tests__/FormData-test.js index 85d3fac8808165..aeba04ee09934b 100644 --- a/Libraries/Network/__tests__/FormData-test.js +++ b/Libraries/Network/__tests__/FormData-test.js @@ -9,7 +9,7 @@ 'use strict'; -const FormData = require('FormData'); +const FormData = require('../FormData'); describe('FormData', function() { var formData; diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequest-test.js index eba667d4b23b3b..1fdcb556ac3bdc 100644 --- a/Libraries/Network/__tests__/XMLHttpRequest-test.js +++ b/Libraries/Network/__tests__/XMLHttpRequest-test.js @@ -8,8 +8,8 @@ */ 'use strict'; -jest.unmock('Platform'); -const Platform = require('Platform'); +jest.unmock('../../Utilities/Platform'); +const Platform = require('../../Utilities/Platform'); let requestId = 1; function setRequestId(id){ @@ -21,7 +21,7 @@ function setRequestId(id){ jest .dontMock('event-target-shim') - .setMock('NativeModules', { + .setMock('../../BatchedBridge/NativeModules', { Networking: { addListener: function() {}, removeListeners: function() {}, @@ -34,7 +34,7 @@ jest }, }); -const XMLHttpRequest = require('XMLHttpRequest'); +const XMLHttpRequest = require('../XMLHttpRequest'); describe('XMLHttpRequest', function() { var xhr; diff --git a/Libraries/Network/convertRequestBody.js b/Libraries/Network/convertRequestBody.js index e82689692bf1ef..96c23904ecd28f 100644 --- a/Libraries/Network/convertRequestBody.js +++ b/Libraries/Network/convertRequestBody.js @@ -11,9 +11,9 @@ */ 'use strict'; -const binaryToBase64 = require('binaryToBase64'); +const binaryToBase64 = require('../Utilities/binaryToBase64'); -const FormData = require('FormData'); +const FormData = require('./FormData'); export type RequestBody = string diff --git a/Libraries/Performance/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js index de8c2c0ac8c8b8..e879a8738cf053 100644 --- a/Libraries/Performance/SamplingProfiler.js +++ b/Libraries/Performance/SamplingProfiler.js @@ -28,7 +28,7 @@ const SamplingProfiler = { error = e.toString(); } - const {JSCSamplingProfiler} = require('NativeModules'); + const {JSCSamplingProfiler} = require('../BatchedBridge/NativeModules'); JSCSamplingProfiler.operationComplete(token, result, error); }, }; diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js index 69db4e604af386..11b3f76c2749bb 100644 --- a/Libraries/PermissionsAndroid/PermissionsAndroid.js +++ b/Libraries/PermissionsAndroid/PermissionsAndroid.js @@ -11,7 +11,7 @@ */ 'use strict'; -const NativeModules = require('NativeModules'); +const NativeModules = require('../BatchedBridge/NativeModules'); type Rationale = { title: string, diff --git a/Libraries/PushNotificationIOS/PushNotificationIOS.js b/Libraries/PushNotificationIOS/PushNotificationIOS.js index d5dc474b960bd9..f1dd7d57133416 100644 --- a/Libraries/PushNotificationIOS/PushNotificationIOS.js +++ b/Libraries/PushNotificationIOS/PushNotificationIOS.js @@ -11,8 +11,8 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTPushNotificationManager = require('NativeModules').PushNotificationManager; +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const RCTPushNotificationManager = require('../BatchedBridge/NativeModules').PushNotificationManager; const invariant = require('fbjs/lib/invariant'); const PushNotificationEmitter = new NativeEventEmitter(RCTPushNotificationManager); diff --git a/Libraries/RCTTest/SnapshotViewIOS.android.js b/Libraries/RCTTest/SnapshotViewIOS.android.js index c9127822d50c2b..128e594a1ef4ce 100644 --- a/Libraries/RCTTest/SnapshotViewIOS.android.js +++ b/Libraries/RCTTest/SnapshotViewIOS.android.js @@ -10,4 +10,4 @@ */ 'use strict'; -module.exports = require('UnimplementedView'); +module.exports = require('../Components/UnimplementedViews/UnimplementedView'); diff --git a/Libraries/RCTTest/SnapshotViewIOS.ios.js b/Libraries/RCTTest/SnapshotViewIOS.ios.js index 07048b7eb82065..8b8a68788bd323 100644 --- a/Libraries/RCTTest/SnapshotViewIOS.ios.js +++ b/Libraries/RCTTest/SnapshotViewIOS.ios.js @@ -11,16 +11,16 @@ */ 'use strict'; -var React = require('React'); +var React = require('../react-native/React'); const PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var { TestModule } = require('NativeModules'); -var UIManager = require('UIManager'); -var View = require('View'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var { TestModule } = require('../BatchedBridge/NativeModules'); +var UIManager = require('../ReactNative/UIManager'); +var View = require('../Components/View/View'); -const ViewPropTypes = require('ViewPropTypes'); +const ViewPropTypes = require('../Components/View/ViewPropTypes'); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../ReactNative/requireNativeComponent'); class SnapshotViewIOS extends React.Component { props: { diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js index 0ce53a5106328b..71a9d57ffe2c90 100644 --- a/Libraries/ReactNative/AppContainer.js +++ b/Libraries/ReactNative/AppContainer.js @@ -13,13 +13,13 @@ 'use strict'; -const EmitterSubscription = require('EmitterSubscription'); +const EmitterSubscription = require('../vendor/emitter/EmitterSubscription'); const PropTypes = require('prop-types'); -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); +const RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/shims/ReactNative'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../Components/View/View'); type Context = { rootTag: number, @@ -59,7 +59,7 @@ class AppContainer extends React.Component { this._subscription = RCTDeviceEventEmitter.addListener( 'toggleElementInspector', () => { - const Inspector = require('Inspector'); + const Inspector = require('../Inspector/Inspector'); const inspector = this.state.inspector ? null : ; } } diff --git a/Libraries/ReactNative/AppRegistry.js b/Libraries/ReactNative/AppRegistry.js index c51a447c996796..33867b0eb14ee2 100644 --- a/Libraries/ReactNative/AppRegistry.js +++ b/Libraries/ReactNative/AppRegistry.js @@ -11,15 +11,15 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); -const BugReporting = require('BugReporting'); -const NativeModules = require('NativeModules'); -const ReactNative = require('ReactNative'); -const SceneTracker = require('SceneTracker'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +const BugReporting = require('../BugReporting/BugReporting'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const ReactNative = require('../Renderer/shims/ReactNative'); +const SceneTracker = require('../Utilities/SceneTracker'); -const infoLog = require('infoLog'); +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); -const renderApplication = require('renderApplication'); +const renderApplication = require('./renderApplication'); type Task = (taskData: any) => Promise; type TaskProvider = () => Task; diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js index 764058d5fbca04..7da48c14763c1a 100644 --- a/Libraries/ReactNative/I18nManager.js +++ b/Libraries/ReactNative/I18nManager.js @@ -17,7 +17,7 @@ type I18nManagerStatus = { forceRTL: (forceRTL: boolean) => {}, }; -const I18nManager : I18nManagerStatus = require('NativeModules').I18nManager || { +const I18nManager : I18nManagerStatus = require('../BatchedBridge/NativeModules').I18nManager || { isRTL: false, allowRTL: () => {}, forceRTL: () => {}, diff --git a/Libraries/ReactNative/UIManager.js b/Libraries/ReactNative/UIManager.js index 3ae73c303d122a..07b4af563fa575 100644 --- a/Libraries/ReactNative/UIManager.js +++ b/Libraries/ReactNative/UIManager.js @@ -11,10 +11,10 @@ */ 'use strict'; -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const Platform = require('../Utilities/Platform'); -const defineLazyObjectProperty = require('defineLazyObjectProperty'); +const defineLazyObjectProperty = require('../Utilities/defineLazyObjectProperty'); const invariant = require('fbjs/lib/invariant'); const { UIManager } = NativeModules; diff --git a/Libraries/ReactNative/UIManagerStatTracker.js b/Libraries/ReactNative/UIManagerStatTracker.js index a3b8779234f5e3..9a209e6de6ed3c 100644 --- a/Libraries/ReactNative/UIManagerStatTracker.js +++ b/Libraries/ReactNative/UIManagerStatTracker.js @@ -11,7 +11,7 @@ */ 'use strict'; -var UIManager = require('UIManager'); +var UIManager = require('./UIManager'); var installed = false; var UIManagerStatTracker = { diff --git a/Libraries/ReactNative/YellowBox.js b/Libraries/ReactNative/YellowBox.js index d6d2514b829e54..acecf97fa0d383 100644 --- a/Libraries/ReactNative/YellowBox.js +++ b/Libraries/ReactNative/YellowBox.js @@ -12,15 +12,15 @@ 'use strict'; -const EventEmitter = require('EventEmitter'); -const Platform = require('Platform'); -const React = require('React'); -const StyleSheet = require('StyleSheet'); +const EventEmitter = require('../vendor/emitter/EventEmitter'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); +const StyleSheet = require('../StyleSheet/StyleSheet'); -const infoLog = require('infoLog'); -const openFileInEditor = require('openFileInEditor'); -const parseErrorStack = require('parseErrorStack'); -const symbolicateStackTrace = require('symbolicateStackTrace'); +const infoLog = require('../Utilities/infoLog'); +const openFileInEditor = require('../Core/Devtools/openFileInEditor'); +const parseErrorStack = require('../Core/Devtools/parseErrorStack'); +const symbolicateStackTrace = require('../Core/Devtools/symbolicateStackTrace'); import type EmitterSubscription from 'EmitterSubscription'; import type {StackFrame} from 'parseErrorStack'; @@ -106,7 +106,7 @@ function updateWarningMap(format, ...args): void { if (console.disableYellowBox) { return; } - const stringifySafe = require('stringifySafe'); + const stringifySafe = require('../Utilities/stringifySafe'); format = String(format); const argCount = (format.match(/%s/g) || []).length; @@ -177,9 +177,9 @@ function isWarningIgnored(warning: string): boolean { } const WarningRow = ({count, warning, onPress}) => { - const Text = require('Text'); - const TouchableHighlight = require('TouchableHighlight'); - const View = require('View'); + const Text = require('../Text/Text'); + const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); + const View = require('../Components/View/View'); const countText = count > 1 ? {'(' + count + ') '} : @@ -203,8 +203,8 @@ const WarningRow = ({count, warning, onPress}) => { type StackRowProps = { frame: StackFrame }; const StackRow = ({frame}: StackRowProps) => { - const Text = require('Text'); - const TouchableHighlight = require('TouchableHighlight'); + const Text = require('../Text/Text'); + const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); const {file, lineNumber} = frame; let fileName; if (file) { @@ -236,10 +236,10 @@ const WarningInspector = ({ onMinimize, toggleStacktrace, }) => { - const ScrollView = require('ScrollView'); - const Text = require('Text'); - const TouchableHighlight = require('TouchableHighlight'); - const View = require('View'); + const ScrollView = require('../Components/ScrollView/ScrollView'); + const Text = require('../Text/Text'); + const TouchableHighlight = require('../Components/Touchable/TouchableHighlight'); + const View = require('../Components/View/View'); const {count, stacktrace} = warningInfo || {}; const countSentence = @@ -370,8 +370,8 @@ class YellowBox extends React.Component { if (console.disableYellowBox || this.state.warningMap.size === 0) { return null; } - const ScrollView = require('ScrollView'); - const View = require('View'); + const ScrollView = require('../Components/ScrollView/ScrollView'); + const View = require('../Components/View/View'); const {inspecting, stacktraceVisible} = this.state; const inspector = inspecting !== null ? diff --git a/Libraries/ReactNative/queryLayoutByID.js b/Libraries/ReactNative/queryLayoutByID.js index 13cd5d1ca9cf01..f77e925c71c265 100644 --- a/Libraries/ReactNative/queryLayoutByID.js +++ b/Libraries/ReactNative/queryLayoutByID.js @@ -11,7 +11,7 @@ */ 'use strict'; -var UIManager = require('UIManager'); +var UIManager = require('./UIManager'); type OnSuccessCallback = ( left: number, diff --git a/Libraries/ReactNative/renderApplication.js b/Libraries/ReactNative/renderApplication.js index 2d47cd549d7197..479d0023b01038 100644 --- a/Libraries/ReactNative/renderApplication.js +++ b/Libraries/ReactNative/renderApplication.js @@ -13,14 +13,14 @@ 'use strict'; -const AppContainer = require('AppContainer'); -const React = require('React'); -const ReactNative = require('ReactNative'); +const AppContainer = require('./AppContainer'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/shims/ReactNative'); const invariant = require('fbjs/lib/invariant'); // require BackHandler so it sets the default handler that exits the app if no listeners respond -require('BackHandler'); +require('../Utilities/BackHandler'); function renderApplication( RootComponent: ReactClass, diff --git a/Libraries/ReactNative/requireNativeComponent.js b/Libraries/ReactNative/requireNativeComponent.js index 7c6aedf14c5085..5f3d02ac7095cb 100644 --- a/Libraries/ReactNative/requireNativeComponent.js +++ b/Libraries/ReactNative/requireNativeComponent.js @@ -11,18 +11,18 @@ */ 'use strict'; -const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); -const UIManager = require('UIManager'); -const UnimplementedView = require('UnimplementedView'); - -const createReactNativeComponentClass = require('createReactNativeComponentClass'); -const insetsDiffer = require('insetsDiffer'); -const matricesDiffer = require('matricesDiffer'); -const pointsDiffer = require('pointsDiffer'); -const processColor = require('processColor'); -const resolveAssetSource = require('resolveAssetSource'); -const sizesDiffer = require('sizesDiffer'); -const verifyPropTypes = require('verifyPropTypes'); +const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes'); +const UIManager = require('./UIManager'); +const UnimplementedView = require('../Components/UnimplementedViews/UnimplementedView'); + +const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass'); +const insetsDiffer = require('../Utilities/differ/insetsDiffer'); +const matricesDiffer = require('../Utilities/differ/matricesDiffer'); +const pointsDiffer = require('../Utilities/differ/pointsDiffer'); +const processColor = require('../StyleSheet/processColor'); +const resolveAssetSource = require('../Image/resolveAssetSource'); +const sizesDiffer = require('../Utilities/differ/sizesDiffer'); +const verifyPropTypes = require('./verifyPropTypes'); const warning = require('fbjs/lib/warning'); /** diff --git a/Libraries/ReactNative/verifyPropTypes.js b/Libraries/ReactNative/verifyPropTypes.js index d140182760a6aa..e5106062ab5ccc 100644 --- a/Libraries/ReactNative/verifyPropTypes.js +++ b/Libraries/ReactNative/verifyPropTypes.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); +var ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes'); export type ComponentInterface = ReactClass | { name?: string, diff --git a/Libraries/Renderer/ReactNativeFiber-dev.js b/Libraries/Renderer/ReactNativeFiber-dev.js index 3f97c870cc87dc..bead824632e6b0 100644 --- a/Libraries/Renderer/ReactNativeFiber-dev.js +++ b/Libraries/Renderer/ReactNativeFiber-dev.js @@ -11,11 +11,11 @@ */ "use strict"; -var invariant = require("fbjs/lib/invariant"), warning = require("fbjs/lib/warning"), ExceptionsManager = require("ExceptionsManager"); +var invariant = require("fbjs/lib/invariant"), warning = require("fbjs/lib/warning"), ExceptionsManager = require('../Core/ExceptionsManager'); -require("InitializeCore"); +require('../Core/InitializeCore'); -var RCTEventEmitter = require("RCTEventEmitter"), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require("UIManager"), checkPropTypes = require("prop-types/checkPropTypes"), emptyObject = require("fbjs/lib/emptyObject"), react = require("react"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require("deepDiffer"), flattenStyle = require("flattenStyle"), TextInputState = require("TextInputState"), deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev"), ExecutionEnvironment = require("fbjs/lib/ExecutionEnvironment"), performanceNow = require("fbjs/lib/performanceNow"), defaultShowDialog = function(capturedError) { +var RCTEventEmitter = require('../EventEmitter/RCTEventEmitter'), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require('../ReactNative/UIManager'), checkPropTypes = require("prop-types/checkPropTypes"), emptyObject = require("fbjs/lib/emptyObject"), react = require("react"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require('../Utilities/differ/deepDiffer'), flattenStyle = require('../StyleSheet/flattenStyle'), TextInputState = require('../Components/TextInput/TextInputState'), deepFreezeAndThrowOnMutationInDev = require('../Utilities/deepFreezeAndThrowOnMutationInDev'), ExecutionEnvironment = require("fbjs/lib/ExecutionEnvironment"), performanceNow = require("fbjs/lib/performanceNow"), defaultShowDialog = function(capturedError) { return !0; }, showDialog = defaultShowDialog; @@ -3998,7 +3998,7 @@ getInspectorDataForViewTag = function(viewTag) { var ReactNativeFiberInspector = { getInspectorDataForViewTag: getInspectorDataForViewTag -}, ReactVersion = "16.0.0-alpha.13", ReactNativeFeatureFlags = require("ReactNativeFeatureFlags"), ReactCurrentOwner$3 = ReactGlobalSharedState_1.ReactCurrentOwner, injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { +}, ReactVersion = "16.0.0-alpha.13", ReactNativeFeatureFlags = require('./shims/ReactNativeFeatureFlags'), ReactCurrentOwner$3 = ReactGlobalSharedState_1.ReactCurrentOwner, injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { return ReactNativeFiberRenderer.findHostInstance(fiber); } : function(instance) { return instance; @@ -4040,7 +4040,7 @@ function _inherits(subClass, superClass) { }), superClass && (Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass); } -var ReactNativeFeatureFlags$1 = require("ReactNativeFeatureFlags"), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, ReactNativeComponent = function(_React$Component) { +var ReactNativeFeatureFlags$1 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, ReactNativeComponent = function(_React$Component) { _inherits(ReactNativeComponent, _React$Component); function ReactNativeComponent() { return _classCallCheck$2(this, ReactNativeComponent), _possibleConstructorReturn(this, _React$Component.apply(this, arguments)); @@ -4088,7 +4088,7 @@ var injectedSetNativeProps = void 0; injectedSetNativeProps = ReactNativeFeatureFlags$1.useFiber ? setNativePropsFiber : setNativePropsStack; -var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require("ReactNativeFeatureFlags"), mountSafeCallback$3 = NativeMethodsMixinUtils.mountSafeCallback, throwOnStylesProp$1 = NativeMethodsMixinUtils.throwOnStylesProp, warnForStyleProps$2 = NativeMethodsMixinUtils.warnForStyleProps, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, NativeMethodsMixin = { +var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$3 = NativeMethodsMixinUtils.mountSafeCallback, throwOnStylesProp$1 = NativeMethodsMixinUtils.throwOnStylesProp, warnForStyleProps$2 = NativeMethodsMixinUtils.warnForStyleProps, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, NativeMethodsMixin = { measure: function(callback) { UIManager.measure(findNumericNodeHandle$1(this), mountSafeCallback$3(this, callback)); }, @@ -4185,7 +4185,7 @@ var NativeMethodsMixin_1 = NativeMethodsMixin, TouchHistoryMath = { noCentroid: -1 }, TouchHistoryMath_1 = TouchHistoryMath, createReactNativeComponentClassFiber = function(viewConfig) { return ReactNativeViewConfigRegistry_1.register(viewConfig); -}, createReactNativeComponentClassFiber_1 = createReactNativeComponentClassFiber, ReactNativeFeatureFlags$3 = require("ReactNativeFeatureFlags"), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? createReactNativeComponentClassFiber_1 : DevOnlyStubShim, ReactNativeFeatureFlags$4 = require("ReactNativeFeatureFlags"), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim; +}, createReactNativeComponentClassFiber_1 = createReactNativeComponentClassFiber, ReactNativeFeatureFlags$3 = require('./shims/ReactNativeFeatureFlags'), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? createReactNativeComponentClassFiber_1 : DevOnlyStubShim, ReactNativeFeatureFlags$4 = require('./shims/ReactNativeFeatureFlags'), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim; function takeSnapshot(view, options) { return "number" != typeof view && "window" !== view && (view = findNumericNodeHandle$2(view) || "window"), diff --git a/Libraries/Renderer/ReactNativeFiber-prod.js b/Libraries/Renderer/ReactNativeFiber-prod.js index e04904d3e491bc..f0d2274acd7b07 100644 --- a/Libraries/Renderer/ReactNativeFiber-prod.js +++ b/Libraries/Renderer/ReactNativeFiber-prod.js @@ -11,17 +11,17 @@ */ "use strict"; -var invariant = require("fbjs/lib/invariant"), warning = require("fbjs/lib/warning"), ExceptionsManager = require("ExceptionsManager"); +var invariant = require("fbjs/lib/invariant"), warning = require("fbjs/lib/warning"), ExceptionsManager = require('../Core/ExceptionsManager'); -require("InitializeCore"); +require('../Core/InitializeCore'); -var RCTEventEmitter = require("RCTEventEmitter"), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require("UIManager"); +var RCTEventEmitter = require('../EventEmitter/RCTEventEmitter'), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require('../ReactNative/UIManager'); require("prop-types/checkPropTypes"); -var emptyObject = require("fbjs/lib/emptyObject"), react = require("react"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require("deepDiffer"), flattenStyle = require("flattenStyle"), TextInputState = require("TextInputState"); +var emptyObject = require("fbjs/lib/emptyObject"), react = require("react"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require('../Utilities/differ/deepDiffer'), flattenStyle = require('../StyleSheet/flattenStyle'), TextInputState = require('../Components/TextInput/TextInputState'); -require("deepFreezeAndThrowOnMutationInDev"); +require('../Utilities/deepFreezeAndThrowOnMutationInDev'); var defaultShowDialog = function(capturedError) { return !0; @@ -3532,7 +3532,7 @@ getInspectorDataForViewTag = function() { var ReactNativeFiberInspector = { getInspectorDataForViewTag: getInspectorDataForViewTag -}, ReactVersion = "16.0.0-alpha.13", ReactNativeFeatureFlags = require("ReactNativeFeatureFlags"), injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { +}, ReactVersion = "16.0.0-alpha.13", ReactNativeFeatureFlags = require('./shims/ReactNativeFeatureFlags'), injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { return ReactNativeFiberRenderer.findHostInstance(fiber); } : function(instance) { return instance; @@ -3572,7 +3572,7 @@ function _inherits(subClass, superClass) { }), superClass && (Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass); } -var ReactNativeFeatureFlags$1 = require("ReactNativeFeatureFlags"), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, ReactNativeComponent = function(_React$Component) { +var ReactNativeFeatureFlags$1 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, ReactNativeComponent = function(_React$Component) { _inherits(ReactNativeComponent, _React$Component); function ReactNativeComponent() { return _classCallCheck$2(this, ReactNativeComponent), _possibleConstructorReturn(this, _React$Component.apply(this, arguments)); @@ -3620,7 +3620,7 @@ var injectedSetNativeProps = void 0; injectedSetNativeProps = ReactNativeFeatureFlags$1.useFiber ? setNativePropsFiber : setNativePropsStack; -var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require("ReactNativeFeatureFlags"), mountSafeCallback$3 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, NativeMethodsMixin = { +var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$3 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim, NativeMethodsMixin = { measure: function(callback) { UIManager.measure(findNumericNodeHandle$1(this), mountSafeCallback$3(this, callback)); }, @@ -3704,7 +3704,7 @@ var NativeMethodsMixin_1 = NativeMethodsMixin, TouchHistoryMath = { noCentroid: -1 }, TouchHistoryMath_1 = TouchHistoryMath, createReactNativeComponentClassFiber = function(viewConfig) { return ReactNativeViewConfigRegistry_1.register(viewConfig); -}, createReactNativeComponentClassFiber_1 = createReactNativeComponentClassFiber, ReactNativeFeatureFlags$3 = require("ReactNativeFeatureFlags"), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? createReactNativeComponentClassFiber_1 : DevOnlyStubShim, ReactNativeFeatureFlags$4 = require("ReactNativeFeatureFlags"), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim; +}, createReactNativeComponentClassFiber_1 = createReactNativeComponentClassFiber, ReactNativeFeatureFlags$3 = require('./shims/ReactNativeFeatureFlags'), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? createReactNativeComponentClassFiber_1 : DevOnlyStubShim, ReactNativeFeatureFlags$4 = require('./shims/ReactNativeFeatureFlags'), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? findNumericNodeHandleFiber : DevOnlyStubShim; function takeSnapshot(view, options) { return "number" != typeof view && "window" !== view && (view = findNumericNodeHandle$2(view) || "window"), diff --git a/Libraries/Renderer/ReactNativeStack-dev.js b/Libraries/Renderer/ReactNativeStack-dev.js index 0d3dca10c72b6d..377250cb9e5f7e 100644 --- a/Libraries/Renderer/ReactNativeStack-dev.js +++ b/Libraries/Renderer/ReactNativeStack-dev.js @@ -13,9 +13,9 @@ var invariant = require("fbjs/lib/invariant"); -require("InitializeCore"); +require('../Core/InitializeCore'); -var warning = require("fbjs/lib/warning"), RCTEventEmitter = require("RCTEventEmitter"), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require("UIManager"), React = require("react"), ExecutionEnvironment = require("fbjs/lib/ExecutionEnvironment"), performanceNow = require("fbjs/lib/performanceNow"), emptyObject = require("fbjs/lib/emptyObject"), checkPropTypes = require("prop-types/checkPropTypes"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require("deepDiffer"), flattenStyle = require("flattenStyle"), TextInputState = require("TextInputState"), deepFreezeAndThrowOnMutationInDev = require("deepFreezeAndThrowOnMutationInDev"), instanceCache = {}, instanceProps = {}; +var warning = require("fbjs/lib/warning"), RCTEventEmitter = require('../EventEmitter/RCTEventEmitter'), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require('../ReactNative/UIManager'), React = require("react"), ExecutionEnvironment = require("fbjs/lib/ExecutionEnvironment"), performanceNow = require("fbjs/lib/performanceNow"), emptyObject = require("fbjs/lib/emptyObject"), checkPropTypes = require("prop-types/checkPropTypes"), shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require('../Utilities/differ/deepDiffer'), flattenStyle = require('../StyleSheet/flattenStyle'), TextInputState = require('../Components/TextInput/TextInputState'), deepFreezeAndThrowOnMutationInDev = require('../Utilities/deepFreezeAndThrowOnMutationInDev'), instanceCache = {}, instanceProps = {}; function getRenderedHostOrTextFromComponent(component) { for (var rendered; rendered = component._renderedComponent; ) component = rendered; @@ -1971,7 +1971,7 @@ Object.assign(ReactCompositeComponentWrapper.prototype, ReactCompositeComponent_ _instantiateReactComponent: instantiateReactComponent }); -var instantiateReactComponent_1 = instantiateReactComponent, DevOnlyStubShim = null, ReactNativeFeatureFlags = require("ReactNativeFeatureFlags"), ReactCurrentOwner$2 = ReactGlobalSharedState_1.ReactCurrentOwner, injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { +var instantiateReactComponent_1 = instantiateReactComponent, DevOnlyStubShim = null, ReactNativeFeatureFlags = require('./shims/ReactNativeFeatureFlags'), ReactCurrentOwner$2 = ReactGlobalSharedState_1.ReactCurrentOwner, injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { return DevOnlyStubShim.findHostInstance(fiber); } : function(instance) { return instance; @@ -2237,7 +2237,7 @@ function inject$1() { ReactUpdates_1.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy_1), ReactComponentEnvironment_1.injection.injectEnvironment(ReactNativeComponentEnvironment_1); var EmptyComponent = function(instantiate) { - var View = require("View"); + var View = require('../Components/View/View'); return new ReactSimpleEmptyComponent_1(React.createElement(View, { collapsable: !0, style: { @@ -2488,7 +2488,7 @@ function _inherits(subClass, superClass) { }), superClass && (Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass); } -var ReactNativeFeatureFlags$1 = require("ReactNativeFeatureFlags"), mountSafeCallback = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, ReactNativeComponent = function(_React$Component) { +var ReactNativeFeatureFlags$1 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, ReactNativeComponent = function(_React$Component) { _inherits(ReactNativeComponent, _React$Component); function ReactNativeComponent() { return _classCallCheck$1(this, ReactNativeComponent), _possibleConstructorReturn(this, _React$Component.apply(this, arguments)); @@ -2536,7 +2536,7 @@ var injectedSetNativeProps = void 0; injectedSetNativeProps = ReactNativeFeatureFlags$1.useFiber ? setNativePropsFiber : setNativePropsStack; -var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require("ReactNativeFeatureFlags"), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, throwOnStylesProp$1 = NativeMethodsMixinUtils.throwOnStylesProp, warnForStyleProps$1 = NativeMethodsMixinUtils.warnForStyleProps, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, NativeMethodsMixin = { +var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, throwOnStylesProp$1 = NativeMethodsMixinUtils.throwOnStylesProp, warnForStyleProps$1 = NativeMethodsMixinUtils.warnForStyleProps, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, NativeMethodsMixin = { measure: function(callback) { UIManager.measure(findNumericNodeHandle$1(this), mountSafeCallback$2(this, callback)); }, @@ -2979,7 +2979,7 @@ var ReactNativeBaseComponent_1 = ReactNativeBaseComponent, createReactNativeComp return Constructor.displayName = viewConfig.uiViewClassName, Constructor.viewConfig = viewConfig, Constructor.propTypes = viewConfig.propTypes, Constructor.prototype = new ReactNativeBaseComponent_1(viewConfig), Constructor.prototype.constructor = Constructor, Constructor; -}, createReactNativeComponentClassStack_1 = createReactNativeComponentClassStack, ReactNativeFeatureFlags$3 = require("ReactNativeFeatureFlags"), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? DevOnlyStubShim : createReactNativeComponentClassStack_1, ReactNativeFeatureFlags$4 = require("ReactNativeFeatureFlags"), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack; +}, createReactNativeComponentClassStack_1 = createReactNativeComponentClassStack, ReactNativeFeatureFlags$3 = require('./shims/ReactNativeFeatureFlags'), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? DevOnlyStubShim : createReactNativeComponentClassStack_1, ReactNativeFeatureFlags$4 = require('./shims/ReactNativeFeatureFlags'), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack; function takeSnapshot(view, options) { return "number" != typeof view && "window" !== view && (view = findNumericNodeHandle$2(view) || "window"), diff --git a/Libraries/Renderer/ReactNativeStack-prod.js b/Libraries/Renderer/ReactNativeStack-prod.js index f4c056967b2b82..68cfae944eb263 100644 --- a/Libraries/Renderer/ReactNativeStack-prod.js +++ b/Libraries/Renderer/ReactNativeStack-prod.js @@ -13,15 +13,15 @@ var invariant = require("fbjs/lib/invariant"); -require("InitializeCore"); +require('../Core/InitializeCore'); -var warning = require("fbjs/lib/warning"), RCTEventEmitter = require("RCTEventEmitter"), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require("UIManager"), React = require("react"), emptyObject = require("fbjs/lib/emptyObject"); +var warning = require("fbjs/lib/warning"), RCTEventEmitter = require('../EventEmitter/RCTEventEmitter'), emptyFunction = require("fbjs/lib/emptyFunction"), UIManager = require('../ReactNative/UIManager'), React = require("react"), emptyObject = require("fbjs/lib/emptyObject"); require("prop-types/checkPropTypes"); -var shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require("deepDiffer"), flattenStyle = require("flattenStyle"), TextInputState = require("TextInputState"); +var shallowEqual = require("fbjs/lib/shallowEqual"), deepDiffer = require('../Utilities/differ/deepDiffer'), flattenStyle = require('../StyleSheet/flattenStyle'), TextInputState = require('../Components/TextInput/TextInputState'); -require("deepFreezeAndThrowOnMutationInDev"); +require('../Utilities/deepFreezeAndThrowOnMutationInDev'); var instanceCache = {}, instanceProps = {}; @@ -1586,7 +1586,7 @@ Object.assign(ReactCompositeComponentWrapper.prototype, ReactCompositeComponent_ _instantiateReactComponent: instantiateReactComponent }); -var instantiateReactComponent_1 = instantiateReactComponent, DevOnlyStubShim = null, ReactNativeFeatureFlags = require("ReactNativeFeatureFlags"), injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { +var instantiateReactComponent_1 = instantiateReactComponent, DevOnlyStubShim = null, ReactNativeFeatureFlags = require('./shims/ReactNativeFeatureFlags'), injectedFindNode = ReactNativeFeatureFlags.useFiber ? function(fiber) { return DevOnlyStubShim.findHostInstance(fiber); } : function(instance) { return instance; @@ -1843,7 +1843,7 @@ function inject$1() { ReactUpdates_1.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy_1), ReactComponentEnvironment_1.injection.injectEnvironment(ReactNativeComponentEnvironment_1); var EmptyComponent = function(instantiate) { - var View = require("View"); + var View = require('../Components/View/View'); return new ReactSimpleEmptyComponent_1(React.createElement(View, { collapsable: !0, style: { @@ -2038,7 +2038,7 @@ function _inherits(subClass, superClass) { }), superClass && (Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass); } -var ReactNativeFeatureFlags$1 = require("ReactNativeFeatureFlags"), mountSafeCallback = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, ReactNativeComponent = function(_React$Component) { +var ReactNativeFeatureFlags$1 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle = ReactNativeFeatureFlags$1.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, ReactNativeComponent = function(_React$Component) { _inherits(ReactNativeComponent, _React$Component); function ReactNativeComponent() { return _classCallCheck$1(this, ReactNativeComponent), _possibleConstructorReturn(this, _React$Component.apply(this, arguments)); @@ -2086,7 +2086,7 @@ var injectedSetNativeProps = void 0; injectedSetNativeProps = ReactNativeFeatureFlags$1.useFiber ? setNativePropsFiber : setNativePropsStack; -var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require("ReactNativeFeatureFlags"), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, NativeMethodsMixin = { +var ReactNativeComponent_1 = ReactNativeComponent, ReactNativeFeatureFlags$2 = require('./shims/ReactNativeFeatureFlags'), mountSafeCallback$2 = NativeMethodsMixinUtils.mountSafeCallback, findNumericNodeHandle$1 = ReactNativeFeatureFlags$2.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack, NativeMethodsMixin = { measure: function(callback) { UIManager.measure(findNumericNodeHandle$1(this), mountSafeCallback$2(this, callback)); }, @@ -2458,7 +2458,7 @@ var ReactNativeBaseComponent_1 = ReactNativeBaseComponent, createReactNativeComp return Constructor.displayName = viewConfig.uiViewClassName, Constructor.viewConfig = viewConfig, Constructor.propTypes = viewConfig.propTypes, Constructor.prototype = new ReactNativeBaseComponent_1(viewConfig), Constructor.prototype.constructor = Constructor, Constructor; -}, createReactNativeComponentClassStack_1 = createReactNativeComponentClassStack, ReactNativeFeatureFlags$3 = require("ReactNativeFeatureFlags"), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? DevOnlyStubShim : createReactNativeComponentClassStack_1, ReactNativeFeatureFlags$4 = require("ReactNativeFeatureFlags"), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack; +}, createReactNativeComponentClassStack_1 = createReactNativeComponentClassStack, ReactNativeFeatureFlags$3 = require('./shims/ReactNativeFeatureFlags'), createReactNativeComponentClass = ReactNativeFeatureFlags$3.useFiber ? DevOnlyStubShim : createReactNativeComponentClassStack_1, ReactNativeFeatureFlags$4 = require('./shims/ReactNativeFeatureFlags'), findNumericNodeHandle$2 = ReactNativeFeatureFlags$4.useFiber ? DevOnlyStubShim : findNumericNodeHandleStack; function takeSnapshot(view, options) { return "number" != typeof view && "window" !== view && (view = findNumericNodeHandle$2(view) || "window"), diff --git a/Libraries/Renderer/shims/NativeMethodsMixin.js b/Libraries/Renderer/shims/NativeMethodsMixin.js index 085c653bfeee8e..aa2f04589d6c50 100644 --- a/Libraries/Renderer/shims/NativeMethodsMixin.js +++ b/Libraries/Renderer/shims/NativeMethodsMixin.js @@ -14,7 +14,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); import type {NativeMethodsMixinType} from 'ReactNativeTypes'; diff --git a/Libraries/Renderer/shims/ReactDebugTool.js b/Libraries/Renderer/shims/ReactDebugTool.js index c532f4bbe9b6b1..72a38bc0ddaa0f 100644 --- a/Libraries/Renderer/shims/ReactDebugTool.js +++ b/Libraries/Renderer/shims/ReactDebugTool.js @@ -13,7 +13,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDebugTool; diff --git a/Libraries/Renderer/shims/ReactGlobalSharedState.js b/Libraries/Renderer/shims/ReactGlobalSharedState.js index a2b58402019e75..25f9cfb8fda6d1 100644 --- a/Libraries/Renderer/shims/ReactGlobalSharedState.js +++ b/Libraries/Renderer/shims/ReactGlobalSharedState.js @@ -13,7 +13,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactGlobalSharedState; diff --git a/Libraries/Renderer/shims/ReactNative.js b/Libraries/Renderer/shims/ReactNative.js index ed27f10253cf07..52451b9e545c56 100644 --- a/Libraries/Renderer/shims/ReactNative.js +++ b/Libraries/Renderer/shims/ReactNative.js @@ -11,7 +11,7 @@ */ 'use strict'; -const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags'); +const ReactNativeFeatureFlags = require('./ReactNativeFeatureFlags'); import type {ReactNativeType} from 'ReactNativeTypes'; @@ -19,12 +19,12 @@ let ReactNative; if (__DEV__) { ReactNative = ReactNativeFeatureFlags.useFiber - ? require('ReactNativeFiber-dev') - : require('ReactNativeStack-dev'); + ? require('../ReactNativeFiber-dev') + : require('../ReactNativeStack-dev'); } else { ReactNative = ReactNativeFeatureFlags.useFiber - ? require('ReactNativeFiber-prod') - : require('ReactNativeStack-prod'); + ? require('../ReactNativeFiber-prod') + : require('../ReactNativeStack-prod'); } module.exports = (ReactNative: ReactNativeType); diff --git a/Libraries/Renderer/shims/ReactNativeComponentTree.js b/Libraries/Renderer/shims/ReactNativeComponentTree.js index 92672f3e8fcce7..3b485376813bde 100644 --- a/Libraries/Renderer/shims/ReactNativeComponentTree.js +++ b/Libraries/Renderer/shims/ReactNativeComponentTree.js @@ -14,7 +14,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativeComponentTree; diff --git a/Libraries/Renderer/shims/ReactNativePropRegistry.js b/Libraries/Renderer/shims/ReactNativePropRegistry.js index d72d46018351fa..a1a7e70266d86d 100644 --- a/Libraries/Renderer/shims/ReactNativePropRegistry.js +++ b/Libraries/Renderer/shims/ReactNativePropRegistry.js @@ -14,7 +14,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativePropRegistry; diff --git a/Libraries/Renderer/shims/ReactPerf.js b/Libraries/Renderer/shims/ReactPerf.js index e879d267a80ca2..91f8982c7a8775 100644 --- a/Libraries/Renderer/shims/ReactPerf.js +++ b/Libraries/Renderer/shims/ReactPerf.js @@ -13,6 +13,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf; diff --git a/Libraries/Renderer/shims/TouchHistoryMath.js b/Libraries/Renderer/shims/TouchHistoryMath.js index 339bfe03f94f5a..9e1068d6430657 100644 --- a/Libraries/Renderer/shims/TouchHistoryMath.js +++ b/Libraries/Renderer/shims/TouchHistoryMath.js @@ -13,7 +13,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.TouchHistoryMath; diff --git a/Libraries/Renderer/shims/createReactNativeComponentClass.js b/Libraries/Renderer/shims/createReactNativeComponentClass.js index 6934beb791d84c..43fdab5b9a71e6 100644 --- a/Libraries/Renderer/shims/createReactNativeComponentClass.js +++ b/Libraries/Renderer/shims/createReactNativeComponentClass.js @@ -14,7 +14,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.createReactNativeComponentClass; diff --git a/Libraries/Renderer/shims/takeSnapshot.js b/Libraries/Renderer/shims/takeSnapshot.js index e594b97837be18..2e339fd6bb2a09 100644 --- a/Libraries/Renderer/shims/takeSnapshot.js +++ b/Libraries/Renderer/shims/takeSnapshot.js @@ -13,7 +13,7 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactNative'); +} = require('./ReactNative'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.takeSnapshot; diff --git a/Libraries/Sample/Sample.ios.js b/Libraries/Sample/Sample.ios.js index fd94afe0a68e02..d2338d9704d814 100644 --- a/Libraries/Sample/Sample.ios.js +++ b/Libraries/Sample/Sample.ios.js @@ -4,7 +4,7 @@ */ 'use strict'; -var NativeSample = require('NativeModules').Sample; +var NativeSample = require('../BatchedBridge/NativeModules').Sample; /** * High-level docs for the Sample iOS API can be written here. diff --git a/Libraries/Settings/Settings.ios.js b/Libraries/Settings/Settings.ios.js index beda544b43e51c..2392276cf31330 100644 --- a/Libraries/Settings/Settings.ios.js +++ b/Libraries/Settings/Settings.ios.js @@ -11,8 +11,8 @@ */ 'use strict'; -var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); -var RCTSettingsManager = require('NativeModules').SettingsManager; +var RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); +var RCTSettingsManager = require('../BatchedBridge/NativeModules').SettingsManager; var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Share/Share.js b/Libraries/Share/Share.js index 4f109367b9ba65..63b1edf5a41096 100644 --- a/Libraries/Share/Share.js +++ b/Libraries/Share/Share.js @@ -11,15 +11,15 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('../Utilities/Platform'); const invariant = require('fbjs/lib/invariant'); -const processColor = require('processColor'); +const processColor = require('../StyleSheet/processColor'); const { ActionSheetManager, ShareModule -} = require('NativeModules'); +} = require('../BatchedBridge/NativeModules'); type Content = { title?: string, message: string } | { title?: string, url: string }; type Options = { dialogTitle?: string, excludeActivityTypes?: Array, tintColor?: string }; diff --git a/Libraries/Storage/AsyncStorage.js b/Libraries/Storage/AsyncStorage.js index 0ba87ed6c18b9c..a911319cfc5b4f 100644 --- a/Libraries/Storage/AsyncStorage.js +++ b/Libraries/Storage/AsyncStorage.js @@ -13,7 +13,7 @@ */ 'use strict'; -const NativeModules = require('NativeModules'); +const NativeModules = require('../BatchedBridge/NativeModules'); // Use RocksDB if available, then SQLite, then file storage. const RCTAsyncStorage = NativeModules.AsyncRocksDBStorage || diff --git a/Libraries/StyleSheet/ColorPropType.js b/Libraries/StyleSheet/ColorPropType.js index faca884315ee0e..f3c3919965f7ce 100644 --- a/Libraries/StyleSheet/ColorPropType.js +++ b/Libraries/StyleSheet/ColorPropType.js @@ -10,7 +10,7 @@ */ 'use strict'; -var normalizeColor = require('normalizeColor'); +var normalizeColor = require('./normalizeColor'); var colorPropType = function(isRequired, props, propName, componentName, location, propFullName) { var color = props[propName]; diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js index 66783fd85ecb32..a2094752b2db3e 100644 --- a/Libraries/StyleSheet/EdgeInsetsPropType.js +++ b/Libraries/StyleSheet/EdgeInsetsPropType.js @@ -13,7 +13,7 @@ const PropTypes = require('prop-types'); -const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); +const createStrictShapeTypeChecker = require('../Utilities/createStrictShapeTypeChecker'); const EdgeInsetsPropType = createStrictShapeTypeChecker({ top: PropTypes.number, diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js index 7257e365dd97d0..42f8f53433ba56 100644 --- a/Libraries/StyleSheet/PointPropType.js +++ b/Libraries/StyleSheet/PointPropType.js @@ -13,7 +13,7 @@ var PropTypes = require('prop-types'); -var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); +var createStrictShapeTypeChecker = require('../Utilities/createStrictShapeTypeChecker'); var PointPropType = createStrictShapeTypeChecker({ x: PropTypes.number, diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js index 468c157b12d2de..fbf32ddec48a69 100644 --- a/Libraries/StyleSheet/StyleSheet.js +++ b/Libraries/StyleSheet/StyleSheet.js @@ -11,12 +11,12 @@ */ 'use strict'; -var PixelRatio = require('PixelRatio'); -var ReactNativePropRegistry = require('ReactNativePropRegistry'); -var ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); -var StyleSheetValidation = require('StyleSheetValidation'); +var PixelRatio = require('../Utilities/PixelRatio'); +var ReactNativePropRegistry = require('../Renderer/shims/ReactNativePropRegistry'); +var ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes'); +var StyleSheetValidation = require('./StyleSheetValidation'); -var flatten = require('flattenStyle'); +var flatten = require('./flattenStyle'); export type Styles = {[key: string]: Object}; export type StyleSheet = {[key: $Keys]: number}; diff --git a/Libraries/StyleSheet/StyleSheetPropType.js b/Libraries/StyleSheet/StyleSheetPropType.js index 5bea428c2e62ba..14a43673ed4ce0 100644 --- a/Libraries/StyleSheet/StyleSheetPropType.js +++ b/Libraries/StyleSheet/StyleSheetPropType.js @@ -11,8 +11,8 @@ */ 'use strict'; -var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); -var flattenStyle = require('flattenStyle'); +var createStrictShapeTypeChecker = require('../Utilities/createStrictShapeTypeChecker'); +var flattenStyle = require('./flattenStyle'); function StyleSheetPropType( shape: {[key: string]: ReactPropsCheckType} diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js index 7fe0f234fc64cf..35df52cbd6cc71 100644 --- a/Libraries/StyleSheet/StyleSheetValidation.js +++ b/Libraries/StyleSheet/StyleSheetValidation.js @@ -11,9 +11,9 @@ */ 'use strict'; -var ImageStylePropTypes = require('ImageStylePropTypes'); -var TextStylePropTypes = require('TextStylePropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); +var ImageStylePropTypes = require('../Image/ImageStylePropTypes'); +var TextStylePropTypes = require('../Text/TextStylePropTypes'); +var ViewStylePropTypes = require('../Components/View/ViewStylePropTypes'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/StyleSheet/TransformPropTypes.js index da3e39e56c805f..616d50a8031f58 100644 --- a/Libraries/StyleSheet/TransformPropTypes.js +++ b/Libraries/StyleSheet/TransformPropTypes.js @@ -13,7 +13,7 @@ var ReactPropTypes = require('prop-types'); -var deprecatedPropType = require('deprecatedPropType'); +var deprecatedPropType = require('../Utilities/deprecatedPropType'); var TransformMatrixPropType = function( props : Object, diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js index de6177f995301b..c108c36e5e9855 100644 --- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js +++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var flattenStyle = require('flattenStyle'); +var flattenStyle = require('../flattenStyle'); describe('flattenStyle', () => { diff --git a/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js index bf7a285f76c7f6..c89ae43d06b40e 100644 --- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js +++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var normalizeColor = require('normalizeColor'); +var normalizeColor = require('../normalizeColor'); describe('normalizeColor', function() { it('should accept only spec compliant colors', function() { diff --git a/Libraries/StyleSheet/__tests__/processColor-test.js b/Libraries/StyleSheet/__tests__/processColor-test.js index f26d5d6e3f6656..6593b5aa9b400b 100644 --- a/Libraries/StyleSheet/__tests__/processColor-test.js +++ b/Libraries/StyleSheet/__tests__/processColor-test.js @@ -8,8 +8,8 @@ */ 'use strict'; -const {OS} = require('Platform'); -const processColor = require('processColor'); +const {OS} = require('../../Utilities/Platform'); +const processColor = require('../processColor'); const platformSpecific = OS === 'android' ? unsigned => unsigned | 0 //eslint-disable-line no-bitwise diff --git a/Libraries/StyleSheet/__tests__/processTransform-test.js b/Libraries/StyleSheet/__tests__/processTransform-test.js index 3f4eaacdbafec7..37791670507653 100644 --- a/Libraries/StyleSheet/__tests__/processTransform-test.js +++ b/Libraries/StyleSheet/__tests__/processTransform-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -const processTransform = require('processTransform'); +const processTransform = require('../processTransform'); describe('processTransform', () => { describe('validation', () => { diff --git a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js index c2f586b4414689..d1886506946611 100644 --- a/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js +++ b/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js @@ -8,8 +8,8 @@ */ 'use strict'; -var setNormalizedColorAlpha = require('setNormalizedColorAlpha'); -var normalizeColor = require('normalizeColor'); +var setNormalizedColorAlpha = require('../setNormalizedColorAlpha'); +var normalizeColor = require('../normalizeColor'); describe('setNormalizedColorAlpha', function() { it('should adjust the alpha of the color passed in', function() { diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js index 007349f4dca6b1..f14e3c2eb5e266 100644 --- a/Libraries/StyleSheet/flattenStyle.js +++ b/Libraries/StyleSheet/flattenStyle.js @@ -18,7 +18,7 @@ import type { StyleObj } from 'StyleSheetTypes'; function getStyle(style) { if (ReactNativePropRegistry === undefined) { - ReactNativePropRegistry = require('ReactNativePropRegistry'); + ReactNativePropRegistry = require('../Renderer/shims/ReactNativePropRegistry'); } if (typeof style === 'number') { return ReactNativePropRegistry.getByID(style); diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js index b4b471432334ae..34dc31371fe143 100644 --- a/Libraries/StyleSheet/processColor.js +++ b/Libraries/StyleSheet/processColor.js @@ -11,9 +11,9 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('../Utilities/Platform'); -const normalizeColor = require('normalizeColor'); +const normalizeColor = require('./normalizeColor'); /* eslint no-bitwise: 0 */ function processColor(color?: string | number): ?number { diff --git a/Libraries/StyleSheet/processTransform.js b/Libraries/StyleSheet/processTransform.js index eed0f16caa2aa7..f74f5370a6b8fe 100644 --- a/Libraries/StyleSheet/processTransform.js +++ b/Libraries/StyleSheet/processTransform.js @@ -11,11 +11,11 @@ */ 'use strict'; -var MatrixMath = require('MatrixMath'); -var Platform = require('Platform'); +var MatrixMath = require('../Utilities/MatrixMath'); +var Platform = require('../Utilities/Platform'); var invariant = require('fbjs/lib/invariant'); -var stringifySafe = require('stringifySafe'); +var stringifySafe = require('../Utilities/stringifySafe'); /** * Generate a transform matrix based on the provided transforms, and use that diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js index 08612175f976af..28ba4ceecbafcc 100644 --- a/Libraries/Text/Text.js +++ b/Libraries/Text/Text.js @@ -11,21 +11,21 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const NativeMethodsMixin = require('NativeMethodsMixin'); -const Platform = require('Platform'); -const React = require('React'); +const ColorPropType = require('../StyleSheet/ColorPropType'); +const EdgeInsetsPropType = require('../StyleSheet/EdgeInsetsPropType'); +const NativeMethodsMixin = require('../Renderer/shims/NativeMethodsMixin'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -const StyleSheetPropType = require('StyleSheetPropType'); -const TextStylePropTypes = require('TextStylePropTypes'); -const Touchable = require('Touchable'); +const ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes'); +const StyleSheetPropType = require('../StyleSheet/StyleSheetPropType'); +const TextStylePropTypes = require('./TextStylePropTypes'); +const Touchable = require('../Components/Touchable/Touchable'); const createReactClass = require('create-react-class'); -const createReactNativeComponentClass = require('createReactNativeComponentClass'); -const mergeFast = require('mergeFast'); -const processColor = require('processColor'); +const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass'); +const mergeFast = require('../Utilities/mergeFast'); +const processColor = require('../StyleSheet/processColor'); const stylePropType = StyleSheetPropType(TextStylePropTypes); diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js index d92708683d981e..7e016c08be8d14 100644 --- a/Libraries/Text/TextStylePropTypes.js +++ b/Libraries/Text/TextStylePropTypes.js @@ -11,9 +11,9 @@ */ 'use strict'; -const ColorPropType = require('ColorPropType'); +const ColorPropType = require('../StyleSheet/ColorPropType'); const ReactPropTypes = require('prop-types'); -const ViewStylePropTypes = require('ViewStylePropTypes'); +const ViewStylePropTypes = require('../Components/View/ViewStylePropTypes'); const TextStylePropTypes = { ...ViewStylePropTypes, diff --git a/Libraries/Utilities/BackAndroid.js b/Libraries/Utilities/BackAndroid.js index 0289b34c65d82c..c5525666013799 100644 --- a/Libraries/Utilities/BackAndroid.js +++ b/Libraries/Utilities/BackAndroid.js @@ -14,7 +14,7 @@ 'use strict'; -var BackHandler = require('BackHandler'); +var BackHandler = require('./BackHandler'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js index d8ca9b5eb567c9..923adf53115a84 100644 --- a/Libraries/Utilities/BackHandler.android.js +++ b/Libraries/Utilities/BackHandler.android.js @@ -11,8 +11,8 @@ 'use strict'; -var DeviceEventManager = require('NativeModules').DeviceEventManager; -var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +var DeviceEventManager = require('../BatchedBridge/NativeModules').DeviceEventManager; +var RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); var DEVICE_BACK_EVENT = 'hardwareBackPress'; diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js index 958ec69e5c0558..6826fc823d405a 100644 --- a/Libraries/Utilities/BackHandler.ios.js +++ b/Libraries/Utilities/BackHandler.ios.js @@ -14,8 +14,8 @@ 'use strict'; -const Platform = require('Platform'); -const TVEventHandler = require('TVEventHandler'); +const Platform = require('./Platform'); +const TVEventHandler = require('../Components/AppleTV/TVEventHandler'); type BackPressEventName = $Enum<{ backPress: string, diff --git a/Libraries/Utilities/DeviceInfo.js b/Libraries/Utilities/DeviceInfo.js index 819916b153f84a..aaf38e98713842 100644 --- a/Libraries/Utilities/DeviceInfo.js +++ b/Libraries/Utilities/DeviceInfo.js @@ -11,7 +11,7 @@ */ 'use strict'; -const DeviceInfo = require('NativeModules').DeviceInfo; +const DeviceInfo = require('../BatchedBridge/NativeModules').DeviceInfo; const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js index 76b4098b8589cd..26b319a546bcfb 100644 --- a/Libraries/Utilities/Dimensions.js +++ b/Libraries/Utilities/Dimensions.js @@ -11,10 +11,10 @@ */ 'use strict'; -var DeviceInfo = require('DeviceInfo'); -var EventEmitter = require('EventEmitter'); -var Platform = require('Platform'); -var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +var DeviceInfo = require('./DeviceInfo'); +var EventEmitter = require('../vendor/emitter/EventEmitter'); +var Platform = require('./Platform'); +var RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Utilities/HMRClient.js b/Libraries/Utilities/HMRClient.js index c0443b069787e7..40660d0419b340 100644 --- a/Libraries/Utilities/HMRClient.js +++ b/Libraries/Utilities/HMRClient.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('./Platform'); const invariant = require('fbjs/lib/invariant'); /** @@ -27,7 +27,7 @@ const HMRClient = { // need to require WebSocket inside of `enable` function because // this module is defined as a `polyfillGlobal`. // See `InitializeJavascriptAppEngine.js` - const WebSocket = require('WebSocket'); + const WebSocket = require('../WebSocket/WebSocket'); const wsHostPort = port !== null && port !== '' ? `${host}:${port}` @@ -73,7 +73,7 @@ Error: ${e.message}` }; activeWS.onmessage = ({data}) => { // Moving to top gives errors due to NativeModules not being initialized - const HMRLoadingView = require('HMRLoadingView'); + const HMRLoadingView = require('./HMRLoadingView'); data = JSON.parse(data); @@ -91,10 +91,10 @@ Error: ${e.message}` } = data.body; if (Platform.OS === 'ios') { - const RCTRedBox = require('NativeModules').RedBox; + const RCTRedBox = require('../BatchedBridge/NativeModules').RedBox; RCTRedBox && RCTRedBox.dismiss && RCTRedBox.dismiss(); } else { - const RCTExceptionsManager = require('NativeModules').ExceptionsManager; + const RCTExceptionsManager = require('../BatchedBridge/NativeModules').ExceptionsManager; RCTExceptionsManager && RCTExceptionsManager.dismissRedbox && RCTExceptionsManager.dismissRedbox(); } diff --git a/Libraries/Utilities/HMRLoadingView.android.js b/Libraries/Utilities/HMRLoadingView.android.js index 82075ffa1920b6..3d8a06648e91be 100644 --- a/Libraries/Utilities/HMRLoadingView.android.js +++ b/Libraries/Utilities/HMRLoadingView.android.js @@ -12,7 +12,7 @@ 'use strict'; -var ToastAndroid = require('ToastAndroid'); +var ToastAndroid = require('../Components/ToastAndroid/ToastAndroid'); const TOAST_SHORT_DELAY = 2000; diff --git a/Libraries/Utilities/HMRLoadingView.ios.js b/Libraries/Utilities/HMRLoadingView.ios.js index ea0559fc41d0dd..9583363b8a63af 100644 --- a/Libraries/Utilities/HMRLoadingView.ios.js +++ b/Libraries/Utilities/HMRLoadingView.ios.js @@ -12,8 +12,8 @@ 'use strict'; -const processColor = require('processColor'); -const { DevLoadingView } = require('NativeModules'); +const processColor = require('../StyleSheet/processColor'); +const { DevLoadingView } = require('../BatchedBridge/NativeModules'); class HMRLoadingView { static showMessage(message: string) { diff --git a/Libraries/Utilities/HeapCapture.js b/Libraries/Utilities/HeapCapture.js index d686a903c8866a..83cc2a874d0c80 100644 --- a/Libraries/Utilities/HeapCapture.js +++ b/Libraries/Utilities/HeapCapture.js @@ -21,7 +21,7 @@ var HeapCapture = { console.log('HeapCapture.captureHeap error: ' + e.toString()); error = e.toString(); } - require('NativeModules').JSCHeapCapture.captureComplete(path, error); + require('../BatchedBridge/NativeModules').JSCHeapCapture.captureComplete(path, error); }, }; diff --git a/Libraries/Utilities/PerformanceLogger.js b/Libraries/Utilities/PerformanceLogger.js index 39122e0e9f1b69..a7c6edfc23e580 100644 --- a/Libraries/Utilities/PerformanceLogger.js +++ b/Libraries/Utilities/PerformanceLogger.js @@ -12,9 +12,9 @@ */ 'use strict'; -const Systrace = require('Systrace'); +const Systrace = require('../Performance/Systrace'); -const infoLog = require('infoLog'); +const infoLog = require('./infoLog'); const performanceNow = global.nativePerformanceNow || require('fbjs/lib/performanceNow'); diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js index e7ab32ca5685b6..20d7815fa9b5fa 100644 --- a/Libraries/Utilities/PixelRatio.js +++ b/Libraries/Utilities/PixelRatio.js @@ -11,7 +11,7 @@ */ 'use strict'; -var Dimensions = require('Dimensions'); +var Dimensions = require('./Dimensions'); /** * PixelRatio class gives access to the device pixel density. diff --git a/Libraries/Utilities/Platform.android.js b/Libraries/Utilities/Platform.android.js index 4bab19c5287227..dc9acdb1a1cd70 100644 --- a/Libraries/Utilities/Platform.android.js +++ b/Libraries/Utilities/Platform.android.js @@ -12,7 +12,7 @@ 'use strict'; -const NativeModules = require('NativeModules'); +const NativeModules = require('../BatchedBridge/NativeModules'); const Platform = { OS: 'android', diff --git a/Libraries/Utilities/Platform.ios.js b/Libraries/Utilities/Platform.ios.js index 3238a44627fe9c..510f58e15aa37e 100644 --- a/Libraries/Utilities/Platform.ios.js +++ b/Libraries/Utilities/Platform.ios.js @@ -12,7 +12,7 @@ 'use strict'; -const NativeModules = require('NativeModules'); +const NativeModules = require('../BatchedBridge/NativeModules'); const Platform = { OS: 'ios', diff --git a/Libraries/Utilities/__tests__/MatrixMath-test.js b/Libraries/Utilities/__tests__/MatrixMath-test.js index ac60859efef8a3..f14cf316c705ae 100644 --- a/Libraries/Utilities/__tests__/MatrixMath-test.js +++ b/Libraries/Utilities/__tests__/MatrixMath-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var MatrixMath = require('MatrixMath'); +var MatrixMath = require('../MatrixMath'); function degreesToRadians(degrees) { return degrees * Math.PI / 180; diff --git a/Libraries/Utilities/__tests__/SceneTracker-test.js b/Libraries/Utilities/__tests__/SceneTracker-test.js index 345b60f5e19c40..199393187a1326 100644 --- a/Libraries/Utilities/__tests__/SceneTracker-test.js +++ b/Libraries/Utilities/__tests__/SceneTracker-test.js @@ -9,7 +9,7 @@ */ 'use strict'; -const SceneTracker = require('SceneTracker'); +const SceneTracker = require('../SceneTracker'); describe('setActiveScene', function() { diff --git a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js index c919e314ddcede..7faf3d326745b2 100644 --- a/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js +++ b/Libraries/Utilities/__tests__/buildStyleInterpolator-test.js @@ -9,7 +9,7 @@ */ 'use strict'; -var buildStyleInterpolator = require('buildStyleInterpolator'); +var buildStyleInterpolator = require('../buildStyleInterpolator'); var validateEmpty = function(interpolator, value, validator) { var emptyObject = {}; diff --git a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js index b8f5a33db7e3ba..13136be215ff14 100644 --- a/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js +++ b/Libraries/Utilities/__tests__/deepFreezeAndThrowOnMutationInDev-test.js @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); +var deepFreezeAndThrowOnMutationInDev = require('../deepFreezeAndThrowOnMutationInDev'); describe('deepFreezeAndThrowOnMutationInDev', function() { diff --git a/Libraries/Utilities/__tests__/groupByEveryN-test.js b/Libraries/Utilities/__tests__/groupByEveryN-test.js index c1b54b40eca7e7..0d60999d6faa07 100644 --- a/Libraries/Utilities/__tests__/groupByEveryN-test.js +++ b/Libraries/Utilities/__tests__/groupByEveryN-test.js @@ -10,7 +10,7 @@ 'use strict'; describe('groupByEveryN', () => { - var groupByEveryN = require('groupByEveryN'); + var groupByEveryN = require('../groupByEveryN'); it('should group by with different n', () => { expect(groupByEveryN([1, 2, 3, 4, 5, 6, 7, 8, 9], 1)) diff --git a/Libraries/Utilities/__tests__/mapWithSeparator-test.js b/Libraries/Utilities/__tests__/mapWithSeparator-test.js index 0d4180d4e2b7a6..0ef67c05048bfc 100644 --- a/Libraries/Utilities/__tests__/mapWithSeparator-test.js +++ b/Libraries/Utilities/__tests__/mapWithSeparator-test.js @@ -9,7 +9,7 @@ 'use strict'; describe('mapWithSeparator', () => { - const mapWithSeparator = require('mapWithSeparator'); + const mapWithSeparator = require('../mapWithSeparator'); it('mapWithSeparator returns expected results', () => { const array = [1, 2, 3]; diff --git a/Libraries/Utilities/__tests__/truncate-test.js b/Libraries/Utilities/__tests__/truncate-test.js index 5e0598d16dc104..84de67b178b486 100644 --- a/Libraries/Utilities/__tests__/truncate-test.js +++ b/Libraries/Utilities/__tests__/truncate-test.js @@ -11,7 +11,7 @@ describe('truncate', () => { - var truncate = require('truncate'); + var truncate = require('../truncate'); it('should truncate', () => { expect(truncate('Hello, world.', 5)) diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js index 884e8a96b9413d..7441f32465d4bf 100644 --- a/Libraries/Utilities/createStrictShapeTypeChecker.js +++ b/Libraries/Utilities/createStrictShapeTypeChecker.js @@ -12,7 +12,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); -var merge = require('merge'); +var merge = require('../vendor/core/merge'); function createStrictShapeTypeChecker( shapeTypes: {[key: string]: ReactPropsCheckType} diff --git a/Libraries/Utilities/deprecatedPropType.js b/Libraries/Utilities/deprecatedPropType.js index 26a1a46bf4c947..72cf762b63701f 100644 --- a/Libraries/Utilities/deprecatedPropType.js +++ b/Libraries/Utilities/deprecatedPropType.js @@ -11,7 +11,7 @@ */ 'use strict'; -const UIManager = require('UIManager'); +const UIManager = require('../ReactNative/UIManager'); /** * Adds a deprecation warning when the prop is used. diff --git a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js index 1337521e64760d..8b0760bc44e326 100644 --- a/Libraries/Utilities/differ/__tests__/deepDiffer-test.js +++ b/Libraries/Utilities/differ/__tests__/deepDiffer-test.js @@ -8,7 +8,7 @@ */ 'use strict'; -var deepDiffer = require('deepDiffer'); +var deepDiffer = require('../deepDiffer'); describe('deepDiffer', function() { it('should diff primitives of the same type', () => { diff --git a/Libraries/Utilities/dismissKeyboard.js b/Libraries/Utilities/dismissKeyboard.js index 183fa4a88caf3a..72b9ec2b35f920 100644 --- a/Libraries/Utilities/dismissKeyboard.js +++ b/Libraries/Utilities/dismissKeyboard.js @@ -12,7 +12,7 @@ */ 'use strict'; -var TextInputState = require('TextInputState'); +var TextInputState = require('../Components/TextInput/TextInputState'); function dismissKeyboard() { TextInputState.blurTextInput(TextInputState.currentlyFocusedField()); diff --git a/Libraries/Vibration/Vibration.js b/Libraries/Vibration/Vibration.js index e3d9e5a3959217..076ea8b8db9b8f 100644 --- a/Libraries/Vibration/Vibration.js +++ b/Libraries/Vibration/Vibration.js @@ -11,8 +11,8 @@ */ 'use strict'; -var RCTVibration = require('NativeModules').Vibration; -var Platform = require('Platform'); +var RCTVibration = require('../BatchedBridge/NativeModules').Vibration; +var Platform = require('../Utilities/Platform'); /** * The Vibration API is exposed at `Vibration.vibrate()`. diff --git a/Libraries/Vibration/VibrationIOS.ios.js b/Libraries/Vibration/VibrationIOS.ios.js index 56da5a815b12dc..5e6c8ac2ba698c 100644 --- a/Libraries/Vibration/VibrationIOS.ios.js +++ b/Libraries/Vibration/VibrationIOS.ios.js @@ -11,7 +11,7 @@ */ 'use strict'; -var RCTVibration = require('NativeModules').Vibration; +var RCTVibration = require('../BatchedBridge/NativeModules').Vibration; var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/WebSocket/WebSocket.js b/Libraries/WebSocket/WebSocket.js index 83896e969e4684..96fadc80fc900c 100644 --- a/Libraries/WebSocket/WebSocket.js +++ b/Libraries/WebSocket/WebSocket.js @@ -11,15 +11,15 @@ */ 'use strict'; -const Blob = require('Blob'); +const Blob = require('../Blob/Blob'); const EventTarget = require('event-target-shim'); -const NativeEventEmitter = require('NativeEventEmitter'); -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); -const WebSocketEvent = require('WebSocketEvent'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const Platform = require('../Utilities/Platform'); +const WebSocketEvent = require('./WebSocketEvent'); const base64 = require('base64-js'); -const binaryToBase64 = require('binaryToBase64'); +const binaryToBase64 = require('../Utilities/binaryToBase64'); const invariant = require('fbjs/lib/invariant'); const {WebSocketModule} = NativeModules; diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js index 3ac649a16219d4..10c6830fc092fa 100644 --- a/Libraries/WebSocket/WebSocketInterceptor.js +++ b/Libraries/WebSocket/WebSocketInterceptor.js @@ -10,8 +10,8 @@ */ 'use strict'; -const RCTWebSocketModule = require('NativeModules').WebSocketModule; -const NativeEventEmitter = require('NativeEventEmitter'); +const RCTWebSocketModule = require('../BatchedBridge/NativeModules').WebSocketModule; +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); const base64 = require('base64-js'); diff --git a/Libraries/WebSocket/__tests__/WebSocket-test.js b/Libraries/WebSocket/__tests__/WebSocket-test.js index 83a6b5ab20adc0..204f05dcf7f063 100644 --- a/Libraries/WebSocket/__tests__/WebSocket-test.js +++ b/Libraries/WebSocket/__tests__/WebSocket-test.js @@ -3,14 +3,14 @@ */ 'use strict'; -jest.enableAutomock().unmock('WebSocket'); -jest.setMock('NativeModules', { +jest.enableAutomock().unmock('../WebSocket'); +jest.setMock('../../BatchedBridge/NativeModules', { WebSocketModule: { connect: () => {} } }); -var WebSocket = require('WebSocket'); +var WebSocket = require('../WebSocket'); describe('WebSocket', function() { diff --git a/Libraries/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js index a2ab6bb38a7c3a..984aed1fa62259 100644 --- a/Libraries/promiseRejectionIsError.js +++ b/Libraries/promiseRejectionIsError.js @@ -11,7 +11,7 @@ */ 'use strict'; -require('Promise'); // make sure the default rejection handler is installed +require('./Promise'); // make sure the default rejection handler is installed const rejectionTracking = require('promise/setimmediate/rejection-tracking'); module.exports = () => { diff --git a/Libraries/react-native/react-native-implementation.js b/Libraries/react-native/react-native-implementation.js index bfe032e0b9361f..3ee747c00d25ff 100644 --- a/Libraries/react-native/react-native-implementation.js +++ b/Libraries/react-native/react-native-implementation.js @@ -16,105 +16,105 @@ const invariant = require('fbjs/lib/invariant'); // Export React, plus some native additions. const ReactNative = { // Components - get AccessibilityInfo() { return require('AccessibilityInfo'); }, - get ActivityIndicator() { return require('ActivityIndicator'); }, - get ART() { return require('ReactNativeART'); }, - get Button() { return require('Button'); }, - get DatePickerIOS() { return require('DatePickerIOS'); }, - get DrawerLayoutAndroid() { return require('DrawerLayoutAndroid'); }, - get FlatList() { return require('FlatList'); }, - get Image() { return require('Image'); }, - get ImageBackground() { return require('ImageBackground'); }, - get ImageEditor() { return require('ImageEditor'); }, - get ImageStore() { return require('ImageStore'); }, - get KeyboardAvoidingView() { return require('KeyboardAvoidingView'); }, - get ListView() { return require('ListView'); }, - get MaskedViewIOS() { return require('MaskedViewIOS'); }, - get Modal() { return require('Modal'); }, - get NavigatorIOS() { return require('NavigatorIOS'); }, - get Picker() { return require('Picker'); }, - get PickerIOS() { return require('PickerIOS'); }, - get ProgressBarAndroid() { return require('ProgressBarAndroid'); }, - get ProgressViewIOS() { return require('ProgressViewIOS'); }, - get ScrollView() { return require('ScrollView'); }, - get SectionList() { return require('SectionList'); }, - get SegmentedControlIOS() { return require('SegmentedControlIOS'); }, - get Slider() { return require('Slider'); }, - get SnapshotViewIOS() { return require('SnapshotViewIOS'); }, - get Switch() { return require('Switch'); }, - get RefreshControl() { return require('RefreshControl'); }, - get StatusBar() { return require('StatusBar'); }, - get SwipeableListView() { return require('SwipeableListView'); }, - get TabBarIOS() { return require('TabBarIOS'); }, - get Text() { return require('Text'); }, - get TextInput() { return require('TextInput'); }, - get ToastAndroid() { return require('ToastAndroid'); }, - get ToolbarAndroid() { return require('ToolbarAndroid'); }, - get Touchable() { return require('Touchable'); }, - get TouchableHighlight() { return require('TouchableHighlight'); }, - get TouchableNativeFeedback() { return require('TouchableNativeFeedback'); }, - get TouchableOpacity() { return require('TouchableOpacity'); }, - get TouchableWithoutFeedback() { return require('TouchableWithoutFeedback'); }, - get View() { return require('View'); }, - get ViewPagerAndroid() { return require('ViewPagerAndroid'); }, - get VirtualizedList() { return require('VirtualizedList'); }, - get WebView() { return require('WebView'); }, + get AccessibilityInfo() { return require('../Components/AccessibilityInfo/AccessibilityInfo'); }, + get ActivityIndicator() { return require('../Components/ActivityIndicator/ActivityIndicator'); }, + get ART() { return require('../ART/ReactNativeART'); }, + get Button() { return require('../Components/Button'); }, + get DatePickerIOS() { return require('../Components/DatePicker/DatePickerIOS'); }, + get DrawerLayoutAndroid() { return require('../Components/DrawerAndroid/DrawerLayoutAndroid'); }, + get FlatList() { return require('../Lists/FlatList'); }, + get Image() { return require('../Image/Image'); }, + get ImageBackground() { return require('../Image/ImageBackground'); }, + get ImageEditor() { return require('../Image/ImageEditor'); }, + get ImageStore() { return require('../Image/ImageStore'); }, + get KeyboardAvoidingView() { return require('../Components/Keyboard/KeyboardAvoidingView'); }, + get ListView() { return require('../Lists/ListView/ListView'); }, + get MaskedViewIOS() { return require('../Components/MaskedView/MaskedViewIOS'); }, + get Modal() { return require('../Modal/Modal'); }, + get NavigatorIOS() { return require('../Components/Navigation/NavigatorIOS'); }, + get Picker() { return require('../Components/Picker/Picker'); }, + get PickerIOS() { return require('../Components/Picker/PickerIOS'); }, + get ProgressBarAndroid() { return require('../Components/ProgressBarAndroid/ProgressBarAndroid'); }, + get ProgressViewIOS() { return require('../Components/ProgressViewIOS/ProgressViewIOS'); }, + get ScrollView() { return require('../Components/ScrollView/ScrollView'); }, + get SectionList() { return require('../Lists/SectionList'); }, + get SegmentedControlIOS() { return require('../Components/SegmentedControlIOS/SegmentedControlIOS'); }, + get Slider() { return require('../Components/Slider/Slider'); }, + get SnapshotViewIOS() { return require('../RCTTest/SnapshotViewIOS'); }, + get Switch() { return require('../Components/Switch/Switch'); }, + get RefreshControl() { return require('../Components/RefreshControl/RefreshControl'); }, + get StatusBar() { return require('../Components/StatusBar/StatusBar'); }, + get SwipeableListView() { return require('../Experimental/SwipeableRow/SwipeableListView'); }, + get TabBarIOS() { return require('../Components/TabBarIOS/TabBarIOS'); }, + get Text() { return require('../Text/Text'); }, + get TextInput() { return require('../Components/TextInput/TextInput'); }, + get ToastAndroid() { return require('../Components/ToastAndroid/ToastAndroid'); }, + get ToolbarAndroid() { return require('../Components/ToolbarAndroid/ToolbarAndroid'); }, + get Touchable() { return require('../Components/Touchable/Touchable'); }, + get TouchableHighlight() { return require('../Components/Touchable/TouchableHighlight'); }, + get TouchableNativeFeedback() { return require('../Components/Touchable/TouchableNativeFeedback'); }, + get TouchableOpacity() { return require('../Components/Touchable/TouchableOpacity'); }, + get TouchableWithoutFeedback() { return require('../Components/Touchable/TouchableWithoutFeedback'); }, + get View() { return require('../Components/View/View'); }, + get ViewPagerAndroid() { return require('../Components/ViewPager/ViewPagerAndroid'); }, + get VirtualizedList() { return require('../Lists/VirtualizedList'); }, + get WebView() { return require('../Components/WebView/WebView'); }, // APIs - get ActionSheetIOS() { return require('ActionSheetIOS'); }, - get Alert() { return require('Alert'); }, - get AlertIOS() { return require('AlertIOS'); }, - get Animated() { return require('Animated'); }, - get AppRegistry() { return require('AppRegistry'); }, - get AppState() { return require('AppState'); }, - get AsyncStorage() { return require('AsyncStorage'); }, - get BackAndroid() { return require('BackAndroid'); }, // deprecated: use BackHandler instead - get BackHandler() { return require('BackHandler'); }, - get CameraRoll() { return require('CameraRoll'); }, - get Clipboard() { return require('Clipboard'); }, - get DatePickerAndroid() { return require('DatePickerAndroid'); }, - get DeviceInfo() { return require('DeviceInfo'); }, - get Dimensions() { return require('Dimensions'); }, - get Easing() { return require('Easing'); }, - get findNodeHandle() { return require('ReactNative').findNodeHandle; }, - get I18nManager() { return require('I18nManager'); }, - get ImagePickerIOS() { return require('ImagePickerIOS'); }, - get InteractionManager() { return require('InteractionManager'); }, - get Keyboard() { return require('Keyboard'); }, - get LayoutAnimation() { return require('LayoutAnimation'); }, - get Linking() { return require('Linking'); }, - get NativeEventEmitter() { return require('NativeEventEmitter'); }, - get NetInfo() { return require('NetInfo'); }, - get PanResponder() { return require('PanResponder'); }, - get PermissionsAndroid() { return require('PermissionsAndroid'); }, - get PixelRatio() { return require('PixelRatio'); }, - get PushNotificationIOS() { return require('PushNotificationIOS'); }, - get Settings() { return require('Settings'); }, - get Share() { return require('Share'); }, - get StatusBarIOS() { return require('StatusBarIOS'); }, - get StyleSheet() { return require('StyleSheet'); }, - get Systrace() { return require('Systrace'); }, - get TimePickerAndroid() { return require('TimePickerAndroid'); }, - get TVEventHandler() { return require('TVEventHandler'); }, - get UIManager() { return require('UIManager'); }, - get unstable_batchedUpdates() { return require('ReactNative').unstable_batchedUpdates; }, - get Vibration() { return require('Vibration'); }, - get VibrationIOS() { return require('VibrationIOS'); }, + get ActionSheetIOS() { return require('../ActionSheetIOS/ActionSheetIOS'); }, + get Alert() { return require('../Alert/Alert'); }, + get AlertIOS() { return require('../Alert/AlertIOS'); }, + get Animated() { return require('../Animated/src/Animated'); }, + get AppRegistry() { return require('../ReactNative/AppRegistry'); }, + get AppState() { return require('../AppState/AppState'); }, + get AsyncStorage() { return require('../Storage/AsyncStorage'); }, + get BackAndroid() { return require('../Utilities/BackAndroid'); }, // deprecated: use BackHandler instead + get BackHandler() { return require('../Utilities/BackHandler'); }, + get CameraRoll() { return require('../CameraRoll/CameraRoll'); }, + get Clipboard() { return require('../Components/Clipboard/Clipboard'); }, + get DatePickerAndroid() { return require('../Components/DatePickerAndroid/DatePickerAndroid'); }, + get DeviceInfo() { return require('../Utilities/DeviceInfo'); }, + get Dimensions() { return require('../Utilities/Dimensions'); }, + get Easing() { return require('../Animated/src/Easing'); }, + get findNodeHandle() { return require('../Renderer/shims/ReactNative').findNodeHandle; }, + get I18nManager() { return require('../ReactNative/I18nManager'); }, + get ImagePickerIOS() { return require('../CameraRoll/ImagePickerIOS'); }, + get InteractionManager() { return require('../Interaction/InteractionManager'); }, + get Keyboard() { return require('../Components/Keyboard/Keyboard'); }, + get LayoutAnimation() { return require('../LayoutAnimation/LayoutAnimation'); }, + get Linking() { return require('../Linking/Linking'); }, + get NativeEventEmitter() { return require('../EventEmitter/NativeEventEmitter'); }, + get NetInfo() { return require('../Network/NetInfo'); }, + get PanResponder() { return require('../Interaction/PanResponder'); }, + get PermissionsAndroid() { return require('../PermissionsAndroid/PermissionsAndroid'); }, + get PixelRatio() { return require('../Utilities/PixelRatio'); }, + get PushNotificationIOS() { return require('../PushNotificationIOS/PushNotificationIOS'); }, + get Settings() { return require('../Settings/Settings'); }, + get Share() { return require('../Share/Share'); }, + get StatusBarIOS() { return require('../Components/StatusBar/StatusBarIOS'); }, + get StyleSheet() { return require('../StyleSheet/StyleSheet'); }, + get Systrace() { return require('../Performance/Systrace'); }, + get TimePickerAndroid() { return require('../Components/TimePickerAndroid/TimePickerAndroid'); }, + get TVEventHandler() { return require('../Components/AppleTV/TVEventHandler'); }, + get UIManager() { return require('../ReactNative/UIManager'); }, + get unstable_batchedUpdates() { return require('../Renderer/shims/ReactNative').unstable_batchedUpdates; }, + get Vibration() { return require('../Vibration/Vibration'); }, + get VibrationIOS() { return require('../Vibration/VibrationIOS'); }, // Plugins - get DeviceEventEmitter() { return require('RCTDeviceEventEmitter'); }, - get NativeAppEventEmitter() { return require('RCTNativeAppEventEmitter'); }, - get NativeModules() { return require('NativeModules'); }, - get Platform() { return require('Platform'); }, - get processColor() { return require('processColor'); }, - get requireNativeComponent() { return require('requireNativeComponent'); }, - get takeSnapshot() { return require('takeSnapshot'); }, + get DeviceEventEmitter() { return require('../EventEmitter/RCTDeviceEventEmitter'); }, + get NativeAppEventEmitter() { return require('../EventEmitter/RCTNativeAppEventEmitter'); }, + get NativeModules() { return require('../BatchedBridge/NativeModules'); }, + get Platform() { return require('../Utilities/Platform'); }, + get processColor() { return require('../StyleSheet/processColor'); }, + get requireNativeComponent() { return require('../ReactNative/requireNativeComponent'); }, + get takeSnapshot() { return require('../Renderer/shims/takeSnapshot'); }, // Prop Types - get ColorPropType() { return require('ColorPropType'); }, - get EdgeInsetsPropType() { return require('EdgeInsetsPropType'); }, - get PointPropType() { return require('PointPropType'); }, - get ViewPropTypes() { return require('ViewPropTypes'); }, + get ColorPropType() { return require('../StyleSheet/ColorPropType'); }, + get EdgeInsetsPropType() { return require('../StyleSheet/EdgeInsetsPropType'); }, + get PointPropType() { return require('../StyleSheet/PointPropType'); }, + get ViewPropTypes() { return require('../Components/View/ViewPropTypes'); }, // Deprecated get Navigator() { diff --git a/Libraries/vendor/core/Map.js b/Libraries/vendor/core/Map.js index 33f206fcc1057d..deff85c5c53968 100644 --- a/Libraries/vendor/core/Map.js +++ b/Libraries/vendor/core/Map.js @@ -15,10 +15,10 @@ 'use strict'; -var _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection'); -var guid = require('guid'); +var _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection'); +var guid = require('./guid'); var isNode = require('fbjs/lib/isNode'); -var toIterator = require('toIterator'); +var toIterator = require('./toIterator'); module.exports = (function(global, undefined) { // Since our implementation is spec-compliant for the most part we can safely diff --git a/Libraries/vendor/core/Set.js b/Libraries/vendor/core/Set.js index 658722b6cf0b36..55230072f104f6 100644 --- a/Libraries/vendor/core/Set.js +++ b/Libraries/vendor/core/Set.js @@ -15,10 +15,10 @@ 'use strict'; -var Map = require('Map'); +var Map = require('./Map'); -var _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection'); -var toIterator = require('toIterator'); +var _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection'); +var toIterator = require('./toIterator'); module.exports = (function(global) { // Since our implementation is spec-compliant for the most part we can safely diff --git a/Libraries/vendor/core/merge.js b/Libraries/vendor/core/merge.js index 800c08c1be263a..0881cc7ed9f501 100644 --- a/Libraries/vendor/core/merge.js +++ b/Libraries/vendor/core/merge.js @@ -31,7 +31,7 @@ "use strict"; -var mergeInto = require('mergeInto'); +var mergeInto = require('./mergeInto'); /** * Shallow merges two structures into a return value, without mutating either. diff --git a/Libraries/vendor/core/mergeInto.js b/Libraries/vendor/core/mergeInto.js index 0da86a50cdb419..997039ec8c2452 100644 --- a/Libraries/vendor/core/mergeInto.js +++ b/Libraries/vendor/core/mergeInto.js @@ -32,7 +32,7 @@ "use strict"; -var mergeHelpers = require('mergeHelpers'); +var mergeHelpers = require('./mergeHelpers'); var checkMergeObjectArg = mergeHelpers.checkMergeObjectArg; var checkMergeIntoObjectArg = mergeHelpers.checkMergeIntoObjectArg; diff --git a/Libraries/vendor/document/selection/DocumentSelectionState.js b/Libraries/vendor/document/selection/DocumentSelectionState.js index 87ce63bcef2a87..030905706a42d9 100644 --- a/Libraries/vendor/document/selection/DocumentSelectionState.js +++ b/Libraries/vendor/document/selection/DocumentSelectionState.js @@ -12,7 +12,7 @@ 'use strict'; -var mixInEventEmitter = require('mixInEventEmitter'); +var mixInEventEmitter = require('../../emitter/mixInEventEmitter'); /** * DocumentSelectionState is responsible for maintaining selection information diff --git a/Libraries/vendor/emitter/EmitterSubscription.js b/Libraries/vendor/emitter/EmitterSubscription.js index fd6f6c1baaa5a5..5caf171b8694d8 100644 --- a/Libraries/vendor/emitter/EmitterSubscription.js +++ b/Libraries/vendor/emitter/EmitterSubscription.js @@ -11,7 +11,7 @@ */ 'use strict'; -const EventSubscription = require('EventSubscription'); +const EventSubscription = require('./EventSubscription'); import type EventEmitter from 'EventEmitter'; import type EventSubscriptionVendor from 'EventSubscriptionVendor'; diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js index 5f981ceeb1b103..c94be30b99c17a 100644 --- a/Libraries/vendor/emitter/EventEmitter.js +++ b/Libraries/vendor/emitter/EventEmitter.js @@ -12,8 +12,8 @@ */ 'use strict'; -const EmitterSubscription = require('EmitterSubscription'); -const EventSubscriptionVendor = require('EventSubscriptionVendor'); +const EmitterSubscription = require('./EmitterSubscription'); +const EventSubscriptionVendor = require('./EventSubscriptionVendor'); const emptyFunction = require('fbjs/lib/emptyFunction'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/vendor/emitter/mixInEventEmitter.js b/Libraries/vendor/emitter/mixInEventEmitter.js index d5db027bb630bc..a901e461068090 100644 --- a/Libraries/vendor/emitter/mixInEventEmitter.js +++ b/Libraries/vendor/emitter/mixInEventEmitter.js @@ -11,9 +11,9 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const EventEmitterWithHolding = require('EventEmitterWithHolding'); -const EventHolder = require('EventHolder'); +const EventEmitter = require('./EventEmitter'); +const EventEmitterWithHolding = require('./EventEmitterWithHolding'); +const EventHolder = require('./EventHolder'); const invariant = require('fbjs/lib/invariant'); const keyOf = require('fbjs/lib/keyOf'); @@ -119,7 +119,7 @@ const EventEmitterMixin = { if (!this.__eventEmitter) { let emitter = new EventEmitter(); if (__DEV__) { - const EventValidator = require('EventValidator'); + const EventValidator = require('./EventValidator'); emitter = EventValidator.addValidation(emitter, this.__types); } diff --git a/RNTester/js/AnimatedGratuitousApp/AnExApp.js b/RNTester/js/AnimatedGratuitousApp/AnExApp.js index 1b0c807a442122..d9b13c67a03609 100644 --- a/RNTester/js/AnimatedGratuitousApp/AnExApp.js +++ b/RNTester/js/AnimatedGratuitousApp/AnExApp.js @@ -21,7 +21,7 @@ var { View, } = ReactNative; -var AnExSet = require('AnExSet'); +var AnExSet = require('./AnExSet'); var CIRCLE_SIZE = 80; var CIRCLE_MARGIN = 18; diff --git a/RNTester/js/CameraRollView.js b/RNTester/js/CameraRollView.js index 3419989fb1262a..49ff79cdffa87a 100644 --- a/RNTester/js/CameraRollView.js +++ b/RNTester/js/CameraRollView.js @@ -27,8 +27,8 @@ var { View, } = ReactNative; -var groupByEveryN = require('groupByEveryN'); -var logError = require('logError'); +var groupByEveryN = require('../../Libraries/Utilities/groupByEveryN'); +var logError = require('../../Libraries/Utilities/logError'); var propTypes = { /** diff --git a/RNTester/js/FlatListExample.js b/RNTester/js/FlatListExample.js index 07ca90be82439a..050d3b34f509b7 100644 --- a/RNTester/js/FlatListExample.js +++ b/RNTester/js/FlatListExample.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Alert = require('Alert'); +const Alert = require('../../Libraries/Alert/Alert'); const React = require('react'); const ReactNative = require('react-native'); const { @@ -23,7 +23,7 @@ const { const RNTesterPage = require('./RNTesterPage'); -const infoLog = require('infoLog'); +const infoLog = require('../../Libraries/Utilities/infoLog'); const { FooterComponent, diff --git a/RNTester/js/ImageCapInsetsExample.js b/RNTester/js/ImageCapInsetsExample.js index 7861d63a8564b3..1aa40a2eff8c2e 100644 --- a/RNTester/js/ImageCapInsetsExample.js +++ b/RNTester/js/ImageCapInsetsExample.js @@ -14,7 +14,7 @@ var React = require('react'); var ReactNative = require('react-native'); -var nativeImageSource = require('nativeImageSource'); +var nativeImageSource = require('../../Libraries/Image/nativeImageSource'); var { Image, StyleSheet, diff --git a/RNTester/js/KeyboardAvoidingViewExample.js b/RNTester/js/KeyboardAvoidingViewExample.js index 1f26e18f9915cb..4b7945de4137bd 100644 --- a/RNTester/js/KeyboardAvoidingViewExample.js +++ b/RNTester/js/KeyboardAvoidingViewExample.js @@ -10,7 +10,7 @@ */ 'use strict'; -const React = require('React'); +const React = require('../../Libraries/react-native/React'); const ReactNative = require('react-native'); const { KeyboardAvoidingView, diff --git a/RNTester/js/ListViewPagingExample.js b/RNTester/js/ListViewPagingExample.js index bf593affcbab1a..5889f1361856b5 100644 --- a/RNTester/js/ListViewPagingExample.js +++ b/RNTester/js/ListViewPagingExample.js @@ -23,7 +23,7 @@ var { View, } = ReactNative; -var NativeModules = require('NativeModules'); +var NativeModules = require('../../Libraries/BatchedBridge/NativeModules'); var { UIManager, } = NativeModules; diff --git a/RNTester/js/MaskedViewExample.js b/RNTester/js/MaskedViewExample.js index 237f560de6ae91..7c0a3a302c76ad 100644 --- a/RNTester/js/MaskedViewExample.js +++ b/RNTester/js/MaskedViewExample.js @@ -12,8 +12,8 @@ 'use strict'; const React = require('react'); -const RNTesterBlock = require('RNTesterBlock'); -const RNTesterPage = require('RNTesterPage'); +const RNTesterBlock = require('./RNTesterBlock'); +const RNTesterPage = require('./RNTesterPage'); const { Animated, Image, diff --git a/RNTester/js/MultiColumnExample.js b/RNTester/js/MultiColumnExample.js index 0315ead7966859..67024a9a26c90e 100644 --- a/RNTester/js/MultiColumnExample.js +++ b/RNTester/js/MultiColumnExample.js @@ -22,7 +22,7 @@ const { const RNTesterPage = require('./RNTesterPage'); -const infoLog = require('infoLog'); +const infoLog = require('../../Libraries/Utilities/infoLog'); const { FooterComponent, diff --git a/RNTester/js/NativeAnimationsExample.js b/RNTester/js/NativeAnimationsExample.js index 84f0fab0576bd2..868982f520f07b 100644 --- a/RNTester/js/NativeAnimationsExample.js +++ b/RNTester/js/NativeAnimationsExample.js @@ -157,7 +157,7 @@ class LoopExample extends React.Component { } } -const RNTesterSettingSwitchRow = require('RNTesterSettingSwitchRow'); +const RNTesterSettingSwitchRow = require('./RNTesterSettingSwitchRow'); class InternalSettings extends React.Component { _stallInterval: ?number; state: {busyTime: number | string, filteredStall: number}; @@ -183,9 +183,9 @@ class InternalSettings extends React.Component { initialValue={false} label="Track JS Stalls" onEnable={() => { - require('JSEventLoopWatchdog').install({thresholdMS: 25}); + require('../../Libraries/Interaction/JSEventLoopWatchdog').install({thresholdMS: 25}); this.setState({busyTime: ''}); - require('JSEventLoopWatchdog').addHandler({ + require('../../Libraries/Interaction/JSEventLoopWatchdog').addHandler({ onStall: ({busyTime}) => this.setState(state => ({ busyTime, diff --git a/RNTester/js/NavigatorIOSExample.js b/RNTester/js/NavigatorIOSExample.js index 8d7582679bd539..f999990f42922c 100644 --- a/RNTester/js/NavigatorIOSExample.js +++ b/RNTester/js/NavigatorIOSExample.js @@ -16,7 +16,7 @@ const ReactNative = require('react-native'); const ViewExample = require('./ViewExample'); const createExamplePage = require('./createExamplePage'); -const nativeImageSource = require('nativeImageSource'); +const nativeImageSource = require('../../Libraries/Image/nativeImageSource'); const { AlertIOS, NavigatorIOS, diff --git a/RNTester/js/PickerExample.js b/RNTester/js/PickerExample.js index f9a6d1323e990b..1dbcf288ed144d 100644 --- a/RNTester/js/PickerExample.js +++ b/RNTester/js/PickerExample.js @@ -13,9 +13,9 @@ const React = require('react'); const ReactNative = require('react-native'); -const StyleSheet = require('StyleSheet'); -const RNTesterBlock = require('RNTesterBlock'); -const RNTesterPage = require('RNTesterPage'); +const StyleSheet = require('../../Libraries/StyleSheet/StyleSheet'); +const RNTesterBlock = require('./RNTesterBlock'); +const RNTesterPage = require('./RNTesterPage'); const { Picker, diff --git a/RNTester/js/ProgressBarAndroidExample.android.js b/RNTester/js/ProgressBarAndroidExample.android.js index cd3bf3dde6211a..77ccc063b1ef7c 100644 --- a/RNTester/js/ProgressBarAndroidExample.android.js +++ b/RNTester/js/ProgressBarAndroidExample.android.js @@ -11,11 +11,11 @@ */ 'use strict'; -var ProgressBar = require('ProgressBarAndroid'); -var React = require('React'); +var ProgressBar = require('../../Libraries/Components/ProgressBarAndroid/ProgressBarAndroid'); +var React = require('../../Libraries/react-native/React'); var createReactClass = require('create-react-class'); -var RNTesterBlock = require('RNTesterBlock'); -var RNTesterPage = require('RNTesterPage'); +var RNTesterBlock = require('./RNTesterBlock'); +var RNTesterPage = require('./RNTesterPage'); var TimerMixin = require('react-timer-mixin'); diff --git a/RNTester/js/PushNotificationIOSExample.js b/RNTester/js/PushNotificationIOSExample.js index b29d36cc55fefb..1dc861400912d5 100644 --- a/RNTester/js/PushNotificationIOSExample.js +++ b/RNTester/js/PushNotificationIOSExample.js @@ -71,7 +71,7 @@ class NotificationExample extends React.Component { } _sendNotification() { - require('RCTDeviceEventEmitter').emit('remoteNotificationReceived', { + require('../../Libraries/EventEmitter/RCTDeviceEventEmitter').emit('remoteNotificationReceived', { remote: true, aps: { alert: 'Sample notification', @@ -84,7 +84,7 @@ class NotificationExample extends React.Component { } _sendLocalNotification() { - require('RCTDeviceEventEmitter').emit('localNotificationReceived', { + require('../../Libraries/EventEmitter/RCTDeviceEventEmitter').emit('localNotificationReceived', { aps: { alert: 'Sample local notification', badge: '+1', diff --git a/RNTester/js/RCTRootViewIOSExample.js b/RNTester/js/RCTRootViewIOSExample.js index d1ccf5cfebc39e..6d6161ed3a4220 100644 --- a/RNTester/js/RCTRootViewIOSExample.js +++ b/RNTester/js/RCTRootViewIOSExample.js @@ -20,7 +20,7 @@ const { View, } = ReactNative; -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../Libraries/ReactNative/requireNativeComponent'); class AppPropertiesUpdateExample extends React.Component { render() { diff --git a/RNTester/js/RNTesterApp.android.js b/RNTester/js/RNTesterApp.android.js index a891429e34eb63..7765624a179516 100644 --- a/RNTester/js/RNTesterApp.android.js +++ b/RNTester/js/RNTesterApp.android.js @@ -11,26 +11,26 @@ */ 'use strict'; -const AppRegistry = require('AppRegistry'); -const AsyncStorage = require('AsyncStorage'); -const BackHandler = require('BackHandler'); -const Dimensions = require('Dimensions'); -const DrawerLayoutAndroid = require('DrawerLayoutAndroid'); -const Linking = require('Linking'); +const AppRegistry = require('../../Libraries/ReactNative/AppRegistry'); +const AsyncStorage = require('../../Libraries/Storage/AsyncStorage'); +const BackHandler = require('../../Libraries/Utilities/BackHandler'); +const Dimensions = require('../../Libraries/Utilities/Dimensions'); +const DrawerLayoutAndroid = require('../../Libraries/Components/DrawerAndroid/DrawerLayoutAndroid'); +const Linking = require('../../Libraries/Linking/Linking'); const React = require('react'); -const StatusBar = require('StatusBar'); -const StyleSheet = require('StyleSheet'); -const ToolbarAndroid = require('ToolbarAndroid'); +const StatusBar = require('../../Libraries/Components/StatusBar/StatusBar'); +const StyleSheet = require('../../Libraries/StyleSheet/StyleSheet'); +const ToolbarAndroid = require('../../Libraries/Components/ToolbarAndroid/ToolbarAndroid'); const RNTesterActions = require('./RNTesterActions'); const RNTesterExampleContainer = require('./RNTesterExampleContainer'); const RNTesterExampleList = require('./RNTesterExampleList'); const RNTesterList = require('./RNTesterList'); const RNTesterNavigationReducer = require('./RNTesterNavigationReducer'); -const UIManager = require('UIManager'); +const UIManager = require('../../Libraries/ReactNative/UIManager'); const URIActionMap = require('./URIActionMap'); -const View = require('View'); +const View = require('../../Libraries/Components/View/View'); -const nativeImageSource = require('nativeImageSource'); +const nativeImageSource = require('../../Libraries/Image/nativeImageSource'); import type { RNTesterNavigationState } from './RNTesterNavigationReducer'; diff --git a/RNTester/js/RNTesterApp.ios.js b/RNTester/js/RNTesterApp.ios.js index ed452bee2bbd2e..b55756900cfadc 100644 --- a/RNTester/js/RNTesterApp.ios.js +++ b/RNTester/js/RNTesterApp.ios.js @@ -11,9 +11,9 @@ */ 'use strict'; -const AsyncStorage = require('AsyncStorage'); -const BackHandler = require('BackHandler'); -const Linking = require('Linking'); +const AsyncStorage = require('../../Libraries/Storage/AsyncStorage'); +const BackHandler = require('../../Libraries/Utilities/BackHandler'); +const Linking = require('../../Libraries/Linking/Linking'); const React = require('react'); const ReactNative = require('react-native'); const RNTesterActions = require('./RNTesterActions'); diff --git a/RNTester/js/RNTesterExampleList.js b/RNTester/js/RNTesterExampleList.js index a796039b0101d6..1c25632590171f 100644 --- a/RNTester/js/RNTesterExampleList.js +++ b/RNTester/js/RNTesterExampleList.js @@ -11,16 +11,16 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('../../Libraries/Utilities/Platform'); const React = require('react'); -const SectionList = require('SectionList'); -const StyleSheet = require('StyleSheet'); -const Text = require('Text'); -const TextInput = require('TextInput'); -const TouchableHighlight = require('TouchableHighlight'); +const SectionList = require('../../Libraries/Lists/SectionList'); +const StyleSheet = require('../../Libraries/StyleSheet/StyleSheet'); +const Text = require('../../Libraries/Text/Text'); +const TextInput = require('../../Libraries/Components/TextInput/TextInput'); +const TouchableHighlight = require('../../Libraries/Components/Touchable/TouchableHighlight'); const RNTesterActions = require('./RNTesterActions'); const RNTesterStatePersister = require('./RNTesterStatePersister'); -const View = require('View'); +const View = require('../../Libraries/Components/View/View'); import type { RNTesterExample, diff --git a/RNTester/js/RNTesterSettingSwitchRow.js b/RNTester/js/RNTesterSettingSwitchRow.js index ab33ff19cb7b15..dac45b9293f18f 100644 --- a/RNTester/js/RNTesterSettingSwitchRow.js +++ b/RNTester/js/RNTesterSettingSwitchRow.js @@ -11,12 +11,12 @@ */ 'use strict'; -const React = require('React'); -const StyleSheet = require('StyleSheet'); -const Switch = require('Switch'); -const Text = require('Text'); +const React = require('../../Libraries/react-native/React'); +const StyleSheet = require('../../Libraries/StyleSheet/StyleSheet'); +const Switch = require('../../Libraries/Components/Switch/Switch'); +const Text = require('../../Libraries/Text/Text'); const RNTesterStatePersister = require('./RNTesterStatePersister'); -const View = require('View'); +const View = require('../../Libraries/Components/View/View'); class RNTesterSettingSwitchRow extends React.Component { componentWillReceiveProps(newProps) { diff --git a/RNTester/js/RNTesterStatePersister.js b/RNTester/js/RNTesterStatePersister.js index a8adcf5bf2fecb..d4450ebf517a4b 100644 --- a/RNTester/js/RNTesterStatePersister.js +++ b/RNTester/js/RNTesterStatePersister.js @@ -11,8 +11,8 @@ */ 'use strict'; -const AsyncStorage = require('AsyncStorage'); -const React = require('React'); +const AsyncStorage = require('../../Libraries/Storage/AsyncStorage'); +const React = require('../../Libraries/react-native/React'); export type PassProps = { state: State, diff --git a/RNTester/js/RTLExample.js b/RNTester/js/RTLExample.js index eff1ddfdfe12ef..ab499e720f3ab5 100644 --- a/RNTester/js/RTLExample.js +++ b/RNTester/js/RTLExample.js @@ -27,7 +27,7 @@ const { Switch, View, } = ReactNative; -const Platform = require('Platform'); +const Platform = require('../../Libraries/Utilities/Platform'); const RNTesterPage = require('./RNTesterPage'); diff --git a/RNTester/js/SectionListExample.js b/RNTester/js/SectionListExample.js index 7b9d3df2118121..b9fb94cb4c93a1 100644 --- a/RNTester/js/SectionListExample.js +++ b/RNTester/js/SectionListExample.js @@ -25,7 +25,7 @@ const { const RNTesterPage = require('./RNTesterPage'); -const infoLog = require('infoLog'); +const infoLog = require('../../Libraries/Utilities/infoLog'); const { HeaderComponent, diff --git a/RNTester/js/TextExample.ios.js b/RNTester/js/TextExample.ios.js index b8538c7c13f30f..443e1e504092eb 100644 --- a/RNTester/js/TextExample.ios.js +++ b/RNTester/js/TextExample.ios.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Platform = require('Platform'); +const Platform = require('../../Libraries/Utilities/Platform'); var React = require('react'); var createReactClass = require('create-react-class'); var ReactNative = require('react-native'); diff --git a/RNTester/js/ToastAndroidExample.android.js b/RNTester/js/ToastAndroidExample.android.js index 34dc88e99df320..e50b41c06eefe1 100644 --- a/RNTester/js/ToastAndroidExample.android.js +++ b/RNTester/js/ToastAndroidExample.android.js @@ -21,8 +21,8 @@ var { TouchableWithoutFeedback, } = ReactNative; -var RNTesterBlock = require('RNTesterBlock'); -var RNTesterPage = require('RNTesterPage'); +var RNTesterBlock = require('./RNTesterBlock'); +var RNTesterPage = require('./RNTesterPage'); class ToastExample extends React.Component { static title = 'Toast Example'; diff --git a/RNTester/js/ToolbarAndroidExample.android.js b/RNTester/js/ToolbarAndroidExample.android.js index b337798cd620aa..82b7e386695c82 100644 --- a/RNTester/js/ToolbarAndroidExample.android.js +++ b/RNTester/js/ToolbarAndroidExample.android.js @@ -14,7 +14,7 @@ var React = require('react'); var ReactNative = require('react-native'); -var nativeImageSource = require('nativeImageSource'); +var nativeImageSource = require('../../Libraries/Image/nativeImageSource'); var { StyleSheet, Text, @@ -23,8 +23,8 @@ var { var RNTesterBlock = require('./RNTesterBlock'); var RNTesterPage = require('./RNTesterPage'); -var Switch = require('Switch'); -var ToolbarAndroid = require('ToolbarAndroid'); +var Switch = require('../../Libraries/Components/Switch/Switch'); +var ToolbarAndroid = require('../../Libraries/Components/ToolbarAndroid/ToolbarAndroid'); class ToolbarAndroidExample extends React.Component { static title = ''; diff --git a/RNTester/js/TouchableExample.js b/RNTester/js/TouchableExample.js index 838402dbf32b77..0727ab48730196 100644 --- a/RNTester/js/TouchableExample.js +++ b/RNTester/js/TouchableExample.js @@ -25,7 +25,7 @@ var { View, } = ReactNative; -const NativeModules = require('NativeModules'); +const NativeModules = require('../../Libraries/BatchedBridge/NativeModules'); const forceTouchAvailable = (NativeModules.PlatformConstants && NativeModules.PlatformConstants.forceTouchAvailable) || false; diff --git a/RNTester/js/ViewExample.js b/RNTester/js/ViewExample.js index 90a70f3ea70de0..41dccba7bb7877 100644 --- a/RNTester/js/ViewExample.js +++ b/RNTester/js/ViewExample.js @@ -18,7 +18,7 @@ var { Text, View, } = ReactNative; -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); +var TouchableWithoutFeedback = require('../../Libraries/Components/Touchable/TouchableWithoutFeedback'); var styles = StyleSheet.create({ box: { diff --git a/RNTester/js/XHRExampleCookies.js b/RNTester/js/XHRExampleCookies.js index 0fe3d43c4157f1..ea072a7e3197b7 100644 --- a/RNTester/js/XHRExampleCookies.js +++ b/RNTester/js/XHRExampleCookies.js @@ -21,7 +21,7 @@ var { WebView, } = ReactNative; -var RCTNetworking = require('RCTNetworking'); +var RCTNetworking = require('../../Libraries/Network/RCTNetworking'); class XHRExampleCookies extends React.Component { state: any; diff --git a/jest/setup.js b/jest/setup.js index 4a94e5e4414016..2c7a8a20d0fd8d 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -27,28 +27,28 @@ global.cancelAnimationFrame = function(id) { }; jest - .mock('setupDevtools') + .mock('../Libraries/Core/Devtools/setupDevtools') .mock('npmlog'); // there's a __mock__ for it. -jest.setMock('ErrorUtils', require('ErrorUtils')); +jest.setMock('../Libraries/vendor/core/ErrorUtils', require('../Libraries/vendor/core/ErrorUtils')); jest - .mock('InitializeCore') - .mock('Image', () => mockComponent('Image')) - .mock('Text', () => mockComponent('Text')) - .mock('TextInput', () => mockComponent('TextInput')) - .mock('Modal', () => mockComponent('Modal')) - .mock('View', () => mockComponent('View')) - .mock('RefreshControl', () => require.requireMock('RefreshControlMock')) - .mock('ScrollView', () => require.requireMock('ScrollViewMock')) + .mock('../Libraries/Core/InitializeCore') + .mock('../Libraries/Image/Image', () => mockComponent('../Libraries/Image/Image')) + .mock('../Libraries/Text/Text', () => mockComponent('../Libraries/Text/Text')) + .mock('../Libraries/Components/TextInput/TextInput', () => mockComponent('../Libraries/Components/TextInput/TextInput')) + .mock('../Libraries/Modal/Modal', () => mockComponent('../Libraries/Modal/Modal')) + .mock('../Libraries/Components/View/View', () => mockComponent('../Libraries/Components/View/View')) + .mock('../Libraries/Components/RefreshControl/RefreshControl', () => require.requireMock('RefreshControlMock')) + .mock('../Libraries/Components/ScrollView/ScrollView', () => require.requireMock('ScrollViewMock')) .mock( - 'ActivityIndicator', - () => mockComponent('ActivityIndicator'), + '../Libraries/Components/ActivityIndicator/ActivityIndicator', + () => mockComponent('../Libraries/Components/ActivityIndicator/ActivityIndicator'), ) - .mock('ListView', () => require.requireMock('ListViewMock')) - .mock('ListViewDataSource', () => { - const DataSource = require.requireActual('ListViewDataSource'); + .mock('../Libraries/Lists/ListView/ListView', () => require.requireMock('ListViewMock')) + .mock('../Libraries/Lists/ListView/ListViewDataSource', () => { + const DataSource = require.requireActual('../Libraries/Lists/ListView/ListViewDataSource'); DataSource.prototype.toJSON = function() { function ListViewDataSource(dataBlob) { this.items = 0; @@ -68,7 +68,7 @@ jest }; return DataSource; }) - .mock('ensureComponentIsNative', () => () => true); + .mock('../Libraries/Components/Touchable/ensureComponentIsNative', () => () => true); const mockEmptyObject = {}; const mockNativeModules = { @@ -257,13 +257,13 @@ Object.keys(mockNativeModules).forEach(module => { }); jest - .doMock('NativeModules', () => mockNativeModules) - .doMock('ReactNativePropRegistry', () => ({ + .doMock('../Libraries/BatchedBridge/NativeModules', () => mockNativeModules) + .doMock('../Libraries/Renderer/shims/ReactNativePropRegistry', () => ({ register: id => id, getByID: () => mockEmptyObject, })); -jest.doMock('requireNativeComponent', () => { +jest.doMock('../Libraries/ReactNative/requireNativeComponent', () => { const React = require('react'); return viewName => props => React.createElement( From 1a7b7c4f6b38b662cdac3d5cb15838d1acb1a760 Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Fri, 1 Sep 2017 15:03:48 -0700 Subject: [PATCH 2/3] [exp] Fix Jest mocks to mock correct JS modules when Haste isn't used --- jest/setup.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jest/setup.js b/jest/setup.js index 2c7a8a20d0fd8d..839629969ffa25 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -248,11 +248,22 @@ const mockNativeModules = { }, }; -Object.keys(mockNativeModules).forEach(module => { +const mockNativeModuleJS = { + '../Libraries/AppState/AppState': mockNativeModules.AppState, + '../Libraries/Components/Clipboard/Clipboard': mockNativeModules.Clipboard, + '../Libraries/Utilities/DeviceInfo': mockNativeModules.DeviceInfo, + '../Libraries/Linking/Linking': mockNativeModules.Linking, + '../Libraries/Network/NetInfo': mockNativeModules.NetInfo, + '../Libraries/ReactNative/UIManager': mockNativeModules.UIManager, +}; + +const allRNMocks = {...mockNativeModules, mockNativeModuleJS}; + +Object.keys(allRNMocks).forEach(module => { try { - jest.doMock(module, () => mockNativeModules[module]); // needed by FacebookSDK-test + jest.doMock(module, () => allRNMocks[module]); // needed by FacebookSDK-test } catch (e) { - jest.doMock(module, () => mockNativeModules[module], {virtual: true}); + jest.doMock(module, () => allRNMocks[module], {virtual: true}); } }); From fb0a603974ab4d5f981afff6c7f61b0c75f88274 Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Fri, 1 Sep 2017 14:56:59 -0700 Subject: [PATCH 3/3] [exp] Add strip-haste script --- scripts/strip-haste.js | 287 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 scripts/strip-haste.js diff --git a/scripts/strip-haste.js b/scripts/strip-haste.js new file mode 100644 index 00000000000000..2be9f36caf5d0e --- /dev/null +++ b/scripts/strip-haste.js @@ -0,0 +1,287 @@ +require('../setupBabel')(); + +const babel = require('babel-core'); +const babylon = require('babylon'); +const fs = require('fs'); +const JestHasteMap = require('jest-haste-map'); +const _ = require('lodash'); +const path = require('path'); +const mkdirp = require('mkdirp'); +const rimraf = require('rimraf'); + +const packagerDefaults = require('metro-bundler/src/defaults'); + +const ROOTS = [ + path.resolve(__dirname, '..', 'Libraries'), + path.resolve(__dirname, '..', 'jest'), + path.resolve(__dirname, '..', 'integrationTests'), + path.resolve(__dirname, '..', 'RNTester'), +]; + +const LibrariesDest = path.resolve(__dirname, '..', 'Libraries'); + +const ignoreREs = []; + +async function main() { + // console.log('Cleaning...'); + // rimraf.sync(LibrariesDest); + + const haste = createHasteMap(); + console.log('Loading dependency graph...'); + const { moduleMap } = await haste.build(); + console.log('Loaded dependency graph.'); + // await transformRequires({ + // source: ROOTS[1], + // dest: ROOTS[1], + // moduleMap: moduleMap.getRawModuleMap().map, + // }); + for (let rootDir of ROOTS) { + await transformRequires({ + source: rootDir, + dest: rootDir, + moduleMap: moduleMap.getRawModuleMap().map, + }); + } +} + +async function transformRequires({ source, dest, moduleMap }) { + const sourceDir = fs.readdirSync(source); + for (let filename of sourceDir) { + const filePath = path.resolve(source, filename); + if (_.some(ignoreREs.map(r => filePath.match(r)))) { + continue; + } + const fileStats = fs.statSync(filePath); + if (fileStats.isDirectory()) { + await transformRequires({ + source: filePath, + dest: path.join(dest, filename), + moduleMap, + }); + } else { + await _transformRequiresInFile( + filePath, + path.join(dest, filename), + moduleMap + ); + } + } +} + +function _transformRequiresInFile(sourceFilePath, destFilePath, moduleMap) { + const dirname = path.dirname(destFilePath); + // Make the directory if it doesn't exist + mkdirp.sync(dirname); + + // If not a JS file, just copy the file + if (!sourceFilePath.endsWith('.js')) { + // console.log(`Writing ${destFilePath}...`); + // fs + // .createReadStream(sourceFilePath) + // .pipe(fs.createWriteStream(destFilePath)); + return; + } + + // Get dependencies + const code = fs.readFileSync(sourceFilePath, 'utf8'); + console.log(`Writing ${destFilePath}...`); + const { dependencyOffsets, dependencies } = extractDependencies(code); + + const dependencyMap = dependencies.reduce((result, dep, i) => { + if (!moduleMap[dep]) { + return result; + } + + const mod = moduleMap[dep]; + let modulePath; + if (mod.g) { + modulePath = mod.g[0]; + } else if (mod.ios) { + modulePath = mod.ios[0]; + } else if (mod.android) { + modulePath = mod.android[0]; + } else { + return result; + } + + let depPath = path.relative(path.dirname(sourceFilePath), modulePath); + if (!depPath.startsWith('.')) { + depPath = `./${depPath}`; + } + depPath = depPath.replace(/(.*)\.[^.]+$/, '$1'); // remove extension + depPath = depPath.replace(/(.*).(android|ios)/, '$1'); // remove platform ext + + return Object.assign({}, result, { + [dep]: { + offset: dependencyOffsets[i], + replacement: depPath, + }, + }); + }, {}); + + const newCode = dependencyOffsets + .reduceRight( + ([unhandled, handled], offset) => [ + unhandled.slice(0, offset), + replaceDependency(unhandled.slice(offset) + handled, dependencyMap), + ], + [code, ''] + ) + .join(''); + + fs.writeFileSync(destFilePath, newCode); +} + +function createHasteMap() { + return new JestHasteMap({ + extensions: packagerDefaults.sourceExts.concat(packagerDefaults.assetExts), + maxWorkers: 1, + ignorePattern: filepath => { + return ( + filepath.indexOf('__tests__') !== -1 || + filepath.indexOf('__mocks__') !== -1 + ); + }, + mocksPattern: '', + platforms: packagerDefaults.platforms, + providesModuleNodeModules: [], + resetCache: true, + retainAllFiles: true, + roots: ROOTS, + useWatchman: true, + watch: false, + }); +} + +const reDepencencyString = /^(['"])([^'"']*)\1/; +function replaceDependency(stringWithDependencyIDAtStart, dependencyMap) { + const match = reDepencencyString.exec(stringWithDependencyIDAtStart); + const dependencyName = match && match[2]; + if (match != null && dependencyName in dependencyMap) { + const { length } = match[0]; + const { replacement } = dependencyMap[dependencyName]; + return `'${replacement}'` + stringWithDependencyIDAtStart.slice(length); + } else { + return stringWithDependencyIDAtStart; + } +} + +/** + * Extracts dependencies (module IDs imported with the `require` function) from + * a string containing code. This walks the full AST for correctness (versus + * using, for example, regular expressions, that would be faster but inexact.) + * + * The result of the dependency extraction is an de-duplicated array of + * dependencies, and an array of offsets to the string literals with module IDs. + * The index points to the opening quote. + */ +function extractDependencies(code) { + const ast = babylon.parse(code, { + sourceType: 'module', + plugins: [ + 'classProperties', + 'jsx', + 'flow', + 'exportExtensions', + 'asyncGenerators', + 'objectRestSpread', + ], + }); + const dependencies = new Set(); + const dependencyOffsets = []; + const types = require('babel-types'); + + const transformedFunctions = [ + 'require', + 'require.resolve', + 'require.requireActual', + 'require.requireMock', + 'System.import', + 'mockComponent', + ]; + + const isJest = node => { + try { + let callee; + if (node.isCallExpression()) { + callee = node.get('callee'); + } else if (node.isMemberExpression()) { + callee = node; + } + return ( + callee.get('object').isIdentifier({ name: 'jest' }) || + (callee.isMemberExpression() && isJest(callee.get('object'))) + ); + } catch (e) { + return false; + } + }; + + const isValidJestFunc = node => { + return ( + node.isIdentifier({ name: 'mock' }) || + node.isIdentifier({ name: 'unmock' }) || + node.isIdentifier({ name: 'doMock' }) || + node.isIdentifier({ name: 'dontMock' }) || + node.isIdentifier({ name: 'setMock' }) || + node.isIdentifier({ name: 'genMockFromModule' }) + ); + }; + + const transformCall = nodePath => { + if (isJest(nodePath)) { + const calleeProperty = nodePath.get('callee.property'); + if (isValidJestFunc(calleeProperty)) { + const arg = nodePath.get('arguments.0'); + if (!arg || arg.type !== 'StringLiteral') { + return; + } + dependencyOffsets.push(parseInt(arg.node.start, 10)); + dependencies.add(arg.node.value); + } + } else { + const calleePath = nodePath.get('callee'); + const isNormalCall = transformedFunctions.some(pattern => + _matchesPattern(types, calleePath, pattern) + ); + if (isNormalCall) { + const arg = nodePath.get('arguments.0'); + if (!arg || arg.type !== 'StringLiteral') { + return; + } + dependencyOffsets.push(parseInt(arg.node.start, 10)); + dependencies.add(arg.node.value); + } + } + }; + + babel.traverse(ast, { + CallExpression: transformCall, + }); + + return { + dependencyOffsets: [...dependencyOffsets].sort((a, b) => a - b), + dependencies: Array.from(dependencies), + }; +} + +function _matchesPattern(types, calleePath, pattern) { + const { node } = calleePath; + + if (types.isMemberExpression(node)) { + return calleePath.matchesPattern(pattern); + } + + if (!types.isIdentifier(node) || pattern.includes('.')) { + return false; + } + + const name = pattern.split('.')[0]; + + return node.name === name; +} + +main().catch(e => { + console.trace(e); + throw e; +});