diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js index 47c5ce635a0d..8f26b8cd36e7 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/src/renderers/native/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 d7e666be9010..6fc42aa0d666 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/AdSupport/AdSupportIOS.js b/Libraries/AdSupport/AdSupportIOS.js index c78d81c670f9..0ad28686ee84 100644 --- a/Libraries/AdSupport/AdSupportIOS.js +++ b/Libraries/AdSupport/AdSupportIOS.js @@ -11,7 +11,7 @@ */ 'use strict'; -var AdSupport = require('NativeModules').AdSupport; +var AdSupport = require('../BatchedBridge/NativeModules').AdSupport; /** * `AdSupport` provides access to the "advertising identifier". If you link this library diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js index bd7d46f51bea..4f5e5cc60de8 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 4a8143024a14..a95938cf3ebc 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 f8ad604e16da..61c8abb42ee4 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 409ecf5caf04..0406c0c692f1 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 1eacd03c48c6..f9c430a76faf 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 dc21fed3f671..b6c62892f001 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/src/renderers/native/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 b88acb940bd6..91154706a55f 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 03c40917597b..f5c316d1c9a8 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 6a28246ca73f..2956f6110a3d 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 72c22ef63af1..8f6dfee047db 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/AppState/AppState.js b/Libraries/AppState/AppState.js index 51536cabdda0..67355278d464 100644 --- a/Libraries/AppState/AppState.js +++ b/Libraries/AppState/AppState.js @@ -11,12 +11,12 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const NativeEventEmitter = require('NativeEventEmitter'); -const NativeModules = require('NativeModules'); +const EventEmitter = require('../EventEmitter/EventEmitter'); +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 5d108f52abbb..27535ce38c08 100644 --- a/Libraries/BatchedBridge/BatchedBridge.js +++ b/Libraries/BatchedBridge/BatchedBridge.js @@ -11,7 +11,7 @@ */ 'use strict'; -const MessageQueue = require('MessageQueue'); +const MessageQueue = require('./MessageQueue'); const BatchedBridge = new MessageQueue(); // Wire up the batched bridge on the global object so that we can call into it. diff --git a/Libraries/BatchedBridge/MessageQueue.js b/Libraries/BatchedBridge/MessageQueue.js index 1248f3b0935f..aad9f69ea5a4 100644 --- a/Libraries/BatchedBridge/MessageQueue.js +++ b/Libraries/BatchedBridge/MessageQueue.js @@ -14,13 +14,13 @@ 'use strict'; -const ErrorUtils = require('ErrorUtils'); -const JSTimersExecution = require('JSTimersExecution'); -const Systrace = require('Systrace'); +const ErrorUtils = require('../Core/ErrorUtils'); +const JSTimersExecution = require('../Core/Timers/JSTimersExecution'); +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, diff --git a/Libraries/BatchedBridge/NativeModules.js b/Libraries/BatchedBridge/NativeModules.js index 791cbbccffe1..60439077f278 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'); @@ -130,7 +130,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/BugReporting/BugReporting.js b/Libraries/BugReporting/BugReporting.js index 277f16b45e11..a8d0b5e0ce15 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 7a07bfdc06a4..2787af99ecc4 100644 --- a/Libraries/CameraRoll/CameraRoll.js +++ b/Libraries/CameraRoll/CameraRoll.js @@ -12,10 +12,10 @@ */ 'use strict'; -const {PropTypes, checkPropTypes} = require('React'); -const RCTCameraRollManager = require('NativeModules').CameraRollManager; +const {PropTypes, checkPropTypes} = require('../react-native/React'); +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 a67884dc8435..53d10d2938cd 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 47afbe2a3ed3..dcd144367cfc 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 425c40e3437d..fb6e37f18b5b 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 68dc82b3983e..25fe46c9a813 100644 --- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js +++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js @@ -11,16 +11,16 @@ */ '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/src/renderers/native/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 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 c01f2b065a76..3bc3d46525e0 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/AppleTV/TVViewPropTypes.js b/Libraries/Components/AppleTV/TVViewPropTypes.js index 1938e6da00f3..d23cf5ed512f 100644 --- a/Libraries/Components/AppleTV/TVViewPropTypes.js +++ b/Libraries/Components/AppleTV/TVViewPropTypes.js @@ -10,7 +10,7 @@ * @flow */ 'use strict'; -var PropTypes = require('React').PropTypes; +var PropTypes = require('../../react-native/React').PropTypes; /** * Additional View properties for Apple TV diff --git a/Libraries/Components/Button.js b/Libraries/Components/Button.js index b6692afb230f..f70e0fa5912f 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 ac8641c83470..da0de9bac253 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 9a2b2669711b..83ff74458318 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 ccab7293df63..fe98bdd6affd 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js @@ -13,14 +13,14 @@ */ 'use strict'; -const NativeMethodsMixin = require('NativeMethodsMixin'); -const React = require('React'); +const NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 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 11910ead0ad3..60270ab9f740 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 2f697587ce0e..a4a0a7a9f73b 100644 --- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js +++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js @@ -10,22 +10,22 @@ */ '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/src/renderers/native/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/src/renderers/native/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 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 6c0b34e3b591..1ea94720e393 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 9e936e6d7804..5e79c7bba58c 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 b8dba62817ce..d7c069bfe1c3 100644 --- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js +++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js @@ -11,14 +11,14 @@ */ 'use strict'; -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'; diff --git a/Libraries/Components/LazyRenderer.js b/Libraries/Components/LazyRenderer.js index 95cafbd16194..6dcd1c9c0cab 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 PropTypes = require('prop-types'); var TimerMixin = require('react-timer-mixin'); diff --git a/Libraries/Components/Navigation/NavigatorIOS.android.js b/Libraries/Components/Navigation/NavigatorIOS.android.js index 12699e09c6a9..76f792b74e0d 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 1cb90eeaf7f3..8177077821e3 100644 --- a/Libraries/Components/Navigation/NavigatorIOS.ios.js +++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js @@ -11,21 +11,21 @@ */ 'use strict'; -var EventEmitter = require('EventEmitter'); -var Image = require('Image'); -var RCTNavigatorManager = require('NativeModules').NavigatorManager; -var React = require('React'); +var EventEmitter = require('../../EventEmitter/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/src/renderers/native/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 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 39b2cdfb8157..dc6f7a8e243d 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 511b4d319462..87722f39d7c3 100644 --- a/Libraries/Components/Picker/PickerAndroid.android.js +++ b/Libraries/Components/Picker/PickerAndroid.android.js @@ -12,15 +12,15 @@ 'use strict'; -var ColorPropType = require('ColorPropType'); -var React = require('React'); -var StyleSheet = require('StyleSheet'); -var StyleSheetPropType = require('StyleSheetPropType'); -const ViewPropTypes = require('ViewPropTypes'); -var ViewStylePropTypes = require('ViewStylePropTypes'); - -var processColor = require('processColor'); -var requireNativeComponent = require('requireNativeComponent'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); +var StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +const ViewPropTypes = require('../View/ViewPropTypes'); +var ViewStylePropTypes = require('../View/ViewStylePropTypes'); + +var processColor = require('../../StyleSheet/processColor'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var ReactPropTypes = React.PropTypes; diff --git a/Libraries/Components/Picker/PickerAndroid.ios.js b/Libraries/Components/Picker/PickerAndroid.ios.js index fc589882864a..a96aa243644a 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 7c5b39112a9e..9edeb16a8780 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 ec617510d84f..9ca4cdfd5f4a 100644 --- a/Libraries/Components/Picker/PickerIOS.ios.js +++ b/Libraries/Components/Picker/PickerIOS.ios.js @@ -12,18 +12,18 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 itemStylePropType = StyleSheetPropType(TextStylePropTypes); -var requireNativeComponent = require('requireNativeComponent'); +var requireNativeComponent = require('../../ReactNative/requireNativeComponent'); var PickerIOS = React.createClass({ mixins: [NativeMethodsMixin], diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js index 25b43b047c9f..fdba5b952de9 100644 --- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js +++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js @@ -10,13 +10,13 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 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 99f01c81f36c..29c21b3469f6 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 d4a7da54aa98..6bc3088019f9 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 3d996cbbebb1..fc849bce2609 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js @@ -11,14 +11,14 @@ */ 'use strict'; -var Image = require('Image'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Image = require('../../Image/Image'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 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 7736b06b1f6b..4b334cda45fb 100644 --- a/Libraries/Components/RefreshControl/RefreshControl.js +++ b/Libraries/Components/RefreshControl/RefreshControl.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/src/renderers/native/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 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/ScrollResponder.js b/Libraries/Components/ScrollResponder.js index 8d6bbc17b23c..9c302564ea21 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/src/renderers/native/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/src/renderers/native/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 35d3014e9682..888de399b833 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -11,27 +11,27 @@ */ '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 dismissKeyboard = require('dismissKeyboard'); -const flattenStyle = require('flattenStyle'); +const React = require('../../react-native/React'); +const ReactNative = require('../../Renderer/src/renderers/native/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 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'); /** * Component that wraps platform ScrollView while providing diff --git a/Libraries/Components/ScrollView/ScrollViewStickyHeader.js b/Libraries/Components/ScrollView/ScrollViewStickyHeader.js index b072a67c6bf0..c152b6934aad 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/SegmentedControlIOS/SegmentedControlIOS.android.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.android.js index 15ac90078588..42fa4430df73 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 4fd6d0d1ebec..b304c5c25370 100644 --- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js +++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js @@ -11,13 +11,13 @@ */ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 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 ce0c39dcace3..7fd0b4470dbe 100644 --- a/Libraries/Components/Slider/Slider.js +++ b/Libraries/Components/Slider/Slider.js @@ -11,17 +11,17 @@ */ '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/src/renderers/native/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 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 a29593ae4913..fbce02ea07ae 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 afea94ebc3fc..153b145c7272 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 aae3f9214c2b..0447336b1263 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 2be8f34eaf5f..ce356b7e8377 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 a3aceaac7e09..3aeba8d6eca4 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 7cad1ac14b2d..46c9fe160977 100644 --- a/Libraries/Components/Switch/Switch.js +++ b/Libraries/Components/Switch/Switch.js @@ -11,15 +11,15 @@ */ '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/src/renderers/native/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 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 d9efee3ff322..d2db4f8d064d 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 10f0c028af8e..5353378c00bf 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 43cf6d429e0b..ece0603dd8dd 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 215c4f27edbc..fd7338397f97 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 b47b785b0ca8..e39d9e8a1817 100644 --- a/Libraries/Components/TextInput/TextInput.js +++ b/Libraries/Components/TextInput/TextInput.js @@ -11,25 +11,25 @@ */ '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('../../EventEmitter/EventEmitter'); +const NativeMethodsMixin = require('../../Renderer/src/renderers/native/NativeMethodsMixin'); +const Platform = require('../../Utilities/Platform'); +const React = require('../../react-native/React'); 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/src/renderers/native/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 276bba0d781b..9dbb23dd231b 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 e1e3f7550d48..be0997c01cf8 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 36899ca30f55..88935f04afef 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 675738217cf6..8a36ed006249 100644 --- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js +++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js @@ -11,17 +11,17 @@ 'use strict'; -var Image = require('Image'); -var NativeMethodsMixin = require('NativeMethodsMixin'); -var React = require('React'); +var Image = require('../../Image/Image'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/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 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 28a8901ff890..5a9c264f23d9 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 a5877717b6b6..c68ac6810ff8 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/src/shared/utils/PooledClass'); var twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/Position.js b/Libraries/Components/Touchable/Position.js index 77dd3ad11b81..2fbfe05ae34d 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/src/shared/utils/PooledClass'); var twoArgumentPooler = PooledClass.twoArgumentPooler; diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js index e8f925e90d5b..afc791dc0f45 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/src/renderers/native/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 bcc1695ba9ec..9af98c052c59 100644 --- a/Libraries/Components/Touchable/TouchableBounce.js +++ b/Libraries/Components/Touchable/TouchableBounce.js @@ -11,12 +11,12 @@ */ '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/src/renderers/native/NativeMethodsMixin'); +var React = require('../../react-native/React'); 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 3a259abc9cac..de516b774732 100644 --- a/Libraries/Components/Touchable/TouchableHighlight.js +++ b/Libraries/Components/Touchable/TouchableHighlight.js @@ -13,22 +13,22 @@ // Note (avik): add @flow when Flow supports spread properties in propTypes -var ColorPropType = require('ColorPropType'); -var NativeMethodsMixin = require('NativeMethodsMixin'); +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var NativeMethodsMixin = require('../../Renderer/src/renderers/native/NativeMethodsMixin'); const PropTypes = require('prop-types'); -var React = require('React'); -var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -var StyleSheet = require('StyleSheet'); +var React = require('../../react-native/React'); +var ReactNativeViewAttributes = require('../View/ReactNativeViewAttributes'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); var TimerMixin = require('react-timer-mixin'); -var Touchable = require('Touchable'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -var View = require('View'); -const ViewPropTypes = require('ViewPropTypes'); +var Touchable = require('./Touchable'); +var TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); +var View = require('../View/View'); +const ViewPropTypes = require('../View/ViewPropTypes'); -var ensureComponentIsNative = require('ensureComponentIsNative'); -var ensurePositiveDelayProps = require('ensurePositiveDelayProps'); +var ensureComponentIsNative = require('./ensureComponentIsNative'); +var ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); var keyOf = require('fbjs/lib/keyOf'); -var merge = require('merge'); +var merge = require('../../vendor/core/merge'); type Event = Object; diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js index 3c2e7b0053ea..273ee4d9b283 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js @@ -10,16 +10,16 @@ */ '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/src/renderers/native/ReactNative'); +var Touchable = require('./Touchable'); +var TouchableWithoutFeedback = require('./TouchableWithoutFeedback'); +var UIManager = require('../../ReactNative/UIManager'); -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 99abaa3a0705..bf57fcb0649a 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 861fd5f5a4fe..1b35c84c20b7 100644 --- a/Libraries/Components/Touchable/TouchableOpacity.js +++ b/Libraries/Components/Touchable/TouchableOpacity.js @@ -13,17 +13,17 @@ // 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/src/renderers/native/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 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 cf94cbba9f2e..c9e0b3091e2c 100755 --- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js +++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js @@ -11,19 +11,19 @@ */ '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 ensurePositiveDelayProps = require('ensurePositiveDelayProps'); +const ensurePositiveDelayProps = require('./ensurePositiveDelayProps'); const warning = require('fbjs/lib/warning'); const { AccessibilityComponentTypes, AccessibilityTraits, -} = require('ViewAccessibility'); +} = require('../View/ViewAccessibility'); type Event = Object; diff --git a/Libraries/Components/UnimplementedViews/UnimplementedView.js b/Libraries/Components/UnimplementedViews/UnimplementedView.js index e7c488bdd2f6..48770001f0df 100644 --- a/Libraries/Components/UnimplementedViews/UnimplementedView.js +++ b/Libraries/Components/UnimplementedViews/UnimplementedView.js @@ -11,8 +11,8 @@ */ 'use strict'; -var React = require('React'); -var StyleSheet = require('StyleSheet'); +var React = require('../../react-native/React'); +var StyleSheet = require('../../StyleSheet/StyleSheet'); /** * Common implementation for a simple stubbed view. Simply applies the view's styles to the inner @@ -27,7 +27,7 @@ class UnimplementedView extends React.Component { render() { // Workaround require cycle from requireNativeComponent - var View = require('View'); + var View = require('../View/View'); return ( {this.props.children} diff --git a/Libraries/Components/View/ReactNativeStyleAttributes.js b/Libraries/Components/View/ReactNativeStyleAttributes.js index fd26f3969958..1e4b552f5850 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 3a769ca5ed75..e2e2d4c1397c 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 2a026ced7c06..c41437cd534d 100644 --- a/Libraries/Components/View/ShadowPropTypesIOS.js +++ b/Libraries/Components/View/ShadowPropTypesIOS.js @@ -11,8 +11,8 @@ */ 'use strict'; -var ColorPropType = require('ColorPropType'); -var ReactPropTypes = require('React').PropTypes; +var ColorPropType = require('../../StyleSheet/ColorPropType'); +var ReactPropTypes = require('../../react-native/React').PropTypes; var ShadowPropTypesIOS = { /** diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js index 535a57ade154..39f13faf4eec 100644 --- a/Libraries/Components/View/View.js +++ b/Libraries/Components/View/View.js @@ -11,24 +11,24 @@ */ 'use strict'; -const NativeMethodsMixin = require('NativeMethodsMixin'); -const NativeModules = require('NativeModules'); -const Platform = require('Platform'); +const NativeMethodsMixin = require('../../Renderer/src/renderers/native/NativeMethodsMixin'); +const NativeModules = require('../../BatchedBridge/NativeModules'); +const Platform = require('../../Utilities/Platform'); const PropTypes = require('prop-types'); -const React = require('React'); -const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags'); -const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); -const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -const ViewPropTypes = require('ViewPropTypes'); +const React = require('../../react-native/React'); +const ReactNativeFeatureFlags = require('../../Renderer/src/renderers/native/ReactNativeFeatureFlags'); +const ReactNativeStyleAttributes = require('./ReactNativeStyleAttributes'); +const ReactNativeViewAttributes = require('./ReactNativeViewAttributes'); +const ViewPropTypes = require('./ViewPropTypes'); const invariant = require('fbjs/lib/invariant'); -const requireNativeComponent = require('requireNativeComponent'); +const requireNativeComponent = require('../../ReactNative/requireNativeComponent'); const warning = require('fbjs/lib/warning'); const { AccessibilityComponentTypes, AccessibilityTraits, -} = require('ViewAccessibility'); +} = require('./ViewAccessibility'); const forceTouchAvailable = (NativeModules.PlatformConstants && NativeModules.PlatformConstants.forceTouchAvailable) || false; @@ -204,7 +204,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 134724308751..c3e40e7233f9 100644 --- a/Libraries/Components/View/ViewPropTypes.js +++ b/Libraries/Components/View/ViewPropTypes.js @@ -11,20 +11,20 @@ */ 'use strict'; -const EdgeInsetsPropType = require('EdgeInsetsPropType'); -const Platform = require('Platform'); -const StyleSheetPropType = require('StyleSheetPropType'); -const ViewStylePropTypes = require('ViewStylePropTypes'); +const EdgeInsetsPropType = require('../../StyleSheet/EdgeInsetsPropType'); +const Platform = require('../../Utilities/Platform'); +const StyleSheetPropType = require('../../StyleSheet/StyleSheetPropType'); +const ViewStylePropTypes = require('./ViewStylePropTypes'); -const { PropTypes } = require('React'); +const { PropTypes } = require('../../react-native/React'); const { AccessibilityComponentTypes, AccessibilityTraits, -} = require('ViewAccessibility'); +} = require('./ViewAccessibility'); var TVViewPropTypes = {}; if (Platform.isTVOS) { - TVViewPropTypes = require('TVViewPropTypes'); + TVViewPropTypes = require('../AppleTV/TVViewPropTypes'); } import type { diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js index dcd6c1c54228..c238168ec82c 100644 --- a/Libraries/Components/View/ViewStylePropTypes.js +++ b/Libraries/Components/View/ViewStylePropTypes.js @@ -11,11 +11,11 @@ */ 'use strict'; -var LayoutPropTypes = require('LayoutPropTypes'); -var ReactPropTypes = require('React').PropTypes; -var ColorPropType = require('ColorPropType'); -var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); -var TransformPropTypes = require('TransformPropTypes'); +var LayoutPropTypes = require('../../StyleSheet/LayoutPropTypes'); +var ReactPropTypes = require('../../react-native/React').PropTypes; +var ColorPropType = require('../../StyleSheet/ColorPropType'); +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 5d15a25db3fb..ce21fdd56fb8 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/src/renderers/native/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 35d4196b4890..77a8fe321c65 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 cd05617c8554..f6a31d2f5e45 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/src/renderers/native/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 21f4397c04e9..05e87024eb49 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/src/renderers/native/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/getDevServer.js b/Libraries/Core/Devtools/getDevServer.js index ff34314cadd8..bc91db707564 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 650cb568340c..38af1084d83f 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 56d5564b60c8..550d7ad563c9 100644 --- a/Libraries/Core/Devtools/setupDevtools.js +++ b/Libraries/Core/Devtools/setupDevtools.js @@ -12,8 +12,8 @@ 'use strict'; if (__DEV__) { - const AppState = require('AppState'); - const {PlatformConstants} = require('NativeModules'); + const AppState = require('../../AppState/AppState'); + const {PlatformConstants} = require('../../BatchedBridge/NativeModules'); const {connectToDevTools} = require('react-devtools-core'); connectToDevTools({ @@ -31,6 +31,6 @@ 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 586034b4746c..55856377fe5f 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) { @@ -76,7 +76,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 4182099836b2..08a78c3da548 100644 --- a/Libraries/Core/InitializeCore.js +++ b/Libraries/Core/InitializeCore.js @@ -37,7 +37,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 @@ -97,28 +97,28 @@ if (!global.process.env.NODE_ENV) { } // Set up profile -const Systrace = require('Systrace'); +const Systrace = require('../Performance/Systrace'); Systrace.setEnabled(global.__RCTProfileIsProfiling || false); // Set up console -const ExceptionsManager = require('ExceptionsManager'); +const ExceptionsManager = require('./ExceptionsManager'); ExceptionsManager.installConsoleErrorReporter(); // TODO: Move these around to solve the cycle in a cleaner way -const BatchedBridge = require('BatchedBridge'); -BatchedBridge.registerCallableModule('Systrace', require('Systrace')); -BatchedBridge.registerCallableModule('JSTimersExecution', require('JSTimersExecution')); -BatchedBridge.registerCallableModule('HeapCapture', require('HeapCapture')); -BatchedBridge.registerCallableModule('SamplingProfiler', require('SamplingProfiler')); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +BatchedBridge.registerCallableModule('Systrace', require('../Performance/Systrace')); +BatchedBridge.registerCallableModule('JSTimersExecution', require('./Timers/JSTimersExecution')); +BatchedBridge.registerCallableModule('HeapCapture', require('../Utilities/HeapCapture')); +BatchedBridge.registerCallableModule('SamplingProfiler', require('../Performance/SamplingProfiler')); if (__DEV__) { if (!global.__RCTProfileIsProfiling) { - BatchedBridge.registerCallableModule('HMRClient', require('HMRClient')); + BatchedBridge.registerCallableModule('HMRClient', require('../Utilities/HMRClient')); } } // RCTLog needs to register with BatchedBridge -require('RCTLog'); +require('../Utilities/RCTLog'); // Set up error handler if (!global.__fbDisableExceptionsManager) { @@ -133,13 +133,13 @@ if (!global.__fbDisableExceptionsManager) { } }; - const ErrorUtils = require('ErrorUtils'); + const ErrorUtils = require('./ErrorUtils'); ErrorUtils.setGlobalHandler(handleError); } // Set up timers const defineLazyTimer = name => { - defineProperty(global, name, () => require('JSTimers')[name]); + defineProperty(global, name, () => require('./Timers/JSTimers')[name]); }; defineLazyTimer('setTimeout'); defineLazyTimer('setInterval'); @@ -157,14 +157,14 @@ 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); }; } // Set up Promise // The native Promise implementation throws the following error: // ERROR: Event loop not supported. -defineProperty(global, 'Promise', () => require('Promise')); +defineProperty(global, 'Promise', () => require('../Promise')); // Set up regenerator. defineProperty(global, 'regeneratorRuntime', () => { @@ -178,14 +178,14 @@ defineProperty(global, 'regeneratorRuntime', () => { // Set up XHR // The native XMLHttpRequest in Chrome dev tools is CORS aware and won't // let you fetch anything from the internet -defineProperty(global, 'XMLHttpRequest', () => require('XMLHttpRequest')); -defineProperty(global, 'FormData', () => require('FormData')); +defineProperty(global, 'XMLHttpRequest', () => require('../Network/XMLHttpRequest')); +defineProperty(global, 'FormData', () => require('../Network/FormData')); -defineProperty(global, 'fetch', () => require('fetch').fetch); -defineProperty(global, 'Headers', () => require('fetch').Headers); -defineProperty(global, 'Request', () => require('fetch').Request); -defineProperty(global, 'Response', () => require('fetch').Response); -defineProperty(global, 'WebSocket', () => require('WebSocket')); +defineProperty(global, 'fetch', () => require('../Network/fetch').fetch); +defineProperty(global, 'Headers', () => require('../Network/fetch').Headers); +defineProperty(global, 'Request', () => require('../Network/fetch').Request); +defineProperty(global, 'Response', () => require('../Network/fetch').Response); +defineProperty(global, 'WebSocket', () => require('../WebSocket/WebSocket')); // Set up Geolocation let navigator = global.navigator; @@ -195,13 +195,13 @@ if (navigator === undefined) { // see https://github.com/facebook/react-native/issues/10881 defineProperty(navigator, 'product', () => 'ReactNative', true); -defineProperty(navigator, 'geolocation', () => require('Geolocation')); +defineProperty(navigator, 'geolocation', () => require('../Geolocation/Geolocation')); // Set up collections // We can't make these lazy because `Map` checks for `global.Map` (which wouldc // not exist if it were lazily defined). -defineProperty(global, 'Map', () => require('Map'), true); -defineProperty(global, 'Set', () => require('Set'), true); +defineProperty(global, 'Map', () => require('../vendor/core/Map'), true); +defineProperty(global, 'Set', () => require('../vendor/core/Set'), true); // Set up devtools if (__DEV__) { @@ -209,23 +209,23 @@ if (__DEV__) { // not when debugging in chrome // TODO(t12832058) This check is broken if (!window.document) { - require('setupDevtools'); + require('./Devtools/setupDevtools'); } - require('RCTDebugComponentOwnership'); + require('../DebugComponentHierarchy/RCTDebugComponentOwnership'); } } // Set up inspector if (__DEV__) { if (!global.__RCTProfileIsProfiling) { - const JSInspector = require('JSInspector'); - JSInspector.registerAgent(require('NetworkAgent')); + const JSInspector = require('../JSInspector/JSInspector'); + JSInspector.registerAgent(require('../JSInspector/NetworkAgent')); } } // Just to make sure the JS gets packaged up. Wait until the JS environment has // been initialized before requiring them. -require('RCTDeviceEventEmitter'); -require('RCTNativeAppEventEmitter'); -require('PerformanceLogger'); +require('../EventEmitter/RCTDeviceEventEmitter'); +require('../EventEmitter/RCTNativeAppEventEmitter'); +require('../Utilities/PerformanceLogger'); diff --git a/Libraries/Core/Timers/JSTimers.js b/Libraries/Core/Timers/JSTimers.js index a236c07cb765..190841a08b1b 100644 --- a/Libraries/Core/Timers/JSTimers.js +++ b/Libraries/Core/Timers/JSTimers.js @@ -13,10 +13,10 @@ // Note that the module JSTimers is split into two in order to solve a cycle // in dependencies. NativeModules > BatchedBridge > MessageQueue > JSTimersExecution -const JSTimersExecution = require('JSTimersExecution'); -const Platform = require('Platform'); +const JSTimersExecution = require('./JSTimersExecution'); +const Platform = require('../../Utilities/Platform'); -const {Timing} = require('NativeModules'); +const {Timing} = require('../../BatchedBridge/NativeModules'); import type {JSTimerType} from 'JSTimersExecution'; @@ -36,7 +36,7 @@ function _allocateCallback(func: Function, type: JSTimerType): number { JSTimersExecution.callbacks[freeIndex] = func; JSTimersExecution.types[freeIndex] = type; if (__DEV__) { - const parseErrorStack = require('parseErrorStack'); + const parseErrorStack = require('../Devtools/parseErrorStack'); const e = (new Error() : any); e.framesToPop = 1; const stack = parseErrorStack(e); diff --git a/Libraries/Core/Timers/JSTimersExecution.js b/Libraries/Core/Timers/JSTimersExecution.js index ee2275c33687..dd75048bde55 100644 --- a/Libraries/Core/Timers/JSTimersExecution.js +++ b/Libraries/Core/Timers/JSTimersExecution.js @@ -11,7 +11,7 @@ */ 'use strict'; -const Systrace = require('Systrace'); +const Systrace = require('../../Performance/Systrace'); const invariant = require('fbjs/lib/invariant'); const performanceNow = require('fbjs/lib/performanceNow'); @@ -143,7 +143,7 @@ const JSTimersExecution = { // Throw all the other errors in a setTimeout, which will throw each // error one at a time for (let ii = 1; ii < errorCount; ii++) { - require('JSTimers').setTimeout( + require('./JSTimers').setTimeout( ((error) => { throw error; }).bind(null, errors[ii]), 0 ); @@ -169,13 +169,13 @@ const JSTimersExecution = { } if (JSTimersExecution.requestIdleCallbacks.length === 0) { - const { Timing } = require('NativeModules'); + const { Timing } = require('../../BatchedBridge/NativeModules'); Timing.setSendIdleEvents(false); } if (JSTimersExecution.errors) { JSTimersExecution.errors.forEach((error) => - require('JSTimers').setTimeout(() => { throw error; }, 0) + require('./JSTimers').setTimeout(() => { throw error; }, 0) ); } }, @@ -214,7 +214,7 @@ const JSTimersExecution = { while (JSTimersExecution.callImmediatesPass()) {} if (JSTimersExecution.errors) { JSTimersExecution.errors.forEach((error) => - require('JSTimers').setTimeout(() => { throw error; }, 0) + require('./JSTimers').setTimeout(() => { throw error; }, 0) ); } }, diff --git a/Libraries/DebugComponentHierarchy/RCTDebugComponentOwnership.js b/Libraries/DebugComponentHierarchy/RCTDebugComponentOwnership.js index db569ee4b103..5126a15617e7 100644 --- a/Libraries/DebugComponentHierarchy/RCTDebugComponentOwnership.js +++ b/Libraries/DebugComponentHierarchy/RCTDebugComponentOwnership.js @@ -15,7 +15,7 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); +var BatchedBridge = require('../BatchedBridge/BatchedBridge'); var RCTDebugComponentOwnership = { /** diff --git a/Libraries/EventEmitter/EmitterSubscription.js b/Libraries/EventEmitter/EmitterSubscription.js index fd6f6c1baaa5..5caf171b8694 100644 --- a/Libraries/EventEmitter/EmitterSubscription.js +++ b/Libraries/EventEmitter/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/EventEmitter/EventEmitter.js b/Libraries/EventEmitter/EventEmitter.js index 5f981ceeb1b1..c94be30b99c1 100644 --- a/Libraries/EventEmitter/EventEmitter.js +++ b/Libraries/EventEmitter/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/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js index 67774a1655f4..0519ae7962fc 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('./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 05507bd8bcd6..a1693a50d54f 100644 --- a/Libraries/EventEmitter/RCTDeviceEventEmitter.js +++ b/Libraries/EventEmitter/RCTDeviceEventEmitter.js @@ -11,9 +11,9 @@ */ 'use strict'; -const EventEmitter = require('EventEmitter'); -const EventSubscriptionVendor = require('EventSubscriptionVendor'); -const BatchedBridge = require('BatchedBridge'); +const EventEmitter = require('./EventEmitter'); +const EventSubscriptionVendor = require('./EventSubscriptionVendor'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); import type EmitterSubscription from 'EmitterSubscription'; @@ -35,15 +35,15 @@ class RCTDeviceEventEmitter extends EventEmitter { if (eventType) { if (eventType.lastIndexOf('statusBar', 0) === 0) { console.warn('`%s` event should be registered via the StatusBarIOS module', eventType); - return require('StatusBarIOS'); + return require('../Components/StatusBar/StatusBarIOS'); } if (eventType.lastIndexOf('keyboard', 0) === 0) { console.warn('`%s` event should be registered via the Keyboard module', eventType); - return require('Keyboard'); + return require('../Components/Keyboard/Keyboard'); } if (eventType === 'appStateDidChange' || eventType === 'memoryWarning') { console.warn('`%s` event should be registered via the AppState module', eventType); - return require('AppState'); + return require('../AppState/AppState'); } } return null; diff --git a/Libraries/EventEmitter/RCTEventEmitter.js b/Libraries/EventEmitter/RCTEventEmitter.js index 76200db890f0..2d2ac4a1bfd3 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 b59c54fc36d8..a1585029cf1c 100644 --- a/Libraries/EventEmitter/RCTNativeAppEventEmitter.js +++ b/Libraries/EventEmitter/RCTNativeAppEventEmitter.js @@ -11,8 +11,8 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +const RCTDeviceEventEmitter = require('./RCTDeviceEventEmitter'); /** * Deprecated - subclass NativeEventEmitter to create granular event modules instead of diff --git a/Libraries/EventEmitter/mixInEventEmitter.js b/Libraries/EventEmitter/mixInEventEmitter.js index d5db027bb630..a901e4610680 100644 --- a/Libraries/EventEmitter/mixInEventEmitter.js +++ b/Libraries/EventEmitter/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/Libraries/Experimental/Incremental.js b/Libraries/Experimental/Incremental.js index 82682cbf7fe8..4afc3aaf6f51 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 721f2b9d3842..718dd2f08c2a 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 bb44b1750c5b..622840950f4d 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 953690b2c23d..83cc2144d370 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 953810447715..1fcd63b00757 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableListView.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableListView.js @@ -11,10 +11,10 @@ */ 'use strict'; -const ListView = require('ListView'); -const React = require('React'); -const SwipeableListViewDataSource = require('SwipeableListViewDataSource'); -const SwipeableRow = require('SwipeableRow'); +const ListView = require('../../Lists/ListView/ListView'); +const React = require('../../react-native/React'); +const SwipeableListViewDataSource = require('./SwipeableListViewDataSource'); +const SwipeableRow = require('./SwipeableRow'); const {PropTypes} = React; diff --git a/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js b/Libraries/Experimental/SwipeableRow/SwipeableListViewDataSource.js index 506b434160d9..68ac06582bfb 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 ec6780e9d2e8..9642c95826d5 100644 --- a/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js +++ b/Libraries/Experimental/SwipeableRow/SwipeableQuickActionButton.js @@ -11,14 +11,14 @@ */ 'use strict'; -const Image = require('Image'); -const React = require('React'); +const Image = require('../../Image/Image'); +const React = require('../../react-native/React'); const PropTypes = require('prop-types'); -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 ViewPropTypes = require('ViewPropTypes'); +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 48b90cea4c49..eaa6e7efc781 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 5a7c575c4f20..1cbce92aed96 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 emptyFunction = require('fbjs/lib/emptyFunction'); diff --git a/Libraries/Experimental/WindowedListView.js b/Libraries/Experimental/WindowedListView.js index c512adb7330e..7c55329a1e26 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'); @@ -704,7 +704,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 c8fd2890e8ce..829b1c1ebadd 100644 --- a/Libraries/Geolocation/Geolocation.js +++ b/Libraries/Geolocation/Geolocation.js @@ -11,11 +11,11 @@ */ '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); diff --git a/Libraries/Image/AssetSourceResolver.js b/Libraries/Image/AssetSourceResolver.js index e8a747148eb8..827b0a2a1a2b 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 4be34bddb5e2..8c2c2f3ee2f6 100644 --- a/Libraries/Image/Image.android.js +++ b/Libraries/Image/Image.android.js @@ -11,25 +11,25 @@ */ '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/src/renderers/native/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 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 fc37065ec115..8f4e92cc7c0d 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -11,21 +11,21 @@ */ '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/src/renderers/native/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 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 aff1632e9c7c..90874ab61d3c 100644 --- a/Libraries/Image/ImageBackground.js +++ b/Libraries/Image/ImageBackground.js @@ -12,9 +12,9 @@ */ 'use strict'; -const Image = require('Image'); -const React = require('React'); -const View = require('View'); +const Image = require('./Image'); +const React = require('../react-native/React'); +const View = require('../Components/View/View'); /** * Very simple drop-in replacement for which supports nesting views. diff --git a/Libraries/Image/ImageEditor.js b/Libraries/Image/ImageEditor.js index 3e0a4d3d2111..1a8be37f5c08 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/ImageSourcePropType.js b/Libraries/Image/ImageSourcePropType.js index 4c7b3a7c90f3..72efafd9d663 100644 --- a/Libraries/Image/ImageSourcePropType.js +++ b/Libraries/Image/ImageSourcePropType.js @@ -11,7 +11,7 @@ */ 'use strict'; -const {PropTypes} = require('React'); +const {PropTypes} = require('../react-native/React'); const ImageURISourcePropType = PropTypes.shape({ /** diff --git a/Libraries/Image/ImageStore.js b/Libraries/Image/ImageStore.js index f03262d6d08f..dd1dfd88921b 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 9bb68402424f..031e1dc33856 100644 --- a/Libraries/Image/ImageStylePropTypes.js +++ b/Libraries/Image/ImageStylePropTypes.js @@ -11,13 +11,13 @@ */ 'use strict'; -var ImageResizeMode = require('ImageResizeMode'); -var LayoutPropTypes = require('LayoutPropTypes'); -var ColorPropType = require('ColorPropType'); -var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); -var TransformPropTypes = require('TransformPropTypes'); +var ImageResizeMode = require('./ImageResizeMode'); +var LayoutPropTypes = require('../StyleSheet/LayoutPropTypes'); +var ColorPropType = require('../StyleSheet/ColorPropType'); +var ShadowPropTypesIOS = require('../Components/View/ShadowPropTypesIOS'); +var TransformPropTypes = require('../StyleSheet/TransformPropTypes'); -var ReactPropTypes = require('React').PropTypes; +var ReactPropTypes = require('../react-native/React').PropTypes; var ImageStylePropTypes = { ...LayoutPropTypes, diff --git a/Libraries/Image/RelativeImageStub.js b/Libraries/Image/RelativeImageStub.js index b788548b6662..3720d542b388 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 packager/src/Bundler/index.js -var AssetRegistry = require('AssetRegistry'); +var AssetRegistry = require('./AssetRegistry'); module.exports = AssetRegistry.registerAsset({ __packager_asset: true, diff --git a/Libraries/Image/nativeImageSource.js b/Libraries/Image/nativeImageSource.js index d9d71da7cda6..6528b2efff99 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 71ec3715cb85..bc0edb5399eb 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 caee8ccd6b33..b5fe50f88afa 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 e50d9869aac7..c4f1c3267fd5 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 a3851001c2ee..8ec0addd0d0a 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 7ca7ee1f3eb0..eccfe84f5332 100644 --- a/Libraries/Inspector/ElementProperties.js +++ b/Libraries/Inspector/ElementProperties.js @@ -11,19 +11,19 @@ */ 'use strict'; -const BoxInspector = require('BoxInspector'); -const React = require('React'); +const BoxInspector = require('./BoxInspector'); +const React = require('../react-native/React'); const PropTypes = require('prop-types'); -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 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 97e480b5a7b8..adaa4aa0f645 100644 --- a/Libraries/Inspector/Inspector.js +++ b/Libraries/Inspector/Inspector.js @@ -14,20 +14,20 @@ 'use strict'; -const Dimensions = require('Dimensions'); -const InspectorOverlay = require('InspectorOverlay'); -const InspectorPanel = require('InspectorPanel'); -const InspectorUtils = require('InspectorUtils'); -const Platform = require('Platform'); -const React = require('React'); -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 InspectorUtils = require('./InspectorUtils'); +const Platform = require('../Utilities/Platform'); +const React = require('../react-native/React'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const Touchable = require('../Components/Touchable/Touchable'); +const UIManager = require('../ReactNative/UIManager'); +const View = require('../Components/View/View'); if (window.__REACT_DEVTOOLS_GLOBAL_HOOK__) { // required for devtools to be able to edit react native styles - window.__REACT_DEVTOOLS_GLOBAL_HOOK__.resolveRNStyle = require('flattenStyle'); + window.__REACT_DEVTOOLS_GLOBAL_HOOK__.resolveRNStyle = require('../StyleSheet/flattenStyle'); } class Inspector extends React.Component { diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index b7a72ae7771b..6c1dc5923605 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -11,14 +11,14 @@ */ 'use strict'; -var Dimensions = require('Dimensions'); -var InspectorUtils = require('InspectorUtils'); -var React = require('React'); +var Dimensions = require('../Utilities/Dimensions'); +var InspectorUtils = require('./InspectorUtils'); +var React = require('../react-native/React'); var PropTypes = require('prop-types'); -var StyleSheet = require('StyleSheet'); -var UIManager = require('UIManager'); -var View = require('View'); -var ElementBox = require('ElementBox'); +var StyleSheet = require('../StyleSheet/StyleSheet'); +var UIManager = require('../ReactNative/UIManager'); +var View = require('../Components/View/View'); +var ElementBox = require('./ElementBox'); type EventLike = { nativeEvent: Object, diff --git a/Libraries/Inspector/InspectorPanel.js b/Libraries/Inspector/InspectorPanel.js index d2a4c3dbd8d9..309812e2f0d5 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/InspectorUtils.js b/Libraries/Inspector/InspectorUtils.js index ef43c2d044ac..c9fd9852832a 100644 --- a/Libraries/Inspector/InspectorUtils.js +++ b/Libraries/Inspector/InspectorUtils.js @@ -10,7 +10,7 @@ */ 'use strict'; -var ReactNativeComponentTree = require('ReactNativeComponentTree'); +var ReactNativeComponentTree = require('../Renderer/src/renderers/native/ReactNativeComponentTree'); function traverseOwnerTreeUp(hierarchy, instance) { if (instance) { diff --git a/Libraries/Inspector/NetworkOverlay.js b/Libraries/Inspector/NetworkOverlay.js index 70a50b6785fd..072436504881 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 9eb51a380c91..b7f3f145b99a 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 96db90e8a076..fb38bc93df89 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 e807e5515e7f..4263a00ddca3 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 920dab5f9db3..daa9368ed4b9 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 3f1265b4140b..977c521c4c29 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 5beb56e59c46..01b5d543c883 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('../EventEmitter/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 b0e3104407ea..0497b3bc0e45 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 782abbf7edae..eeff2484208e 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 acd3f7575c52..7ff7018e90e1 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 bc6774e985eb..e1c2ce9878d7 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/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath'); const currentCentroidXOfTouchesChangedAfter = TouchHistoryMath.currentCentroidXOfTouchesChangedAfter; const currentCentroidYOfTouchesChangedAfter = TouchHistoryMath.currentCentroidYOfTouchesChangedAfter; diff --git a/Libraries/Interaction/ReactPerfStallHandler.js b/Libraries/Interaction/ReactPerfStallHandler.js index 0644ace6af5e..5c7a7d22b259 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/src/renderers/shared/ReactPerf'); const ReactPerfStallHandler = { register: function() { diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js index 660241fb35bc..815a8aa7b055 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/JSInspector/NetworkAgent.js b/Libraries/JSInspector/NetworkAgent.js index 4314411b8e00..adc5000e12c5 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 1b218201b70a..c3fbf711a72a 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 98e10b7c45e6..9c31580abd94 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 ea615d2363d6..9df542c29004 100644 --- a/Libraries/Lists/FlatList.js +++ b/Libraries/Lists/FlatList.js @@ -11,10 +11,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 2001888c83e8..4e36823d1d9f 100644 --- a/Libraries/Lists/ListView/ListView.js +++ b/Libraries/Lists/ListView/ListView.js @@ -11,21 +11,21 @@ */ '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/src/renderers/native/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 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 062907e17bb8..f36323acf409 100644 --- a/Libraries/Lists/ListView/ListViewDataSource.js +++ b/Libraries/Lists/ListView/ListViewDataSource.js @@ -12,7 +12,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/MetroListView.js b/Libraries/Lists/MetroListView.js index 508a020f7eca..18c582e96acf 100644 --- a/Libraries/Lists/MetroListView.js +++ b/Libraries/Lists/MetroListView.js @@ -11,10 +11,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 3e9fcae790c2..eb5b2d4b4582 100644 --- a/Libraries/Lists/SectionList.js +++ b/Libraries/Lists/SectionList.js @@ -11,10 +11,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 68aefe40e670..5ef4f08e9c6d 100644 --- a/Libraries/Lists/VirtualizedList.js +++ b/Libraries/Lists/VirtualizedList.js @@ -11,21 +11,21 @@ */ 'use strict'; -const Batchinator = require('Batchinator'); -const FillRateHelper = require('FillRateHelper'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const RefreshControl = require('RefreshControl'); -const ScrollView = require('ScrollView'); -const View = require('View'); -const ViewabilityHelper = require('ViewabilityHelper'); - -const flattenStyle = require('flattenStyle'); -const infoLog = require('infoLog'); +const Batchinator = require('../Interaction/Batchinator'); +const FillRateHelper = require('./FillRateHelper'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/src/renderers/native/ReactNative'); +const RefreshControl = require('../Components/RefreshControl/RefreshControl'); +const ScrollView = require('../Components/ScrollView/ScrollView'); +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 {ViewabilityConfig, ViewToken} from 'ViewabilityHelper'; diff --git a/Libraries/Lists/VirtualizedSectionList.js b/Libraries/Lists/VirtualizedSectionList.js index 474f808620db..786e48ad7ed5 100644 --- a/Libraries/Lists/VirtualizedSectionList.js +++ b/Libraries/Lists/VirtualizedSectionList.js @@ -11,9 +11,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 b77b88b22a22..fece2fba7efd 100644 --- a/Libraries/Lists/__flowtests__/FlatList-flowtest.js +++ b/Libraries/Lists/__flowtests__/FlatList-flowtest.js @@ -11,7 +11,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 4f94e6dc2c3f..b396b00b45e5 100644 --- a/Libraries/Lists/__flowtests__/SectionList-flowtest.js +++ b/Libraries/Lists/__flowtests__/SectionList-flowtest.js @@ -12,7 +12,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/Modal/Modal.js b/Libraries/Modal/Modal.js index 2243da9d7004..6ea68e1bae80 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 c10166a53c23..6502836d835d 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 e8bee18a37a4..68a0b0758ff5 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 FormData = require('FormData'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; -const convertRequestBody = require('convertRequestBody'); +const FormData = require('./FormData'); +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 dd569a07d36a..ae7c65aa82c8 100644 --- a/Libraries/Network/RCTNetworking.ios.js +++ b/Libraries/Network/RCTNetworking.ios.js @@ -11,10 +11,10 @@ */ 'use strict'; -const FormData = require('FormData'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; -const convertRequestBody = require('convertRequestBody'); +const FormData = require('./FormData'); +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 0c037c8e0359..60d125cc50a9 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 3e7f3953b3b8..8685a8718530 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/convertRequestBody.js b/Libraries/Network/convertRequestBody.js index e82689692bf1..96c23904ecd2 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/RCTRenderingPerf.js b/Libraries/Performance/RCTRenderingPerf.js index c15e742a0d2a..fca38a077d5c 100644 --- a/Libraries/Performance/RCTRenderingPerf.js +++ b/Libraries/Performance/RCTRenderingPerf.js @@ -11,8 +11,8 @@ */ 'use strict'; -var ReactDebugTool = require('ReactDebugTool'); -var ReactPerf = require('ReactPerf'); +var ReactDebugTool = require('../Renderer/src/renderers/shared/ReactDebugTool'); +var ReactPerf = require('../Renderer/src/renderers/shared/ReactPerf'); var invariant = require('fbjs/lib/invariant'); var performanceNow = require('fbjs/lib/performanceNow'); diff --git a/Libraries/Performance/SamplingProfiler.js b/Libraries/Performance/SamplingProfiler.js index 75982f51bd62..43fd5f7df70d 100644 --- a/Libraries/Performance/SamplingProfiler.js +++ b/Libraries/Performance/SamplingProfiler.js @@ -27,7 +27,7 @@ var SamplingProfiler = { 'Error occured when restarting Sampling Profiler: ' + e.toString()); error = e.toString(); } - require('NativeModules').JSCSamplingProfiler.operationComplete( + require('../BatchedBridge/NativeModules').JSCSamplingProfiler.operationComplete( token, result, error); }, }; diff --git a/Libraries/Performance/Systrace.js b/Libraries/Performance/Systrace.js index 15bade515b16..f75c39a5d5d5 100644 --- a/Libraries/Performance/Systrace.js +++ b/Libraries/Performance/Systrace.js @@ -32,7 +32,7 @@ let _asyncCookie = 0; const ReactSystraceDevtool = __DEV__ ? { onBeforeMountComponent(debugID) { - const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook; + const ReactComponentTreeHook = require('../Renderer/src/renderers/shared/ReactGlobalSharedState').ReactComponentTreeHook; const displayName = ReactComponentTreeHook.getDisplayName(debugID); Systrace.beginEvent(`ReactReconciler.mountComponent(${displayName})`); }, @@ -40,7 +40,7 @@ const ReactSystraceDevtool = __DEV__ ? { Systrace.endEvent(); }, onBeforeUpdateComponent(debugID) { - const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook; + const ReactComponentTreeHook = require('../Renderer/src/renderers/shared/ReactGlobalSharedState').ReactComponentTreeHook; const displayName = ReactComponentTreeHook.getDisplayName(debugID); Systrace.beginEvent(`ReactReconciler.updateComponent(${displayName})`); }, @@ -48,7 +48,7 @@ const ReactSystraceDevtool = __DEV__ ? { Systrace.endEvent(); }, onBeforeUnmountComponent(debugID) { - const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook; + const ReactComponentTreeHook = require('../Renderer/src/renderers/shared/ReactGlobalSharedState').ReactComponentTreeHook; const displayName = ReactComponentTreeHook.getDisplayName(debugID); Systrace.beginEvent(`ReactReconciler.unmountComponent(${displayName})`); }, @@ -56,7 +56,7 @@ const ReactSystraceDevtool = __DEV__ ? { Systrace.endEvent(); }, onBeginLifeCycleTimer(debugID, timerType) { - const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook; + const ReactComponentTreeHook = require('../Renderer/src/renderers/shared/ReactGlobalSharedState').ReactComponentTreeHook; const displayName = ReactComponentTreeHook.getDisplayName(debugID); Systrace.beginEvent(`${displayName}.${timerType}()`); }, @@ -71,10 +71,10 @@ const Systrace = { if (__DEV__) { if (enabled) { global.nativeTraceBeginLegacy && global.nativeTraceBeginLegacy(TRACE_TAG_JSC_CALLS); - require('ReactDebugTool').addHook(ReactSystraceDevtool); + require('../Renderer/src/renderers/shared/ReactDebugTool').addHook(ReactSystraceDevtool); } else { global.nativeTraceEndLegacy && global.nativeTraceEndLegacy(TRACE_TAG_JSC_CALLS); - require('ReactDebugTool').removeHook(ReactSystraceDevtool); + require('../Renderer/src/renderers/shared/ReactDebugTool').removeHook(ReactSystraceDevtool); } } _enabled = enabled; diff --git a/Libraries/PermissionsAndroid/PermissionsAndroid.js b/Libraries/PermissionsAndroid/PermissionsAndroid.js index 69db4e604af3..11b3f76c2749 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 83de728b5c8a..6a3270df1c13 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 c9127822d50c..128e594a1ef4 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 07048b7eb820..8b8a68788bd3 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 34def83c5e04..99f15973603f 100644 --- a/Libraries/ReactNative/AppContainer.js +++ b/Libraries/ReactNative/AppContainer.js @@ -12,12 +12,12 @@ 'use strict'; -const EmitterSubscription = require('EmitterSubscription'); -const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); -const React = require('React'); -const ReactNative = require('ReactNative'); -const StyleSheet = require('StyleSheet'); -const View = require('View'); +const EmitterSubscription = require('../EventEmitter/EmitterSubscription'); +const RCTDeviceEventEmitter = require('../EventEmitter/RCTDeviceEventEmitter'); +const React = require('../react-native/React'); +const ReactNative = require('../Renderer/src/renderers/native/ReactNative'); +const StyleSheet = require('../StyleSheet/StyleSheet'); +const View = require('../Components/View/View'); type Context = { rootTag: number, @@ -56,7 +56,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 1fdefe74d75f..40d100ee0b42 100644 --- a/Libraries/ReactNative/AppRegistry.js +++ b/Libraries/ReactNative/AppRegistry.js @@ -11,21 +11,21 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); -const BugReporting = require('BugReporting'); -const FrameRateLogger = require('FrameRateLogger'); -const NativeModules = require('NativeModules'); -const ReactNative = require('ReactNative'); -const SceneTracker = require('SceneTracker'); - -const infoLog = require('infoLog'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +const BugReporting = require('../BugReporting/BugReporting'); +const FrameRateLogger = require('../Interaction/FrameRateLogger'); +const NativeModules = require('../BatchedBridge/NativeModules'); +const ReactNative = require('../Renderer/src/renderers/native/ReactNative'); +const SceneTracker = require('../Utilities/SceneTracker'); + +const infoLog = require('../Utilities/infoLog'); const invariant = require('fbjs/lib/invariant'); -const renderApplication = require('renderApplication'); +const renderApplication = require('./renderApplication'); if (__DEV__) { // In order to use Cmd+P to record/dump perf data, we need to make sure // this module is available in the bundle - require('RCTRenderingPerf'); + require('../Performance/RCTRenderingPerf'); } type Task = (taskData: any) => Promise; diff --git a/Libraries/ReactNative/I18nManager.js b/Libraries/ReactNative/I18nManager.js index 764058d5fbca..7da48c14763c 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 3ae73c303d12..07b4af563fa5 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 a3b8779234f5..9a209e6de6ed 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 d6d2514b829e..c44bfa35c7ba 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('../EventEmitter/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 13cd5d1ca9cf..f77e925c71c2 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 0175b5c6f58e..5d9ba9d152b4 100644 --- a/Libraries/ReactNative/renderApplication.js +++ b/Libraries/ReactNative/renderApplication.js @@ -12,14 +12,14 @@ 'use strict'; -var AppContainer = require('AppContainer'); -var React = require('React'); -var ReactNative = require('ReactNative'); +var AppContainer = require('./AppContainer'); +var React = require('../react-native/React'); +var ReactNative = require('../Renderer/src/renderers/native/ReactNative'); var 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 00327a97c73e..7f8d18d654f7 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/src/renderers/native/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 d140182760a6..e5106062ab5c 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/src/renderers/native/NativeMethodsMixin.js b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js index 44b5dcc2382d..7f7a19f18067 100644 --- a/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js +++ b/Libraries/Renderer/src/renderers/native/NativeMethodsMixin.js @@ -11,20 +11,20 @@ */ 'use strict'; -var ReactNative = require('ReactNative'); -var ReactNativeFeatureFlags = require('ReactNativeFeatureFlags'); -var ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -var TextInputState = require('TextInputState'); -var UIManager = require('UIManager'); +var ReactNative = require('./ReactNative'); +var ReactNativeFeatureFlags = require('./ReactNativeFeatureFlags'); +var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +var TextInputState = require('../../../../Components/TextInput/TextInputState'); +var UIManager = require('../../../../ReactNative/UIManager'); var invariant = require('fbjs/lib/invariant'); -var findNodeHandle = require('findNodeHandle'); +var findNodeHandle = require('./findNodeHandle'); var { mountSafeCallback, throwOnStylesProp, warnForStyleProps, -} = require('NativeMethodsMixinUtils'); +} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, @@ -132,7 +132,7 @@ var NativeMethodsMixin = { // Without having executed ReactNative. // Defer the factory function until now to avoid a cycle with UIManager. // TODO (bvaughn) Remove this once ReactNativeStack is dropped. - require('ReactNative'); + require('./ReactNative'); injectedSetNativeProps(this, nativeProps); }, diff --git a/Libraries/Renderer/src/renderers/native/ReactNative.js b/Libraries/Renderer/src/renderers/native/ReactNative.js index 82b12de9a1ca..7e4b96ffcec8 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNative.js +++ b/Libraries/Renderer/src/renderers/native/ReactNative.js @@ -11,8 +11,8 @@ */ 'use strict'; -const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags'); +const ReactNativeFeatureFlags = require('./ReactNativeFeatureFlags'); module.exports = ReactNativeFeatureFlags.useFiber - ? require('ReactNativeFiber') - : require('ReactNativeStack'); + ? require('./ReactNativeFiber') + : require('./ReactNativeStack'); diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js b/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js index 07dd2058de78..8761c4def8aa 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload.js @@ -11,10 +11,10 @@ */ 'use strict'; -var ReactNativePropRegistry = require('ReactNativePropRegistry'); +var ReactNativePropRegistry = require('./ReactNativePropRegistry'); -var deepDiffer = require('deepDiffer'); -var flattenStyle = require('flattenStyle'); +var deepDiffer = require('../../../../Utilities/differ/deepDiffer'); +var flattenStyle = require('../../../../StyleSheet/flattenStyle'); var emptyObject = {}; diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js index fba2116e86ee..990779d873fe 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js @@ -12,14 +12,14 @@ 'use strict'; -var NativeMethodsMixin = require('NativeMethodsMixin'); -var ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeTagHandles = require('ReactNativeTagHandles'); -var ReactMultiChild = require('ReactMultiChild'); -var UIManager = require('UIManager'); - -var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); +var NativeMethodsMixin = require('./NativeMethodsMixin'); +var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeTagHandles = require('./ReactNativeTagHandles'); +var ReactMultiChild = require('../shared/stack/reconciler/ReactMultiChild'); +var UIManager = require('../../../../ReactNative/UIManager'); + +var deepFreezeAndThrowOnMutationInDev = require('../../../../Utilities/deepFreezeAndThrowOnMutationInDev'); type ReactNativeBaseComponentViewConfig = { validAttributes: Object, diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js b/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js index 628b9e0d0ffc..abf16f47b1f8 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeBridgeEventPlugin.js @@ -11,9 +11,9 @@ */ 'use strict'; -var EventPropagators = require('EventPropagators'); -var SyntheticEvent = require('SyntheticEvent'); -var UIManager = require('UIManager'); +var EventPropagators = require('../shared/shared/event/EventPropagators'); +var SyntheticEvent = require('../shared/shared/event/SyntheticEvent'); +var UIManager = require('../../../../ReactNative/UIManager'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js b/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js index 0e1a3f582677..531318becf49 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeComponentEnvironment.js @@ -11,8 +11,8 @@ */ 'use strict'; -var ReactNativeDOMIDOperations = require('ReactNativeDOMIDOperations'); -var ReactNativeReconcileTransaction = require('ReactNativeReconcileTransaction'); +var ReactNativeDOMIDOperations = require('./ReactNativeDOMIDOperations'); +var ReactNativeReconcileTransaction = require('./ReactNativeReconcileTransaction'); var ReactNativeComponentEnvironment = { processChildrenUpdates: ReactNativeDOMIDOperations.dangerouslyProcessChildrenUpdates, diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js b/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js index c008373f66c0..88b77ff2996a 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeDOMIDOperations.js @@ -10,8 +10,8 @@ */ 'use strict'; -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var UIManager = require('UIManager'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var UIManager = require('../../../../ReactNative/UIManager'); /** * Updates a component's children by processing a series of updates. diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js index 42b69aa15066..cf721b65d00a 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter.js @@ -11,12 +11,12 @@ */ 'use strict'; -var EventPluginHub = require('EventPluginHub'); -var EventPluginRegistry = require('EventPluginRegistry'); -var ReactEventEmitterMixin = require('ReactEventEmitterMixin'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeTagHandles = require('ReactNativeTagHandles'); -var ReactGenericBatching = require('ReactGenericBatching'); +var EventPluginHub = require('../shared/shared/event/EventPluginHub'); +var EventPluginRegistry = require('../shared/shared/event/EventPluginRegistry'); +var ReactEventEmitterMixin = require('../shared/shared/event/ReactEventEmitterMixin'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeTagHandles = require('./ReactNativeTagHandles'); +var ReactGenericBatching = require('../shared/shared/event/ReactGenericBatching'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js index 79a4acac1804..8dd94fa76eb3 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiber.js @@ -12,26 +12,26 @@ 'use strict'; -const ReactFiberErrorLogger = require('ReactFiberErrorLogger'); -const ReactFiberReconciler = require('ReactFiberReconciler'); -const ReactGenericBatching = require('ReactGenericBatching'); -const ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -const ReactNativeComponentTree = require('ReactNativeComponentTree'); -const ReactNativeFiberErrorDialog = require('ReactNativeFiberErrorDialog'); -const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent'); -const ReactNativeInjection = require('ReactNativeInjection'); -const ReactNativeTagHandles = require('ReactNativeTagHandles'); -const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry'); -const ReactPortal = require('ReactPortal'); -const ReactVersion = require('ReactVersion'); -const UIManager = require('UIManager'); - -const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); +const ReactFiberErrorLogger = require('../shared/fiber/ReactFiberErrorLogger'); +const ReactFiberReconciler = require('../shared/fiber/ReactFiberReconciler'); +const ReactGenericBatching = require('../shared/shared/event/ReactGenericBatching'); +const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +const ReactNativeComponentTree = require('./ReactNativeComponentTree'); +const ReactNativeFiberErrorDialog = require('./ReactNativeFiberErrorDialog'); +const ReactNativeFiberHostComponent = require('./ReactNativeFiberHostComponent'); +const ReactNativeInjection = require('./ReactNativeInjection'); +const ReactNativeTagHandles = require('./ReactNativeTagHandles'); +const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); +const ReactPortal = require('../shared/fiber/isomorphic/ReactPortal'); +const ReactVersion = require('../../ReactVersion'); +const UIManager = require('../../../../ReactNative/UIManager'); + +const deepFreezeAndThrowOnMutationInDev = require('../../../../Utilities/deepFreezeAndThrowOnMutationInDev'); const emptyObject = require('fbjs/lib/emptyObject'); -const findNodeHandle = require('findNodeHandle'); +const findNodeHandle = require('./findNodeHandle'); const invariant = require('fbjs/lib/invariant'); -const {injectInternals} = require('ReactFiberDevToolsHook'); +const {injectInternals} = require('../shared/fiber/ReactFiberDevToolsHook'); import type {Element} from 'React'; import type {Fiber} from 'ReactFiber'; diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js index 3d65ac466303..3a24b1abb7c8 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiberErrorDialog.js @@ -12,7 +12,7 @@ 'use strict'; -const ExceptionsManager = require('ExceptionsManager'); +const ExceptionsManager = require('../../../../Core/ExceptionsManager'); import type {CapturedError} from 'ReactFiberScheduler'; diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js index 017f08b84757..fae10937b154 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeFiberHostComponent.js @@ -13,11 +13,11 @@ 'use strict'; -var ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -var TextInputState = require('TextInputState'); -var UIManager = require('UIManager'); +var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +var TextInputState = require('../../../../Components/TextInput/TextInputState'); +var UIManager = require('../../../../ReactNative/UIManager'); -var {mountSafeCallback, warnForStyleProps} = require('NativeMethodsMixinUtils'); +var {mountSafeCallback, warnForStyleProps} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeGlobalResponderHandler.js b/Libraries/Renderer/src/renderers/native/ReactNativeGlobalResponderHandler.js index 73bfe047207a..f555191be689 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeGlobalResponderHandler.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeGlobalResponderHandler.js @@ -10,7 +10,7 @@ */ 'use strict'; -var UIManager = require('UIManager'); +var UIManager = require('../../../../ReactNative/UIManager'); var ReactNativeGlobalResponderHandler = { onChange: function(from, to, blockNativeResponder) { diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js b/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js index 116948d7bd9b..0023a13f1516 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeInjection.js @@ -17,17 +17,17 @@ * ensures it exists in the dependency graph and can be `require`d. * TODO: require this in packager, not in React #10932517 */ -require('InitializeCore'); +require('../../../../Core/InitializeCore'); -var EventPluginHub = require('EventPluginHub'); -var EventPluginUtils = require('EventPluginUtils'); -var RCTEventEmitter = require('RCTEventEmitter'); -var ReactNativeBridgeEventPlugin = require('ReactNativeBridgeEventPlugin'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeEventEmitter = require('ReactNativeEventEmitter'); -var ReactNativeEventPluginOrder = require('ReactNativeEventPluginOrder'); -var ReactNativeGlobalResponderHandler = require('ReactNativeGlobalResponderHandler'); -var ResponderEventPlugin = require('ResponderEventPlugin'); +var EventPluginHub = require('../shared/shared/event/EventPluginHub'); +var EventPluginUtils = require('../shared/shared/event/EventPluginUtils'); +var RCTEventEmitter = require('../../../../EventEmitter/RCTEventEmitter'); +var ReactNativeBridgeEventPlugin = require('./ReactNativeBridgeEventPlugin'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeEventEmitter = require('./ReactNativeEventEmitter'); +var ReactNativeEventPluginOrder = require('./ReactNativeEventPluginOrder'); +var ReactNativeGlobalResponderHandler = require('./ReactNativeGlobalResponderHandler'); +var ResponderEventPlugin = require('../shared/shared/event/eventPlugins/ResponderEventPlugin'); function inject() { /** diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeMount.js b/Libraries/Renderer/src/renderers/native/ReactNativeMount.js index ee4a28f45a05..bd43fb068ba3 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeMount.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeMount.js @@ -12,17 +12,17 @@ 'use strict'; var React = require('react'); -var ReactInstrumentation = require('ReactInstrumentation'); -var ReactNativeContainerInfo = require('ReactNativeContainerInfo'); -var ReactNativeTagHandles = require('ReactNativeTagHandles'); -var ReactReconciler = require('ReactReconciler'); -var ReactUpdateQueue = require('ReactUpdateQueue'); -var ReactUpdates = require('ReactUpdates'); -var UIManager = require('UIManager'); +var ReactInstrumentation = require('../shared/ReactInstrumentation'); +var ReactNativeContainerInfo = require('./ReactNativeContainerInfo'); +var ReactNativeTagHandles = require('./ReactNativeTagHandles'); +var ReactReconciler = require('../shared/stack/reconciler/ReactReconciler'); +var ReactUpdateQueue = require('../shared/stack/reconciler/ReactUpdateQueue'); +var ReactUpdates = require('../shared/stack/reconciler/ReactUpdates'); +var UIManager = require('../../../../ReactNative/UIManager'); var emptyObject = require('fbjs/lib/emptyObject'); -var instantiateReactComponent = require('instantiateReactComponent'); -var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); +var instantiateReactComponent = require('../shared/stack/reconciler/instantiateReactComponent'); +var shouldUpdateReactComponent = require('../shared/shared/shouldUpdateReactComponent'); /** * Temporary (?) hack so that we can store all top-level pending updates on @@ -87,7 +87,7 @@ var ReactNativeMount = { _instancesByContainerID: {}, // these two functions are needed by React Devtools - findNodeHandle: require('findNodeHandle'), + findNodeHandle: require('./findNodeHandle'), /** * @param {ReactComponent} instance Instance to render. diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js b/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js index 9ee4fc9815ac..c393478eef94 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeReconcileTransaction.js @@ -11,11 +11,11 @@ */ 'use strict'; -var CallbackQueue = require('CallbackQueue'); -var PooledClass = require('PooledClass'); -var Transaction = require('Transaction'); -var ReactInstrumentation = require('ReactInstrumentation'); -var ReactUpdateQueue = require('ReactUpdateQueue'); +var CallbackQueue = require('../shared/stack/reconciler/CallbackQueue'); +var PooledClass = require('../../shared/utils/PooledClass'); +var Transaction = require('../shared/stack/reconciler/Transaction'); +var ReactInstrumentation = require('../shared/ReactInstrumentation'); +var ReactUpdateQueue = require('../shared/stack/reconciler/ReactUpdateQueue'); /** * Provides a `CallbackQueue` queue for collecting `onDOMReady` callbacks during diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js index a9fa118cf27b..fcea44906678 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js @@ -11,13 +11,13 @@ */ 'use strict'; -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeInjection = require('ReactNativeInjection'); -var ReactNativeMount = require('ReactNativeMount'); -var ReactNativeStackInjection = require('ReactNativeStackInjection'); -var ReactUpdates = require('ReactUpdates'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeInjection = require('./ReactNativeInjection'); +var ReactNativeMount = require('./ReactNativeMount'); +var ReactNativeStackInjection = require('./ReactNativeStackInjection'); +var ReactUpdates = require('../shared/stack/reconciler/ReactUpdates'); -var findNodeHandle = require('findNodeHandle'); +var findNodeHandle = require('./findNodeHandle'); ReactNativeInjection.inject(); ReactNativeStackInjection.inject(); @@ -80,7 +80,7 @@ if ( }, }, Mount: ReactNativeMount, - Reconciler: require('ReactReconciler'), + Reconciler: require('../shared/stack/reconciler/ReactReconciler'), }); } diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js index 5aa3d3d879c4..b619ac5dfc76 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeStackInjection.js @@ -17,20 +17,20 @@ * ensures it exists in the dependency graph and can be `require`d. * TODO: require this in packager, not in React #10932517 */ -require('InitializeCore'); +require('../../../../Core/InitializeCore'); var React = require('react'); -var ReactComponentEnvironment = require('ReactComponentEnvironment'); -var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); -var ReactEmptyComponent = require('ReactEmptyComponent'); -var ReactGenericBatching = require('ReactGenericBatching'); -var ReactHostComponent = require('ReactHostComponent'); -var ReactNativeComponentEnvironment = require('ReactNativeComponentEnvironment'); -var ReactNativeTextComponent = require('ReactNativeTextComponent'); -var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent'); -var ReactUpdates = require('ReactUpdates'); +var ReactComponentEnvironment = require('../shared/stack/reconciler/ReactComponentEnvironment'); +var ReactDefaultBatchingStrategy = require('../shared/stack/reconciler/ReactDefaultBatchingStrategy'); +var ReactEmptyComponent = require('../shared/stack/reconciler/ReactEmptyComponent'); +var ReactGenericBatching = require('../shared/shared/event/ReactGenericBatching'); +var ReactHostComponent = require('../shared/stack/reconciler/ReactHostComponent'); +var ReactNativeComponentEnvironment = require('./ReactNativeComponentEnvironment'); +var ReactNativeTextComponent = require('./ReactNativeTextComponent'); +var ReactSimpleEmptyComponent = require('../shared/stack/reconciler/ReactSimpleEmptyComponent'); +var ReactUpdates = require('../shared/stack/reconciler/ReactUpdates'); -var findNodeHandle = require('findNodeHandle'); +var findNodeHandle = require('./findNodeHandle'); var invariant = require('fbjs/lib/invariant'); function inject() { @@ -50,7 +50,7 @@ function inject() { var EmptyComponent = instantiate => { // Can't import View at the top because it depends on React to make its composite - var View = require('View'); + var View = require('../../../../Components/View/View'); return new ReactSimpleEmptyComponent( React.createElement(View, { collapsable: true, diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js b/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js index 6f7988403aa9..851f85fcc93e 100644 --- a/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js +++ b/Libraries/Renderer/src/renderers/native/ReactNativeTextComponent.js @@ -11,9 +11,9 @@ 'use strict'; -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeTagHandles = require('ReactNativeTagHandles'); -var UIManager = require('UIManager'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeTagHandles = require('./ReactNativeTagHandles'); +var UIManager = require('../../../../ReactNative/UIManager'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js index f21632582854..f4958f1941cd 100644 --- a/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js +++ b/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass.js @@ -12,9 +12,9 @@ 'use strict'; -const ReactNativeBaseComponent = require('ReactNativeBaseComponent'); -const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags'); -const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry'); +const ReactNativeBaseComponent = require('./ReactNativeBaseComponent'); +const ReactNativeFeatureFlags = require('./ReactNativeFeatureFlags'); +const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); // See also ReactNativeBaseComponent type ReactNativeBaseComponentViewConfig = { diff --git a/Libraries/Renderer/src/renderers/native/findNodeHandle.js b/Libraries/Renderer/src/renderers/native/findNodeHandle.js index 34c511b860c9..9105adaf7ee9 100644 --- a/Libraries/Renderer/src/renderers/native/findNodeHandle.js +++ b/Libraries/Renderer/src/renderers/native/findNodeHandle.js @@ -12,10 +12,10 @@ 'use strict'; -var ReactInstanceMap = require('ReactInstanceMap'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactInstanceMap = require('../shared/shared/ReactInstanceMap'); +var {ReactCurrentOwner} = require('../shared/ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +var getComponentName = require('../../shared/utils/getComponentName'); var invariant = require('fbjs/lib/invariant'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/native/takeSnapshot.js b/Libraries/Renderer/src/renderers/native/takeSnapshot.js index 98608c83e5ff..5f5c496b7fea 100644 --- a/Libraries/Renderer/src/renderers/native/takeSnapshot.js +++ b/Libraries/Renderer/src/renderers/native/takeSnapshot.js @@ -11,8 +11,8 @@ */ 'use strict'; -var ReactNative = require('ReactNative'); -var UIManager = require('UIManager'); +var ReactNative = require('./ReactNative'); +var UIManager = require('../../../../ReactNative/UIManager'); import type {Element} from 'React'; diff --git a/Libraries/Renderer/src/renderers/noop/ReactNoop.js b/Libraries/Renderer/src/renderers/noop/ReactNoop.js index d51b8b098068..0b545564171a 100644 --- a/Libraries/Renderer/src/renderers/noop/ReactNoop.js +++ b/Libraries/Renderer/src/renderers/noop/ReactNoop.js @@ -22,12 +22,12 @@ import type { Fiber } from 'ReactFiber'; import type { UpdateQueue } from 'ReactFiberUpdateQueue'; -var ReactFiberInstrumentation = require('ReactFiberInstrumentation'); -var ReactFiberReconciler = require('ReactFiberReconciler'); -var ReactInstanceMap = require('ReactInstanceMap'); +var ReactFiberInstrumentation = require('../shared/fiber/ReactFiberInstrumentation'); +var ReactFiberReconciler = require('../shared/fiber/ReactFiberReconciler'); +var ReactInstanceMap = require('../shared/shared/ReactInstanceMap'); var { AnimationPriority, -} = require('ReactPriorityLevel'); +} = require('../shared/fiber/ReactPriorityLevel'); var emptyObject = require('fbjs/lib/emptyObject'); const UPDATE_SIGNAL = {}; diff --git a/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js b/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js index 9d4693420fbc..8d8757cf8eb2 100644 --- a/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js +++ b/Libraries/Renderer/src/renderers/shared/ReactDebugTool.js @@ -12,10 +12,10 @@ 'use strict'; -var ReactInvalidSetStateWarningHook = require('ReactInvalidSetStateWarningHook'); -var ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook'); +var ReactInvalidSetStateWarningHook = require('./hooks/ReactInvalidSetStateWarningHook'); +var ReactHostOperationHistoryHook = require('./hooks/ReactHostOperationHistoryHook'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var {ReactComponentTreeHook} = require('ReactGlobalSharedState'); +var {ReactComponentTreeHook} = require('./ReactGlobalSharedState'); var performanceNow = require('fbjs/lib/performanceNow'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/ReactInstrumentation.js b/Libraries/Renderer/src/renderers/shared/ReactInstrumentation.js index a5de36d00ef6..f9a1c72915a7 100644 --- a/Libraries/Renderer/src/renderers/shared/ReactInstrumentation.js +++ b/Libraries/Renderer/src/renderers/shared/ReactInstrumentation.js @@ -16,7 +16,7 @@ var debugTool = ((null: any): typeof ReactDebugTool); if (__DEV__) { - var ReactDebugTool = require('ReactDebugTool'); + var ReactDebugTool = require('./ReactDebugTool'); debugTool = ReactDebugTool; } diff --git a/Libraries/Renderer/src/renderers/shared/ReactPerf.js b/Libraries/Renderer/src/renderers/shared/ReactPerf.js index d119959c551b..a276145f20d2 100644 --- a/Libraries/Renderer/src/renderers/shared/ReactPerf.js +++ b/Libraries/Renderer/src/renderers/shared/ReactPerf.js @@ -12,7 +12,7 @@ 'use strict'; -var ReactDebugTool = require('ReactDebugTool'); +var ReactDebugTool = require('./ReactDebugTool'); var warning = require('fbjs/lib/warning'); var alreadyWarned = false; diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js index 147efd09d9dc..dd680b4ff6d0 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactChildFiber.js @@ -19,21 +19,21 @@ import type {Fiber} from 'ReactFiber'; import type {ReactInstance} from 'ReactInstanceType'; import type {PriorityLevel} from 'ReactPriorityLevel'; -var REACT_ELEMENT_TYPE = require('ReactElementSymbol'); -var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('ReactCoroutine'); -var {REACT_PORTAL_TYPE} = require('ReactPortal'); +var REACT_ELEMENT_TYPE = require('../../../shared/utils/ReactElementSymbol'); +var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./isomorphic/ReactCoroutine'); +var {REACT_PORTAL_TYPE} = require('./isomorphic/ReactPortal'); -var ReactFiber = require('ReactFiber'); -var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactFiber = require('./ReactFiber'); +var ReactTypeOfSideEffect = require('./ReactTypeOfSideEffect'); +var ReactTypeOfWork = require('../../../shared/ReactTypeOfWork'); var emptyObject = require('fbjs/lib/emptyObject'); -var getIteratorFn = require('getIteratorFn'); +var getIteratorFn = require('../../../shared/utils/getIteratorFn'); var invariant = require('fbjs/lib/invariant'); -var ReactFeatureFlags = require('ReactFeatureFlags'); +var ReactFeatureFlags = require('../utils/ReactFeatureFlags'); if (__DEV__) { - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + var {getCurrentFiberStackAddendum} = require('./ReactDebugCurrentFiber'); var warning = require('fbjs/lib/warning'); var didWarnAboutMaps = false; /** diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js index 8e6f9c727c66..cb98315e2ff4 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugCurrentFiber.js @@ -17,10 +17,10 @@ import type {Fiber} from 'ReactFiber'; type LifeCyclePhase = 'render' | 'getChildContext'; if (__DEV__) { - var getComponentName = require('getComponentName'); + var getComponentName = require('../../../shared/utils/getComponentName'); var { getStackAddendumByWorkInProgressFiber, - } = require('ReactFiberComponentTreeHook'); + } = require('../../../shared/ReactFiberComponentTreeHook'); } function getCurrentFiberOwnerName(): string | null { diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js index f1591e7ee3e5..50a1727ccfcd 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactDebugFiberPerf.js @@ -33,9 +33,9 @@ if (__DEV__) { HostPortal, YieldComponent, Fragment, - } = require('ReactTypeOfWork'); + } = require('../../../shared/ReactTypeOfWork'); - const getComponentName = require('getComponentName'); + const getComponentName = require('../../../shared/utils/getComponentName'); // Prefix measurements so that it's possible to filter them. // Longer prefixes are hard to read in DevTools. diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js index b7c6ed30c07f..2bde4741e3d9 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiber.js @@ -33,20 +33,20 @@ var { CoroutineComponent, YieldComponent, Fragment, -} = require('ReactTypeOfWork'); +} = require('../../../shared/ReactTypeOfWork'); -var {NoWork} = require('ReactPriorityLevel'); +var {NoWork} = require('./ReactPriorityLevel'); -var {NoContext} = require('ReactTypeOfInternalContext'); +var {NoContext} = require('./ReactTypeOfInternalContext'); -var {NoEffect} = require('ReactTypeOfSideEffect'); +var {NoEffect} = require('./ReactTypeOfSideEffect'); -var {cloneUpdateQueue} = require('ReactFiberUpdateQueue'); +var {cloneUpdateQueue} = require('./ReactFiberUpdateQueue'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var getComponentName = require('getComponentName'); + var getComponentName = require('../../../shared/utils/getComponentName'); var hasBadMapPolyfill = false; try { diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js index f0393658fe1b..27a6f0c8a24c 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberBeginWork.js @@ -24,9 +24,9 @@ var { reconcileChildFibers, reconcileChildFibersInPlace, cloneChildFibers, -} = require('ReactChildFiber'); -var {beginUpdateQueue} = require('ReactFiberUpdateQueue'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +} = require('./ReactChildFiber'); +var {beginUpdateQueue} = require('./ReactFiberUpdateQueue'); +var ReactTypeOfWork = require('../../../shared/ReactTypeOfWork'); var { getMaskedContext, getUnmaskedContext, @@ -34,7 +34,7 @@ var { pushContextProvider, pushTopLevelContextObject, invalidateContextProvider, -} = require('ReactFiberContext'); +} = require('./ReactFiberContext'); var { IndeterminateComponent, FunctionalComponent, @@ -48,15 +48,15 @@ var { YieldComponent, Fragment, } = ReactTypeOfWork; -var {NoWork, OffscreenPriority} = require('ReactPriorityLevel'); -var {Placement, ContentReset, Err, Ref} = require('ReactTypeOfSideEffect'); -var ReactFiberClassComponent = require('ReactFiberClassComponent'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var {NoWork, OffscreenPriority} = require('./ReactPriorityLevel'); +var {Placement, ContentReset, Err, Ref} = require('./ReactTypeOfSideEffect'); +var ReactFiberClassComponent = require('./ReactFiberClassComponent'); +var {ReactCurrentOwner} = require('../ReactGlobalSharedState'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); - var {cancelWorkTimer} = require('ReactDebugFiberPerf'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); + var {cancelWorkTimer} = require('./ReactDebugFiberPerf'); var warning = require('fbjs/lib/warning'); var warnedAboutStatelessRefs = {}; diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js index ba6425308e9f..fbae8bc4669f 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberClassComponent.js @@ -15,35 +15,35 @@ import type {Fiber} from 'ReactFiber'; import type {PriorityLevel} from 'ReactPriorityLevel'; -var {Update} = require('ReactTypeOfSideEffect'); +var {Update} = require('./ReactTypeOfSideEffect'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var {AsyncUpdates} = require('ReactTypeOfInternalContext'); +var ReactFeatureFlags = require('../utils/ReactFeatureFlags'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); var { cacheContext, getMaskedContext, getUnmaskedContext, isContextConsumer, -} = require('ReactFiberContext'); +} = require('./ReactFiberContext'); var { addUpdate, addReplaceUpdate, addForceUpdate, beginUpdateQueue, -} = require('ReactFiberUpdateQueue'); -var {hasContextChanged} = require('ReactFiberContext'); -var {isMounted} = require('ReactFiberTreeReflection'); -var ReactInstanceMap = require('ReactInstanceMap'); +} = require('./ReactFiberUpdateQueue'); +var {hasContextChanged} = require('./ReactFiberContext'); +var {isMounted} = require('./ReactFiberTreeReflection'); +var ReactInstanceMap = require('../shared/ReactInstanceMap'); var emptyObject = require('fbjs/lib/emptyObject'); -var getComponentName = require('getComponentName'); +var getComponentName = require('../../../shared/utils/getComponentName'); var shallowEqual = require('fbjs/lib/shallowEqual'); var invariant = require('fbjs/lib/invariant'); const isArray = Array.isArray; if (__DEV__) { - var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf'); + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); var warning = require('fbjs/lib/warning'); var warnOnInvalidCallback = function(callback: mixed, callerName: string) { warning( diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js index 2703f065897f..4f443f306b18 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCommitWork.js @@ -15,7 +15,7 @@ import type {Fiber} from 'ReactFiber'; import type {HostConfig} from 'ReactFiberReconciler'; -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactTypeOfWork = require('../../../shared/ReactTypeOfWork'); var { ClassComponent, HostRoot, @@ -24,21 +24,21 @@ var { HostPortal, CoroutineComponent, } = ReactTypeOfWork; -var {commitCallbacks} = require('ReactFiberUpdateQueue'); -var {onCommitUnmount} = require('ReactFiberDevToolsHook'); -var {invokeGuardedCallback} = require('ReactErrorUtils'); +var {commitCallbacks} = require('./ReactFiberUpdateQueue'); +var {onCommitUnmount} = require('./ReactFiberDevToolsHook'); +var {invokeGuardedCallback} = require('../utils/ReactErrorUtils'); var { Placement, Update, Callback, ContentReset, -} = require('ReactTypeOfSideEffect'); +} = require('./ReactTypeOfSideEffect'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf'); + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); } module.exports = function( diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js index 644356983b71..3d31bf6271a5 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberCompleteWork.js @@ -18,10 +18,10 @@ import type {HostContext} from 'ReactFiberHostContext'; import type {FiberRoot} from 'ReactFiberRoot'; import type {HostConfig} from 'ReactFiberReconciler'; -var {reconcileChildFibers} = require('ReactChildFiber'); -var {popContextProvider} = require('ReactFiberContext'); -var ReactTypeOfWork = require('ReactTypeOfWork'); -var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect'); +var {reconcileChildFibers} = require('./ReactChildFiber'); +var {popContextProvider} = require('./ReactFiberContext'); +var ReactTypeOfWork = require('../../../shared/ReactTypeOfWork'); +var ReactTypeOfSideEffect = require('./ReactTypeOfSideEffect'); var { IndeterminateComponent, FunctionalComponent, @@ -38,7 +38,7 @@ var { var {Ref, Update} = ReactTypeOfSideEffect; if (__DEV__) { - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); } var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js index 8a2c606409ce..d857ba007fb6 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberContext.js @@ -17,17 +17,17 @@ import type {StackCursor} from 'ReactFiberStack'; var checkPropTypes = require('prop-types/checkPropTypes'); var emptyObject = require('fbjs/lib/emptyObject'); -var getComponentName = require('getComponentName'); +var getComponentName = require('../../../shared/utils/getComponentName'); var invariant = require('fbjs/lib/invariant'); var warning = require('fbjs/lib/warning'); -var {isFiberMounted} = require('ReactFiberTreeReflection'); -var {ClassComponent, HostRoot} = require('ReactTypeOfWork'); -const {createCursor, pop, push} = require('ReactFiberStack'); +var {isFiberMounted} = require('./ReactFiberTreeReflection'); +var {ClassComponent, HostRoot} = require('../../../shared/ReactTypeOfWork'); +const {createCursor, pop, push} = require('./ReactFiberStack'); if (__DEV__) { - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); - var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); + var {ReactDebugCurrentFrame} = require('../ReactGlobalSharedState'); + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); var warnedAboutMissingGetChildContext = {}; } diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js index 448bd8c72ea4..444d38a239d9 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberHostContext.js @@ -16,7 +16,7 @@ import type {Fiber} from 'ReactFiber'; import type {HostConfig} from 'ReactFiberReconciler'; import type {StackCursor} from 'ReactFiberStack'; -const {createCursor, pop, push} = require('ReactFiberStack'); +const {createCursor, pop, push} = require('./ReactFiberStack'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js index a081838df8d2..f2a8ceb72230 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberReconciler.js @@ -17,28 +17,28 @@ import type {FiberRoot} from 'ReactFiberRoot'; import type {PriorityLevel} from 'ReactPriorityLevel'; import type {ReactNodeList} from 'ReactTypes'; -var ReactFeatureFlags = require('ReactFeatureFlags'); +var ReactFeatureFlags = require('../utils/ReactFeatureFlags'); -var {addTopLevelUpdate} = require('ReactFiberUpdateQueue'); +var {addTopLevelUpdate} = require('./ReactFiberUpdateQueue'); var { findCurrentUnmaskedContext, isContextProvider, processChildContext, -} = require('ReactFiberContext'); -var {createFiberRoot} = require('ReactFiberRoot'); -var ReactFiberScheduler = require('ReactFiberScheduler'); +} = require('./ReactFiberContext'); +var {createFiberRoot} = require('./ReactFiberRoot'); +var ReactFiberScheduler = require('./ReactFiberScheduler'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var ReactFiberInstrumentation = require('ReactFiberInstrumentation'); - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); - var getComponentName = require('getComponentName'); + var ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); + var getComponentName = require('../../../shared/utils/getComponentName'); } -var {findCurrentHostFiber} = require('ReactFiberTreeReflection'); +var {findCurrentHostFiber} = require('./ReactFiberTreeReflection'); -var getContextForSubtree = require('getContextForSubtree'); +var getContextForSubtree = require('../shared/getContextForSubtree'); export type Deadline = { timeRemaining: () => number, diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js index 409b70655445..f36203ba9b33 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberRoot.js @@ -14,7 +14,7 @@ import type {Fiber} from 'ReactFiber'; -const {createHostRootFiber} = require('ReactFiber'); +const {createHostRootFiber} = require('./ReactFiber'); export type FiberRoot = { // Any additional information from the host associated with this root. diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js index b889c8157d83..f4b906ee996f 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberScheduler.js @@ -31,24 +31,24 @@ export type HandleErrorInfo = { componentStack: string, }; -var {popContextProvider} = require('ReactFiberContext'); -const {reset} = require('ReactFiberStack'); +var {popContextProvider} = require('./ReactFiberContext'); +const {reset} = require('./ReactFiberStack'); var { getStackAddendumByWorkInProgressFiber, -} = require('ReactFiberComponentTreeHook'); -var {logCapturedError} = require('ReactFiberErrorLogger'); -var {invokeGuardedCallback} = require('ReactErrorUtils'); +} = require('../../../shared/ReactFiberComponentTreeHook'); +var {logCapturedError} = require('./ReactFiberErrorLogger'); +var {invokeGuardedCallback} = require('../utils/ReactErrorUtils'); -var ReactFiberBeginWork = require('ReactFiberBeginWork'); -var ReactFiberCompleteWork = require('ReactFiberCompleteWork'); -var ReactFiberCommitWork = require('ReactFiberCommitWork'); -var ReactFiberHostContext = require('ReactFiberHostContext'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +var ReactFiberBeginWork = require('./ReactFiberBeginWork'); +var ReactFiberCompleteWork = require('./ReactFiberCompleteWork'); +var ReactFiberCommitWork = require('./ReactFiberCommitWork'); +var ReactFiberHostContext = require('./ReactFiberHostContext'); +var ReactFeatureFlags = require('../utils/ReactFeatureFlags'); +var {ReactCurrentOwner} = require('../ReactGlobalSharedState'); +var getComponentName = require('../../../shared/utils/getComponentName'); -var {cloneFiber} = require('ReactFiber'); -var {onCommitRoot} = require('ReactFiberDevToolsHook'); +var {cloneFiber} = require('./ReactFiber'); +var {onCommitRoot} = require('./ReactFiberDevToolsHook'); var { NoWork, @@ -58,9 +58,9 @@ var { HighPriority, LowPriority, OffscreenPriority, -} = require('ReactPriorityLevel'); +} = require('./ReactPriorityLevel'); -var {AsyncUpdates} = require('ReactTypeOfInternalContext'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); var { NoEffect, @@ -72,25 +72,25 @@ var { Callback, Err, Ref, -} = require('ReactTypeOfSideEffect'); +} = require('./ReactTypeOfSideEffect'); var { HostRoot, HostComponent, HostPortal, ClassComponent, -} = require('ReactTypeOfWork'); +} = require('../../../shared/ReactTypeOfWork'); -var {getPendingPriority} = require('ReactFiberUpdateQueue'); +var {getPendingPriority} = require('./ReactFiberUpdateQueue'); -var {resetContext} = require('ReactFiberContext'); +var {resetContext} = require('./ReactFiberContext'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var ReactFiberInstrumentation = require('ReactFiberInstrumentation'); - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); + var ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); var { recordEffect, recordScheduleUpdate, @@ -104,7 +104,7 @@ if (__DEV__) { stopCommitHostEffectsTimer, startCommitLifeCyclesTimer, stopCommitLifeCyclesTimer, - } = require('ReactDebugFiberPerf'); + } = require('./ReactDebugFiberPerf'); var warnAboutUpdateOnUnmounted = function(instance: ReactClass) { const ctor = instance.constructor; diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js index 94d7c880724f..6987e4a55531 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberTreeReflection.js @@ -14,10 +14,10 @@ import type {Fiber} from 'ReactFiber'; -var ReactInstanceMap = require('ReactInstanceMap'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactInstanceMap = require('../shared/ReactInstanceMap'); +var {ReactCurrentOwner} = require('../ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +var getComponentName = require('../../../shared/utils/getComponentName'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { @@ -29,9 +29,9 @@ var { HostComponent, HostText, ClassComponent, -} = require('ReactTypeOfWork'); +} = require('../../../shared/ReactTypeOfWork'); -var {NoEffect, Placement} = require('ReactTypeOfSideEffect'); +var {NoEffect, Placement} = require('./ReactTypeOfSideEffect'); var MOUNTING = 1; var MOUNTED = 2; diff --git a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js index b3fd536c9dfd..371fdec0485c 100644 --- a/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js +++ b/Libraries/Renderer/src/renderers/shared/fiber/ReactFiberUpdateQueue.js @@ -15,13 +15,13 @@ import type {Fiber} from 'ReactFiber'; import type {PriorityLevel} from 'ReactPriorityLevel'; -const {Callback: CallbackEffect} = require('ReactTypeOfSideEffect'); +const {Callback: CallbackEffect} = require('./ReactTypeOfSideEffect'); const { NoWork, SynchronousPriority, TaskPriority, -} = require('ReactPriorityLevel'); +} = require('./ReactPriorityLevel'); const invariant = require('fbjs/lib/invariant'); if (__DEV__) { diff --git a/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js b/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js index c6c8aa265610..6fa3b9c2a803 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js +++ b/Libraries/Renderer/src/renderers/shared/shared/ReactTreeTraversal.js @@ -11,7 +11,7 @@ 'use strict'; -var {HostComponent} = require('ReactTypeOfWork'); +var {HostComponent} = require('../../../shared/ReactTypeOfWork'); function getParent(inst) { if (inst._hostParent !== undefined) { diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/BrowserEventConstants.js b/Libraries/Renderer/src/renderers/shared/shared/event/BrowserEventConstants.js index 0f460486be72..b94a40762074 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/BrowserEventConstants.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/BrowserEventConstants.js @@ -11,7 +11,7 @@ 'use strict'; -var getVendorPrefixedEventName = require('getVendorPrefixedEventName'); +var getVendorPrefixedEventName = require('./getVendorPrefixedEventName'); /** * Types of raw signals from the browser caught at the top level. diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js index 6d1bf6d79091..98cb7428715f 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginHub.js @@ -11,12 +11,12 @@ 'use strict'; -var EventPluginRegistry = require('EventPluginRegistry'); -var EventPluginUtils = require('EventPluginUtils'); -var ReactErrorUtils = require('ReactErrorUtils'); +var EventPluginRegistry = require('./EventPluginRegistry'); +var EventPluginUtils = require('./EventPluginUtils'); +var ReactErrorUtils = require('../../utils/ReactErrorUtils'); -var accumulateInto = require('accumulateInto'); -var forEachAccumulated = require('forEachAccumulated'); +var accumulateInto = require('../../utils/accumulateInto'); +var forEachAccumulated = require('../../utils/forEachAccumulated'); var invariant = require('fbjs/lib/invariant'); /** diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js index 2bd12dc56f58..8e23387c81f8 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPluginUtils.js @@ -11,7 +11,7 @@ 'use strict'; -var ReactErrorUtils = require('ReactErrorUtils'); +var ReactErrorUtils = require('../../utils/ReactErrorUtils'); var invariant = require('fbjs/lib/invariant'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js index 755dd79d428a..ac8c3d488a72 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/EventPropagators.js @@ -11,11 +11,11 @@ 'use strict'; -var EventPluginHub = require('EventPluginHub'); -var ReactTreeTraversal = require('ReactTreeTraversal'); +var EventPluginHub = require('./EventPluginHub'); +var ReactTreeTraversal = require('../ReactTreeTraversal'); -var accumulateInto = require('accumulateInto'); -var forEachAccumulated = require('forEachAccumulated'); +var accumulateInto = require('../../utils/accumulateInto'); +var forEachAccumulated = require('../../utils/forEachAccumulated'); var warning = require('fbjs/lib/warning'); type PropagationPhases = 'bubbled' | 'captured'; diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js index 08819e991d04..5e809d5a9fc3 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactControlledComponent.js @@ -11,7 +11,7 @@ 'use strict'; -var EventPluginUtils = require('EventPluginUtils'); +var EventPluginUtils = require('./EventPluginUtils'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js index 63134a57e1be..5db5e282af3d 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactEventEmitterMixin.js @@ -11,7 +11,7 @@ 'use strict'; -var EventPluginHub = require('EventPluginHub'); +var EventPluginHub = require('./EventPluginHub'); function runEventQueueInBatch(events) { EventPluginHub.enqueueEvents(events); diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/ReactGenericBatching.js b/Libraries/Renderer/src/renderers/shared/shared/event/ReactGenericBatching.js index cbb71001ba8e..3613dd6a9b41 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/ReactGenericBatching.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/ReactGenericBatching.js @@ -11,7 +11,7 @@ 'use strict'; -var ReactControlledComponent = require('ReactControlledComponent'); +var ReactControlledComponent = require('./ReactControlledComponent'); // Used as a way to call batchedUpdates when we don't know if we're in a Fiber // or Stack context. Such as when we're dispatching events or if third party diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js b/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js index 81bb3d784c8f..9cddeb631b87 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/SyntheticEvent.js @@ -13,7 +13,7 @@ 'use strict'; -var PooledClass = require('PooledClass'); +var PooledClass = require('../../../../shared/utils/PooledClass'); var emptyFunction = require('fbjs/lib/emptyFunction'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js index 6fb3e4a6f0ce..be794d03ade8 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js @@ -11,13 +11,13 @@ 'use strict'; -var EventPluginUtils = require('EventPluginUtils'); -var EventPropagators = require('EventPropagators'); -var ReactTreeTraversal = require('ReactTreeTraversal'); -var ResponderSyntheticEvent = require('ResponderSyntheticEvent'); -var ResponderTouchHistoryStore = require('ResponderTouchHistoryStore'); +var EventPluginUtils = require('../EventPluginUtils'); +var EventPropagators = require('../EventPropagators'); +var ReactTreeTraversal = require('../../ReactTreeTraversal'); +var ResponderSyntheticEvent = require('./ResponderSyntheticEvent'); +var ResponderTouchHistoryStore = require('./ResponderTouchHistoryStore'); -var accumulate = require('accumulate'); +var accumulate = require('../../../utils/accumulate'); var isStartish = EventPluginUtils.isStartish; var isMoveish = EventPluginUtils.isMoveish; diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js index f8e2132d56af..48712a53aa62 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js @@ -11,7 +11,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('../SyntheticEvent'); /** * `touchHistory` isn't actually on the native event, but putting it in the diff --git a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js index 2b79393efe27..341c26dab0f7 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js +++ b/Libraries/Renderer/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js @@ -12,7 +12,7 @@ 'use strict'; -const EventPluginUtils = require('EventPluginUtils'); +const EventPluginUtils = require('../EventPluginUtils'); const invariant = require('fbjs/lib/invariant'); const warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js b/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js index 2883e36834d9..14bec03c32be 100644 --- a/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js +++ b/Libraries/Renderer/src/renderers/shared/shared/getContextForSubtree.js @@ -10,7 +10,7 @@ * @flow */ -const ReactInstanceMap = require('ReactInstanceMap'); +const ReactInstanceMap = require('./ReactInstanceMap'); const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js index 0362598ac1e6..d94584c868df 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/CallbackQueue.js @@ -12,10 +12,10 @@ 'use strict'; -var PooledClass = require('PooledClass'); +var PooledClass = require('../../../../shared/utils/PooledClass'); var invariant = require('fbjs/lib/invariant'); -var validateCallback = require('validateCallback'); +var validateCallback = require('../../utils/validateCallback'); /** * A specialized pseudo-event module to help keep track of components waiting to diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js index 856cc15fa347..87dfb1f0d241 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactChildReconciler.js @@ -11,13 +11,13 @@ 'use strict'; -var KeyEscapeUtils = require('KeyEscapeUtils'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactReconciler = require('ReactReconciler'); +var KeyEscapeUtils = require('../../../../shared/utils/KeyEscapeUtils'); +var ReactFeatureFlags = require('../../utils/ReactFeatureFlags'); +var ReactReconciler = require('./ReactReconciler'); -var instantiateReactComponent = require('instantiateReactComponent'); -var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); -var traverseStackChildren = require('traverseStackChildren'); +var instantiateReactComponent = require('./instantiateReactComponent'); +var shouldUpdateReactComponent = require('../../shared/shouldUpdateReactComponent'); +var traverseStackChildren = require('./traverseStackChildren'); var warning = require('fbjs/lib/warning'); var ReactComponentTreeHook; @@ -32,7 +32,7 @@ if ( // https://github.com/facebook/react/issues/7240 // Remove the inline requires when we don't need them anymore: // https://github.com/facebook/react/pull/7178 - ReactComponentTreeHook = require('ReactGlobalSharedState') + ReactComponentTreeHook = require('../../ReactGlobalSharedState') .ReactComponentTreeHook; } @@ -41,7 +41,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) { var keyUnique = childInstances[name] === undefined; if (__DEV__) { if (!ReactComponentTreeHook) { - ReactComponentTreeHook = require('ReactGlobalSharedState') + ReactComponentTreeHook = require('../../ReactGlobalSharedState') .ReactComponentTreeHook; } if (!keyUnique) { diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js index 7e97b2316dc0..0c3729da9f20 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js @@ -12,18 +12,18 @@ 'use strict'; var React = require('react'); -var ReactComponentEnvironment = require('ReactComponentEnvironment'); -var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes'); -var ReactErrorUtils = require('ReactErrorUtils'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactInstrumentation = require('ReactInstrumentation'); -var ReactNodeTypes = require('ReactNodeTypes'); -var ReactReconciler = require('ReactReconciler'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactComponentEnvironment = require('./ReactComponentEnvironment'); +var ReactCompositeComponentTypes = require('./ReactCompositeComponentTypes'); +var ReactErrorUtils = require('../../utils/ReactErrorUtils'); +var ReactFeatureFlags = require('../../utils/ReactFeatureFlags'); +var ReactInstanceMap = require('../../shared/ReactInstanceMap'); +var ReactInstrumentation = require('../../ReactInstrumentation'); +var ReactNodeTypes = require('./ReactNodeTypes'); +var ReactReconciler = require('./ReactReconciler'); +var {ReactCurrentOwner} = require('../../ReactGlobalSharedState'); if (__DEV__) { - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); + var {ReactDebugCurrentFrame} = require('../../ReactGlobalSharedState'); var warningAboutMissingGetChildContext = {}; } @@ -31,7 +31,7 @@ var checkPropTypes = require('prop-types/checkPropTypes'); var emptyObject = require('fbjs/lib/emptyObject'); var invariant = require('fbjs/lib/invariant'); var shallowEqual = require('fbjs/lib/shallowEqual'); -var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); +var shouldUpdateReactComponent = require('../../shared/shouldUpdateReactComponent'); var warning = require('fbjs/lib/warning'); function StatelessComponent(Component) {} diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js index f787eff30097..34fc8657f777 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js @@ -11,8 +11,8 @@ 'use strict'; -var ReactUpdates = require('ReactUpdates'); -var Transaction = require('Transaction'); +var ReactUpdates = require('./ReactUpdates'); +var Transaction = require('./Transaction'); var emptyFunction = require('fbjs/lib/emptyFunction'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js index 8bde4e26ffff..6e72a194e311 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js @@ -11,16 +11,16 @@ 'use strict'; -var ReactComponentEnvironment = require('ReactComponentEnvironment'); -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactInstrumentation = require('ReactInstrumentation'); +var ReactComponentEnvironment = require('./ReactComponentEnvironment'); +var ReactInstanceMap = require('../../shared/ReactInstanceMap'); +var ReactInstrumentation = require('../../ReactInstrumentation'); -var ReactReconciler = require('ReactReconciler'); -var ReactChildReconciler = require('ReactChildReconciler'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactReconciler = require('./ReactReconciler'); +var ReactChildReconciler = require('./ReactChildReconciler'); +var {ReactCurrentOwner} = require('../../ReactGlobalSharedState'); var emptyFunction = require('fbjs/lib/emptyFunction'); -var flattenStackChildren = require('flattenStackChildren'); +var flattenStackChildren = require('./flattenStackChildren'); var invariant = require('fbjs/lib/invariant'); /** diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js index 7d3a4c603236..91f4c4112d9d 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactOwner.js @@ -12,7 +12,7 @@ 'use strict'; -var {ClassComponent} = require('ReactTypeOfWork'); +var {ClassComponent} = require('../../../../shared/ReactTypeOfWork'); var emptyObject = require('fbjs/lib/emptyObject'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js index 221ebd584afe..13f762c59566 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js @@ -11,8 +11,8 @@ 'use strict'; -var ReactRef = require('ReactRef'); -var ReactInstrumentation = require('ReactInstrumentation'); +var ReactRef = require('./ReactRef'); +var ReactInstrumentation = require('../../ReactInstrumentation'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js index de656b02396e..71f4fe2faf4e 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactRef.js @@ -12,7 +12,7 @@ 'use strict'; -var ReactOwner = require('ReactOwner'); +var ReactOwner = require('./ReactOwner'); import type {ReactInstance} from 'ReactInstanceType'; import type {ReactElement} from 'ReactElementType'; @@ -20,8 +20,8 @@ import type {ReactElement} from 'ReactElementType'; var ReactRef = {}; if (__DEV__) { - var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes'); - var {ReactComponentTreeHook} = require('ReactGlobalSharedState'); + var ReactCompositeComponentTypes = require('./ReactCompositeComponentTypes'); + var {ReactComponentTreeHook} = require('../../ReactGlobalSharedState'); var warning = require('fbjs/lib/warning'); var warnedAboutStatelessRefs = {}; diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js index f7159ef736c0..9154e5bef3d6 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactSimpleEmptyComponent.js @@ -11,7 +11,7 @@ 'use strict'; -var ReactReconciler = require('ReactReconciler'); +var ReactReconciler = require('./ReactReconciler'); var ReactSimpleEmptyComponent = function(placeholderElement, instantiate) { this._currentElement = null; diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js index 778936380e90..94c6cd53a5a7 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js @@ -11,10 +11,10 @@ 'use strict'; -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactInstrumentation = require('ReactInstrumentation'); -var ReactUpdates = require('ReactUpdates'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactInstanceMap = require('../../shared/ReactInstanceMap'); +var ReactInstrumentation = require('../../ReactInstrumentation'); +var ReactUpdates = require('./ReactUpdates'); +var {ReactCurrentOwner} = require('../../ReactGlobalSharedState'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js index 239b0637e1b9..fa1056e0fd2b 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactUpdates.js @@ -11,10 +11,10 @@ 'use strict'; -var PooledClass = require('PooledClass'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactReconciler = require('ReactReconciler'); -var Transaction = require('Transaction'); +var PooledClass = require('../../../../shared/utils/PooledClass'); +var ReactFeatureFlags = require('../../utils/ReactFeatureFlags'); +var ReactReconciler = require('./ReactReconciler'); +var Transaction = require('./Transaction'); var invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/flattenStackChildren.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/flattenStackChildren.js index 06dc4e69c6ee..4e75aa2a842f 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/flattenStackChildren.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/flattenStackChildren.js @@ -12,8 +12,8 @@ 'use strict'; -var KeyEscapeUtils = require('KeyEscapeUtils'); -var traverseStackChildren = require('traverseStackChildren'); +var KeyEscapeUtils = require('../../../../shared/utils/KeyEscapeUtils'); +var traverseStackChildren = require('./traverseStackChildren'); var warning = require('fbjs/lib/warning'); var ReactComponentTreeHook; @@ -28,7 +28,7 @@ if ( // https://github.com/facebook/react/issues/7240 // Remove the inline requires when we don't need them anymore: // https://github.com/facebook/react/pull/7178 - ReactComponentTreeHook = require('ReactGlobalSharedState') + ReactComponentTreeHook = require('../../ReactGlobalSharedState') .ReactComponentTreeHook; } @@ -50,7 +50,7 @@ function flattenSingleChildIntoContext( const keyUnique = result[name] === undefined; if (__DEV__) { if (!ReactComponentTreeHook) { - ReactComponentTreeHook = require('ReactGlobalSharedState') + ReactComponentTreeHook = require('../../ReactGlobalSharedState') .ReactComponentTreeHook; } if (!keyUnique) { diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/getHostComponentFromComposite.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/getHostComponentFromComposite.js index 597caa50be80..5a1a0fbe81c3 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/getHostComponentFromComposite.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/getHostComponentFromComposite.js @@ -11,7 +11,7 @@ 'use strict'; -var ReactNodeTypes = require('ReactNodeTypes'); +var ReactNodeTypes = require('./ReactNodeTypes'); function getHostComponentFromComposite(inst) { var type; diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js index ac959f5d1dc6..87d4e9af3057 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/instantiateReactComponent.js @@ -11,11 +11,11 @@ 'use strict'; -var ReactCompositeComponent = require('ReactCompositeComponent'); -var ReactEmptyComponent = require('ReactEmptyComponent'); -var ReactHostComponent = require('ReactHostComponent'); +var ReactCompositeComponent = require('./ReactCompositeComponent'); +var ReactEmptyComponent = require('./ReactEmptyComponent'); +var ReactHostComponent = require('./ReactHostComponent'); -var getNextDebugID = require('getNextDebugID'); +var getNextDebugID = require('../../../../shared/utils/getNextDebugID'); var invariant = require('fbjs/lib/invariant'); var warning = require('fbjs/lib/warning'); diff --git a/Libraries/Renderer/src/renderers/shared/stack/reconciler/traverseStackChildren.js b/Libraries/Renderer/src/renderers/shared/stack/reconciler/traverseStackChildren.js index 92bc111c814b..999a603a4eab 100644 --- a/Libraries/Renderer/src/renderers/shared/stack/reconciler/traverseStackChildren.js +++ b/Libraries/Renderer/src/renderers/shared/stack/reconciler/traverseStackChildren.js @@ -11,17 +11,17 @@ 'use strict'; -var REACT_ELEMENT_TYPE = require('ReactElementSymbol'); +var REACT_ELEMENT_TYPE = require('../../../../shared/utils/ReactElementSymbol'); -var getIteratorFn = require('getIteratorFn'); +var getIteratorFn = require('../../../../shared/utils/getIteratorFn'); var invariant = require('fbjs/lib/invariant'); -var KeyEscapeUtils = require('KeyEscapeUtils'); +var KeyEscapeUtils = require('../../../../shared/utils/KeyEscapeUtils'); var warning = require('fbjs/lib/warning'); if (__DEV__) { var { getCurrentStackAddendum, - } = require('ReactGlobalSharedState').ReactComponentTreeHook; + } = require('../../ReactGlobalSharedState').ReactComponentTreeHook; } var SEPARATOR = '.'; diff --git a/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js b/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js index d965c718add7..12d7eaad5d03 100644 --- a/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js +++ b/Libraries/Renderer/src/shared/ReactFiberComponentTreeHook.js @@ -12,14 +12,14 @@ 'use strict'; -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactTypeOfWork = require('./ReactTypeOfWork'); var { IndeterminateComponent, FunctionalComponent, ClassComponent, HostComponent, } = ReactTypeOfWork; -var getComponentName = require('getComponentName'); +var getComponentName = require('./utils/getComponentName'); import type {Fiber} from 'ReactFiber'; diff --git a/Libraries/Sample/Sample.ios.js b/Libraries/Sample/Sample.ios.js index fd94afe0a68e..d2338d9704d8 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 beda544b43e5..2392276cf313 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 4f109367b9ba..63b1edf5a410 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 0ba87ed6c18b..a911319cfc5b 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 faca884315ee..f3c3919965f7 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 e6a59de3e215..048a67b54050 100644 --- a/Libraries/StyleSheet/EdgeInsetsPropType.js +++ b/Libraries/StyleSheet/EdgeInsetsPropType.js @@ -11,9 +11,9 @@ */ 'use strict'; -var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); +var createStrictShapeTypeChecker = require('../Utilities/createStrictShapeTypeChecker'); -var {PropTypes} = require('React'); +var {PropTypes} = require('../react-native/React'); var EdgeInsetsPropType = createStrictShapeTypeChecker({ top: PropTypes.number, diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js index 56e42a5af5c9..1b919c36b161 100644 --- a/Libraries/StyleSheet/LayoutPropTypes.js +++ b/Libraries/StyleSheet/LayoutPropTypes.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactPropTypes = require('React').PropTypes; +var ReactPropTypes = require('../react-native/React').PropTypes; /** * React Native's layout system is based on Flexbox and is powered both diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js index 5393bf10e6b8..c1213a20027d 100644 --- a/Libraries/StyleSheet/PointPropType.js +++ b/Libraries/StyleSheet/PointPropType.js @@ -11,9 +11,9 @@ */ 'use strict'; -var PropTypes = require('React').PropTypes; +var PropTypes = require('../react-native/React').PropTypes; -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 468c157b12d2..9e750909bee1 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/src/renderers/native/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 5bea428c2e62..14a43673ed4c 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 7fe0f234fc64..35df52cbd6cc 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 884dfaa30bb7..610216f06625 100644 --- a/Libraries/StyleSheet/TransformPropTypes.js +++ b/Libraries/StyleSheet/TransformPropTypes.js @@ -11,9 +11,9 @@ */ 'use strict'; -var deprecatedPropType = require('deprecatedPropType'); +var deprecatedPropType = require('../Utilities/deprecatedPropType'); -var ReactPropTypes = require('React').PropTypes; +var ReactPropTypes = require('../react-native/React').PropTypes; var TransformMatrixPropType = function( props : Object, diff --git a/Libraries/StyleSheet/flattenStyle.js b/Libraries/StyleSheet/flattenStyle.js index 9cecf3d3e0a1..6382e00c560d 100644 --- a/Libraries/StyleSheet/flattenStyle.js +++ b/Libraries/StyleSheet/flattenStyle.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactNativePropRegistry = require('ReactNativePropRegistry'); +var ReactNativePropRegistry = require('../Renderer/src/renderers/native/ReactNativePropRegistry'); var invariant = require('fbjs/lib/invariant'); import type { StyleObj } from 'StyleSheetTypes'; diff --git a/Libraries/StyleSheet/processColor.js b/Libraries/StyleSheet/processColor.js index b4b471432334..34dc31371fe1 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 eed0f16caa2a..f74f5370a6b8 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 dac73a1f27c6..66810a832f27 100644 --- a/Libraries/Text/Text.js +++ b/Libraries/Text/Text.js @@ -11,20 +11,20 @@ */ '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/src/renderers/native/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 createReactNativeComponentClass = require('createReactNativeComponentClass'); -const mergeFast = require('mergeFast'); -const processColor = require('processColor'); +const createReactNativeComponentClass = require('../Renderer/src/renderers/native/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 4c84de66dab3..53a5c66550dc 100644 --- a/Libraries/Text/TextStylePropTypes.js +++ b/Libraries/Text/TextStylePropTypes.js @@ -11,9 +11,9 @@ */ 'use strict'; -const ReactPropTypes = require('React').PropTypes; -const ColorPropType = require('ColorPropType'); -const ViewStylePropTypes = require('ViewStylePropTypes'); +const ReactPropTypes = require('../react-native/React').PropTypes; +const ColorPropType = require('../StyleSheet/ColorPropType'); +const ViewStylePropTypes = require('../Components/View/ViewStylePropTypes'); const TextStylePropTypes = { ...ViewStylePropTypes, diff --git a/Libraries/Utilities/BackAndroid.js b/Libraries/Utilities/BackAndroid.js index 0289b34c65d8..c55256660137 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 d8ca9b5eb567..923adf53115a 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 958ec69e5c05..6826fc823d40 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 819916b153f8..aaf38e987138 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 76b4098b8589..73091ab624e9 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('../EventEmitter/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 c0443b069787..40660d0419b3 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 82075ffa1920..3d8a06648e91 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 ea0559fc41d0..9583363b8a63 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 d686a903c886..83cc2a874d0c 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 451b344158e8..5f3cbadc79c3 100644 --- a/Libraries/Utilities/PerformanceLogger.js +++ b/Libraries/Utilities/PerformanceLogger.js @@ -11,8 +11,8 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); -const Systrace = require('Systrace'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); +const Systrace = require('../Performance/Systrace'); const performanceNow = global.nativePerformanceNow || require('fbjs/lib/performanceNow'); diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js index e7ab32ca5685..20d7815fa9b5 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 4bab19c52872..dc9acdb1a1cd 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 3238a44627fe..510f58e15aa3 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/RCTLog.js b/Libraries/Utilities/RCTLog.js index 9f218c91787c..0b8a94d5088b 100644 --- a/Libraries/Utilities/RCTLog.js +++ b/Libraries/Utilities/RCTLog.js @@ -11,7 +11,7 @@ */ 'use strict'; -const BatchedBridge = require('BatchedBridge'); +const BatchedBridge = require('../BatchedBridge/BatchedBridge'); const invariant = require('fbjs/lib/invariant'); diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js index 884e8a96b941..7441f32465d4 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 26a1a46bf4c9..72cf762b6370 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/dismissKeyboard.js b/Libraries/Utilities/dismissKeyboard.js index 183fa4a88caf..72b9ec2b35f9 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 e3d9e5a39592..076ea8b8db9b 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 56da5a815b12..5e6c8ac2ba69 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 12c6e4ad6ee2..fe55e985ed80 100644 --- a/Libraries/WebSocket/WebSocket.js +++ b/Libraries/WebSocket/WebSocket.js @@ -11,11 +11,11 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const Platform = require('Platform'); -const RCTWebSocketModule = require('NativeModules').WebSocketModule; -const WebSocketEvent = require('WebSocketEvent'); -const binaryToBase64 = require('binaryToBase64'); +const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter'); +const Platform = require('../Utilities/Platform'); +const RCTWebSocketModule = require('../BatchedBridge/NativeModules').WebSocketModule; +const WebSocketEvent = require('./WebSocketEvent'); +const binaryToBase64 = require('../Utilities/binaryToBase64'); const EventTarget = require('event-target-shim'); const base64 = require('base64-js'); diff --git a/Libraries/WebSocket/WebSocketInterceptor.js b/Libraries/WebSocket/WebSocketInterceptor.js index 3ac649a16219..10c6830fc092 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/promiseRejectionIsError.js b/Libraries/promiseRejectionIsError.js index a2ab6bb38a7c..984aed1fa622 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 bb8820234ef9..0514ef086efe 100644 --- a/Libraries/react-native/react-native-implementation.js +++ b/Libraries/react-native/react-native-implementation.js @@ -16,104 +16,104 @@ 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 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 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 AdSupportIOS() { return require('AdSupportIOS'); }, - 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 Vibration() { return require('Vibration'); }, - get VibrationIOS() { return require('VibrationIOS'); }, + get ActionSheetIOS() { return require('../ActionSheetIOS/ActionSheetIOS'); }, + get AdSupportIOS() { return require('../AdSupport/AdSupportIOS'); }, + 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/src/renderers/native/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 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/src/renderers/native/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 33f206fcc105..deff85c5c539 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 658722b6cf0b..55230072f104 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 800c08c1be26..0881cc7ed9f5 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 0da86a50cdb4..997039ec8c24 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 87ce63bcef2a..4d40f9cce0af 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('../../../EventEmitter/mixInEventEmitter'); /** * DocumentSelectionState is responsible for maintaining selection information