[WIP] Remove Haste

IntegrationTests/AccessibilityManagerTest.js

@@ -14,7 +14,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 const { View } = ReactNative;
-const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
+const RCTDeviceEventEmitter = require('../Libraries/EventEmitter/RCTDeviceEventEmitter');
 const {
   TestModule,
   AccessibilityManager,

IntegrationTests/AppEventsTest.js

@@ -21,7 +21,7 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;
 
-var deepDiffer = require('deepDiffer');
+var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer');
 
 var TEST_PAYLOAD = {foo: 'bar'};
 

IntegrationTests/AsyncStorageTest.js

@@ -20,7 +20,7 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;
 
-var deepDiffer = require('deepDiffer');
+var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer');
 
 var DEBUG = false;
 

IntegrationTests/IntegrationTestsApp.js

@@ -44,7 +44,7 @@ TESTS.forEach(
 );
 
 // Modules required for integration tests
-require('LoggingTestModule');
+require('../IntegrationTests/LoggingTestModule');
 
 type Test = any;
 

IntegrationTests/LayoutEventsTest.js

@@ -23,7 +23,7 @@ var {
 } = ReactNative;
 var { TestModule } = ReactNative.NativeModules;
 
-var deepDiffer = require('deepDiffer');
+var deepDiffer = require('../Libraries/Utilities/differ/deepDiffer');
 
 function debug(...args) {
   // console.log.apply(null, arguments);

IntegrationTests/LoggingTestModule.js

@@ -10,7 +10,7 @@
  */
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
+var BatchedBridge = require('../Libraries/BatchedBridge/BatchedBridge');
 
 var warning = require('fbjs/lib/warning');
 var invariant = require('fbjs/lib/invariant');

IntegrationTests/ReactContentSizeUpdateTest.js

@@ -12,8 +12,8 @@
 var React = require('react');
 var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
-var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
-var Subscribable = require('Subscribable');
+var RCTNativeAppEventEmitter = require('../Libraries/EventEmitter/RCTNativeAppEventEmitter');
+var Subscribable = require('../Libraries/Components/Subscribable');
 var TimerMixin = require('react-timer-mixin');
 
 var { View } = ReactNative;

IntegrationTests/SizeFlexibilityUpdateTest.js

@@ -12,8 +12,8 @@
 var React = require('react');
 var createReactClass = require('create-react-class');
 var ReactNative = require('react-native');
-var RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
-var Subscribable = require('Subscribable');
+var RCTNativeAppEventEmitter = require('../Libraries/EventEmitter/RCTNativeAppEventEmitter');
+var Subscribable = require('../Libraries/Components/Subscribable');
 var { View } = ReactNative;
 
 var { TestModule } = ReactNative.NativeModules;

Libraries/ART/ReactNativeART.js

@@ -11,15 +11,15 @@
 'use strict';
 
 var Color = require('art/core/color');
-var Path = require('ARTSerializablePath');
+var Path = require('./ARTSerializablePath');
 var Transform = require('art/core/transform');
 
-var React = require('React');
+var React = require('../react-native/React');
 var PropTypes = require('prop-types');
-var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+var ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes');
 
-var createReactNativeComponentClass = require('createReactNativeComponentClass');
-var merge = require('merge');
+var createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
+var merge = require('../vendor/core/merge');
 var invariant = require('fbjs/lib/invariant');
 
 // Diff Helpers

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 = {
   /**

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

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

Libraries/Alert/RCTAlertManager.android.js

@@ -10,7 +10,7 @@
 */
 'use strict';
 
-var NativeModules = require('NativeModules');
+var NativeModules = require('../BatchedBridge/NativeModules');
 
 function emptyCallback() {}
 

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;

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;
   },

Libraries/Animated/src/AnimatedImplementation.js

@@ -12,16 +12,16 @@
  */
 'use strict';
 
-var InteractionManager = require('InteractionManager');
-var Interpolation = require('Interpolation');
-var NativeAnimatedHelper = require('NativeAnimatedHelper');
-var React = require('React');
-var ReactNative = require('ReactNative');
-var Set = require('Set');
-var SpringConfig = require('SpringConfig');
-var ViewStylePropTypes = require('ViewStylePropTypes');
-
-var flattenStyle = require('flattenStyle');
+var InteractionManager = require('../../Interaction/InteractionManager');
+var Interpolation = require('./Interpolation');
+var NativeAnimatedHelper = require('./NativeAnimatedHelper');
+var React = require('../../react-native/React');
+var ReactNative = require('../../Renderer/shims/ReactNative');
+var Set = require('../../vendor/core/Set');
+var SpringConfig = require('./SpringConfig');
+var ViewStylePropTypes = require('../../Components/View/ViewStylePropTypes');
+
+var flattenStyle = require('../../StyleSheet/flattenStyle');
 var invariant = require('fbjs/lib/invariant');
 var requestAnimationFrame = require('fbjs/lib/requestAnimationFrame');
 
@@ -247,7 +247,7 @@ type TimingAnimationConfigSingle = AnimationConfig & {
 let _easeInOut;
 function easeInOut() {
   if (!_easeInOut) {
-    const Easing = require('Easing');
+    const Easing = require('./Easing');
     _easeInOut = Easing.inOut(Easing.ease);
   }
   return _easeInOut;

Libraries/Animated/src/AnimatedWeb.js

@@ -11,7 +11,7 @@
  */
 'use strict';
 
-var AnimatedImplementation = require('AnimatedImplementation');
+var AnimatedImplementation = require('./AnimatedImplementation');
 
 module.exports = {
   ...AnimatedImplementation,

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

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

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

Libraries/Animated/src/__tests__/Animated-test.js

@@ -8,7 +8,7 @@
  */
 'use strict';
 
-var Animated = require('Animated');
+var Animated = require('../Animated');
 describe('Animated tests', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -560,13 +560,13 @@ describe('Animated tests', () => {
     var InteractionManager;
 
     beforeEach(() => {
-      jest.mock('InteractionManager');
-      Animated = require('Animated');
-      InteractionManager = require('InteractionManager');
+      jest.mock('../../../Interaction/InteractionManager');
+      Animated = require('../Animated');
+      InteractionManager = require('../../../Interaction/InteractionManager');
     });
 
     afterEach(()=> {
-      jest.unmock('InteractionManager');
+      jest.unmock('../../../Interaction/InteractionManager');
     });
 
     it('registers an interaction by default', () => {

Libraries/Animated/src/__tests__/AnimatedNative-test.js

@@ -9,19 +9,19 @@
 'use strict';
 
 jest
-  .setMock('Text', {})
-  .setMock('View', {})
-  .setMock('Image', {})
-  .setMock('React', {Component: class {}})
-  .setMock('NativeModules', {
+  .setMock('../../../Text/Text', {})
+  .setMock('../../../Components/View/View', {})
+  .setMock('../../../Image/Image', {})
+  .setMock('../../../react-native/React', {Component: class {}})
+  .setMock('../../../BatchedBridge/NativeModules', {
     NativeAnimatedModule: {},
   })
-  .mock('NativeEventEmitter')
+  .mock('../../../EventEmitter/NativeEventEmitter')
   // findNodeHandle is imported from ReactNative so mock that whole module.
-  .setMock('ReactNative', {findNodeHandle: () => 1});
+  .setMock('../../../Renderer/shims/ReactNative', {findNodeHandle: () => 1});
 
-const Animated = require('Animated');
-const NativeAnimatedHelper = require('NativeAnimatedHelper');
+const Animated = require('../Animated');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 function createAndMountComponent(ComponentClass, props) {
   const component = new ComponentClass();
@@ -35,7 +35,7 @@ function createAndMountComponent(ComponentClass, props) {
 
 describe('Native Animated', () => {
 
-  const nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
+  const nativeAnimatedModule = require('../../../BatchedBridge/NativeModules').NativeAnimatedModule;
 
   beforeEach(() => {
     nativeAnimatedModule.addAnimatedEventToView = jest.fn();

Libraries/Animated/src/__tests__/Easing-test.js

@@ -8,7 +8,7 @@
  */
 'use strict';
 
-var Easing = require('Easing');
+var Easing = require('../Easing');
 describe('Easing', () => {
   it('should work with linear', () => {
     var easing = Easing.linear;

Libraries/Animated/src/__tests__/Interpolation-test.js

@@ -8,8 +8,8 @@
  */
 'use strict';
 
-var Interpolation = require('Interpolation');
-var Easing = require('Easing');
+var Interpolation = require('../Interpolation');
+var Easing = require('../Easing');
 
 describe('Interpolation', () => {
   it('should work with defaults', () => {

Libraries/Animated/src/__tests__/bezier-test.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-var bezier = require('bezier');
+var bezier = require('../bezier');
 
 var identity = function (x) { return x; };
 

Libraries/AppState/AppState.js

@@ -11,12 +11,12 @@
  */
 'use strict';
 
-const MissingNativeEventEmitterShim = require('MissingNativeEventEmitterShim');
-const NativeEventEmitter = require('NativeEventEmitter');
-const NativeModules = require('NativeModules');
+const MissingNativeEventEmitterShim = require('../EventEmitter/MissingNativeEventEmitterShim');
+const NativeEventEmitter = require('../EventEmitter/NativeEventEmitter');
+const NativeModules = require('../BatchedBridge/NativeModules');
 const RCTAppState = NativeModules.AppState;
 
-const logError = require('logError');
+const logError = require('../Utilities/logError');
 const invariant = require('fbjs/lib/invariant');
 
 /**

Libraries/BatchedBridge/BatchedBridge.js

@@ -12,7 +12,7 @@
  */
 'use strict';
 
-const MessageQueue = require('MessageQueue');
+const MessageQueue = require('./MessageQueue');
 
 const BatchedBridge = new MessageQueue();
 

Libraries/BatchedBridge/MessageQueue.js

@@ -15,12 +15,12 @@
 
 'use strict';
 
-const ErrorUtils = require('ErrorUtils');
-const Systrace = require('Systrace');
+const ErrorUtils = require('../vendor/core/ErrorUtils');
+const Systrace = require('../Performance/Systrace');
 
-const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
+const deepFreezeAndThrowOnMutationInDev = require('../Utilities/deepFreezeAndThrowOnMutationInDev');
 const invariant = require('fbjs/lib/invariant');
-const stringifySafe = require('stringifySafe');
+const stringifySafe = require('../Utilities/stringifySafe');
 
 export type SpyData = {
   type: number,
@@ -277,7 +277,7 @@ class MessageQueue {
   __callImmediates() {
     Systrace.beginEvent('JSTimers.callImmediates()');
     if (!JSTimers) {
-      JSTimers = require('JSTimers');
+      JSTimers = require('../Core/Timers/JSTimers');
     }
     JSTimers.callImmediates();
     Systrace.endEvent();