Skip to content

WIP: Remove Haste from Libraries/ and convert to relative requires #14196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Libraries/ART/ReactNativeART.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Libraries/ActionSheetIOS/ActionSheetIOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down
2 changes: 1 addition & 1 deletion Libraries/AdSupport/AdSupportIOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Libraries/Alert/Alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../Utilities/Platform Required module not found


import type { AlertType, AlertButtonStyle } from 'AlertIOS';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realized that I didn't modify the import type statements. Not sure if this is necessary, since flow in this repo is working in haste mode, but maybe I should change them for both consistency as well as so that that module mode isn't required for people consuming RN with Flow.


Expand Down
2 changes: 1 addition & 1 deletion Libraries/Alert/AlertIOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
'use strict';

var RCTAlertManager = require('NativeModules').AlertManager;
var RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager;

/**
* An Alert button type
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Alert/RCTAlertManager.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
'use strict';

var NativeModules = require('NativeModules');
var NativeModules = require('../BatchedBridge/NativeModules');

function emptyCallback() {}

Expand Down
2 changes: 1 addition & 1 deletion Libraries/Alert/RCTAlertManager.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
*/
'use strict';

var RCTAlertManager = require('NativeModules').AlertManager;
var RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager;

module.exports = RCTAlertManager;
10 changes: 5 additions & 5 deletions Libraries/Animated/src/Animated.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../../Image/Image Required module not found

var Text = require('../../Text/Text');
var View = require('../../Components/View/View');

let AnimatedScrollView;

Expand All @@ -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;
},
Expand Down
22 changes: 11 additions & 11 deletions Libraries/Animated/src/AnimatedImplementation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../../react-native/React Required module not found

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');

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Animated/src/AnimatedWeb.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
'use strict';

var AnimatedImplementation = require('AnimatedImplementation');
var AnimatedImplementation = require('./AnimatedImplementation');

module.exports = {
...AnimatedImplementation,
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Animated/src/Easing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Libraries/Animated/src/Interpolation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions Libraries/Animated/src/NativeAnimatedHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
8 changes: 4 additions & 4 deletions Libraries/AppState/AppState.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

/**
Expand Down
2 changes: 1 addition & 1 deletion Libraries/BatchedBridge/BatchedBridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions Libraries/BatchedBridge/MessageQueue.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions Libraries/BatchedBridge/NativeModules.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
'use strict';

const BatchedBridge = require('BatchedBridge');
const BatchedBridge = require('./BatchedBridge');

const invariant = require('fbjs/lib/invariant');

Expand Down Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions Libraries/BugReporting/BugReporting.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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')());
}

/**
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions Libraries/CameraRoll/CameraRoll.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
*/
'use strict';

const {PropTypes, checkPropTypes} = require('React');
const RCTCameraRollManager = require('NativeModules').CameraRollManager;
const {PropTypes, checkPropTypes} = require('../react-native/React');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../react-native/React Required module not found

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 = {
Expand Down
2 changes: 1 addition & 1 deletion Libraries/CameraRoll/ImagePickerIOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
'use strict';

var RCTImagePicker = require('NativeModules').ImagePickerIOS;
var RCTImagePicker = require('../BatchedBridge/NativeModules').ImagePickerIOS;

var ImagePickerIOS = {
canRecordVideos: function(callback: Function) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
16 changes: 8 additions & 8 deletions Libraries/Components/ActivityIndicator/ActivityIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../../react-native/React Required module not found

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';

Expand Down
6 changes: 3 additions & 3 deletions Libraries/Components/AppleTV/TVEventHandler.ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Components/AppleTV/TVViewPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @flow
*/
'use strict';
var PropTypes = require('React').PropTypes;
var PropTypes = require('../../react-native/React').PropTypes;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../../react-native/React Required module not found


/**
* Additional View properties for Apple TV
Expand Down
16 changes: 8 additions & 8 deletions Libraries/Components/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../Utilities/Platform Required module not found

const React = require('../react-native/React');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../react-native/React Required module not found

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');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

./Touchable/TouchableNativeFeedback Required module not found

const TouchableOpacity = require('./Touchable/TouchableOpacity');
const View = require('./View/View');

const invariant = require('fbjs/lib/invariant');

Expand Down
Loading