Migrate "Libraries" from Haste to standard path-based requires (sans …

…vendor & renderers) (facebook#24749) Summary: This is the next step in moving RN towards standard path-based requires. All the requires in `Libraries` have been rewritten to use relative requires with a few exceptions, namely, `vendor` and `Renderer/oss` since those need to be changed upstream. This commit uses relative requires instead of `react-native/...` so that if Facebook were to stop syncing out certain folders and therefore remove code from the react-native package, internal code at Facebook would not need to change. See the umbrella issue at facebook#24316 for more detail. [General] [Changed] - Migrate "Libraries" from Haste to standard path-based requires Pull Request resolved: facebook#24749 Differential Revision: D15258017 Pulled By: cpojer fbshipit-source-id: a1f480ea36c05c659b6f37c8f02f6f9216d5a323 # Conflicts: # Libraries/AppState/AppState.js # Libraries/Blob/__tests__/URL-test.js # Libraries/Components/CheckBox/CheckBox.android.js # Libraries/Components/DatePicker/__tests__/DatePickerIOS-test.js # Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js # Libraries/Components/DrawerAndroid/__tests__/DrawerAndroid-test.js # Libraries/Components/MaskedView/__tests__/MaskedViewIOS-test.js # Libraries/Components/Picker/__tests__/Picker-test.js # Libraries/Components/ProgressBarAndroid/__tests__/ProgressBarAndroid-test.js # Libraries/Components/ProgressViewIOS/__tests__/ProgressViewIOS-test.js # Libraries/Components/SafeAreaView/SafeAreaView.js # Libraries/Components/SafeAreaView/__tests__/SafeAreaView-test.js # Libraries/Components/ScrollView/ScrollView.js # Libraries/Components/Slider/RCTSliderNativeComponent.js # Libraries/Components/TextInput/__tests__/InputAccessoryView-test.js # Libraries/Components/Touchable/TouchableWithoutFeedback.js # Libraries/Components/UnimplementedViews/UnimplementedNativeView.js # Libraries/Components/View/View.js # Libraries/Components/View/ViewPropTypes.js # Libraries/Core/Devtools/setupDevtools.js # Libraries/Core/InitializeCore.js # Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js # Libraries/Core/setUpBatchedBridge.js # Libraries/Core/setUpSegmentFetcher.js # Libraries/Core/setUpXHR.js # Libraries/Image/__tests__/Image-test.js # Libraries/Inspector/PerformanceOverlay.js # Libraries/Interaction/JSEventLoopWatchdog.js # Libraries/Linking/Linking.js # Libraries/Lists/SectionList.js # Libraries/Lists/__tests__/VirtualizedSectionList-test.js # Libraries/Modal/__tests__/Modal-test.js # Libraries/Network/RCTNetworking.android.js # Libraries/Network/RCTNetworking.ios.js # Libraries/ReactNative/AppRegistry.js # Libraries/ReactNative/FabricUIManager.js # Libraries/ReactNative/renderApplication.js # Libraries/Text/TextProps.js # Libraries/TurboModule/samples/NativeSampleTurboModule.js # Libraries/Utilities/GlobalPerformanceLogger.js # Libraries/Utilities/PerformanceLoggerContext.js # Libraries/Utilities/__tests__/DeviceInfo-test.js # Libraries/Utilities/__tests__/Dimensions-test.js # Libraries/Utilities/__tests__/PerformanceLogger-test.js # Libraries/Utilities/__tests__/PixelRatio-test.js # Libraries/Utilities/__tests__/binaryToBase64-test.js # Libraries/Utilities/__tests__/clamp-test.js # Libraries/Utilities/__tests__/infoLog-test.js # Libraries/Utilities/__tests__/logError-test.js # Libraries/Utilities/__tests__/mergeIntoFast-test.js # Libraries/Utilities/__tests__/stringifySafe-test.js # Libraries/Utilities/__tests__/warnOnce-test.js # Libraries/Utilities/createPerformanceLogger.js # Libraries/YellowBox/YellowBox.js # Libraries/promiseRejectionIsError.js # packages/react-native-codegen/src/Helpers.js
Cauldrath · Jul 30, 2019 · 33cd633 · 33cd633
1 parent 6c3ab71
commit 33cd633
Show file tree

Hide file tree

Showing 347 changed files with 1,401 additions and 1,333 deletions.
diff --git a/Libraries/ART/ReactNativeART.js b/Libraries/ART/ReactNativeART.js
@@ -10,15 +10,15 @@
 'use strict';
 
 const Color = require('art/core/color');
-const Path = require('ARTSerializablePath');
+const Path = require('./ARTSerializablePath');
 const Transform = require('art/core/transform');
 
-const React = require('React');
+const React = require('react');
 const PropTypes = require('prop-types');
-const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
+const ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes');
 
-const createReactNativeComponentClass = require('createReactNativeComponentClass');
-const merge = require('merge');
+const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
+const merge = require('../vendor/core/merge');
 const invariant = require('invariant');
 
 // Diff Helpers

diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -9,10 +9,11 @@
  */
 'use strict';
 
-const RCTActionSheetManager = require('NativeModules').ActionSheetManager;
+const RCTActionSheetManager = require('../BatchedBridge/NativeModules')
+  .ActionSheetManager;
 
 const invariant = require('invariant');
-const processColor = require('processColor');
+const processColor = require('../StyleSheet/processColor');
 
 /**
  * Display action sheets and share sheets on iOS.

diff --git a/Libraries/Alert/Alert.js b/Libraries/Alert/Alert.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const NativeModules = require('NativeModules');
+const NativeModules = require('../BatchedBridge/NativeModules');
 const RCTAlertManager = NativeModules.AlertManager;
-const Platform = require('Platform');
+const Platform = require('../Utilities/Platform');
 
 export type Buttons = Array<{
   text?: string,

diff --git a/Libraries/Alert/RCTAlertManager.android.js b/Libraries/Alert/RCTAlertManager.android.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const NativeModules = require('NativeModules');
+const NativeModules = require('../BatchedBridge/NativeModules');
 
 function emptyCallback() {}
 

diff --git a/Libraries/Alert/RCTAlertManager.ios.js b/Libraries/Alert/RCTAlertManager.ios.js
@@ -10,6 +10,6 @@
 
 'use strict';
 
-const RCTAlertManager = require('NativeModules').AlertManager;
+const RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager;
 
 module.exports = RCTAlertManager;
diff --git a/Libraries/Animated/src/Animated.js b/Libraries/Animated/src/Animated.js
@@ -10,30 +10,30 @@
 
 'use strict';
 
-import Platform from 'Platform';
+import Platform from '../../Utilities/Platform';
 
 const AnimatedImplementation = Platform.isTesting
-  ? require('AnimatedMock')
-  : require('AnimatedImplementation');
+  ? require('./AnimatedMock')
+  : require('./AnimatedImplementation');
 
 module.exports = {
   get FlatList() {
-    return require('AnimatedFlatList');
+    return require('./components/AnimatedFlatList');
   },
   get Image() {
-    return require('AnimatedImage');
+    return require('./components/AnimatedImage');
   },
   get ScrollView() {
-    return require('AnimatedScrollView');
+    return require('./components/AnimatedScrollView');
   },
   get SectionList() {
-    return require('AnimatedSectionList');
+    return require('./components/AnimatedSectionList');
   },
   get Text() {
-    return require('AnimatedText');
+    return require('./components/AnimatedText');
   },
   get View() {
-    return require('AnimatedView');
+    return require('./components/AnimatedView');
   },
   ...AnimatedImplementation,
 };
diff --git a/Libraries/Animated/src/AnimatedEvent.js b/Libraries/Animated/src/AnimatedEvent.js
@@ -11,7 +11,7 @@
 
 const AnimatedValue = require('./nodes/AnimatedValue');
 const NativeAnimatedHelper = require('./NativeAnimatedHelper');
-const ReactNative = require('ReactNative');
+const ReactNative = require('../../Renderer/shims/ReactNative');
 
 const invariant = require('invariant');
 const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');

diff --git a/Libraries/Animated/src/AnimatedMock.js b/Libraries/Animated/src/AnimatedMock.js
@@ -10,7 +10,7 @@
 'use strict';
 
 const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
-const AnimatedImplementation = require('AnimatedImplementation');
+const AnimatedImplementation = require('./AnimatedImplementation');
 const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
 const AnimatedNode = require('./nodes/AnimatedNode');
 const AnimatedProps = require('./nodes/AnimatedProps');

diff --git a/Libraries/Animated/src/AnimatedWeb.js b/Libraries/Animated/src/AnimatedWeb.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const AnimatedImplementation = require('AnimatedImplementation');
+const AnimatedImplementation = require('./AnimatedImplementation');
 
 module.exports = {
   ...AnimatedImplementation,

diff --git a/Libraries/Animated/src/Easing.js b/Libraries/Animated/src/Easing.js
@@ -216,7 +216,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/NativeAnimatedHelper.js b/Libraries/Animated/src/NativeAnimatedHelper.js
@@ -9,8 +9,9 @@
  */
 '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('invariant');
 

diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-let Animated = require('Animated');
+let Animated = require('../Animated');
 describe('Animated tests', () => {
   beforeEach(() => {
     jest.resetModules();
@@ -614,13 +614,13 @@ describe('Animated tests', () => {
     let InteractionManager;
 
     beforeEach(() => {
-      jest.mock('InteractionManager');
-      Animated = require('Animated');
-      InteractionManager = require('InteractionManager');
+      jest.mock('../../../Interaction/InteractionManager');
+      Animated = require('../Animated');
+      InteractionManager = require('../../../Interaction/InteractionManager');
     });
 
     afterEach(() => {
-      jest.unmock('InteractionManager');
+      jest.unmock('../../../Interaction/InteractionManager');
     });
 
     it('registers an interaction by default', () => {

diff --git a/Libraries/Animated/src/__tests__/AnimatedMock-test.js b/Libraries/Animated/src/__tests__/AnimatedMock-test.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const AnimatedMock = require('AnimatedMock');
-const AnimatedImplementation = require('AnimatedImplementation');
+const AnimatedMock = require('../AnimatedMock');
+const AnimatedImplementation = require('../AnimatedImplementation');
 
 describe('Animated Mock', () => {
   it('matches implementation keys', () => {

diff --git a/Libraries/Animated/src/__tests__/AnimatedNative-test.js b/Libraries/Animated/src/__tests__/AnimatedNative-test.js
@@ -15,22 +15,22 @@ ClassComponentMock.prototype.isReactComponent = true;
 
 jest
   .clearAllMocks()
-  .setMock('Text', ClassComponentMock)
-  .setMock('View', ClassComponentMock)
-  .setMock('Image', ClassComponentMock)
-  .setMock('ScrollView', ClassComponentMock)
-  .setMock('FlatList', ClassComponentMock)
-  .setMock('SectionList', ClassComponentMock)
-  .setMock('React', {Component: class {}})
-  .setMock('NativeModules', {
+  .setMock('../../../Text/Text', ClassComponentMock)
+  .setMock('../../../Components/View/View', ClassComponentMock)
+  .setMock('../../../Image/Image', ClassComponentMock)
+  .setMock('../../../Components/ScrollView/ScrollView', ClassComponentMock)
+  .setMock('../../../Lists/FlatList', ClassComponentMock)
+  .setMock('../../../Lists/SectionList', ClassComponentMock)
+  .setMock('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();
@@ -43,7 +43,8 @@ function createAndMountComponent(ComponentClass, props) {
 }
 
 describe('Native Animated', () => {
-  const nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
+  const nativeAnimatedModule = require('../../../BatchedBridge/NativeModules')
+    .NativeAnimatedModule;
 
   beforeEach(() => {
     nativeAnimatedModule.addAnimatedEventToView = jest.fn();

diff --git a/Libraries/Animated/src/__tests__/Easing-test.js b/Libraries/Animated/src/__tests__/Easing-test.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const Easing = require('Easing');
+const Easing = require('../Easing');
 describe('Easing', () => {
   it('should work with linear', () => {
     const easing = Easing.linear;

diff --git a/Libraries/Animated/src/__tests__/Interpolation-test.js b/Libraries/Animated/src/__tests__/Interpolation-test.js
@@ -11,7 +11,7 @@
 'use strict';
 
 const AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
-const Easing = require('Easing');
+const Easing = require('../Easing');
 
 describe('Interpolation', () => {
   it('should work with defaults', () => {

diff --git a/Libraries/Animated/src/__tests__/bezier-test.js b/Libraries/Animated/src/__tests__/bezier-test.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const bezier = require('bezier');
+const bezier = require('../bezier');
 
 const identity = function(x) {
   return x;

diff --git a/Libraries/Animated/src/animations/Animation.js b/Libraries/Animated/src/animations/Animation.js
@@ -9,7 +9,7 @@
  */
 'use strict';
 
-const NativeAnimatedHelper = require('NativeAnimatedHelper');
+const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 import type AnimatedValue from '../nodes/AnimatedValue';
 

diff --git a/Libraries/Animated/src/animations/TimingAnimation.js b/Libraries/Animated/src/animations/TimingAnimation.js
@@ -34,7 +34,7 @@ export 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/components/AnimatedFlatList.js b/Libraries/Animated/src/components/AnimatedFlatList.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const FlatList = require('FlatList');
+const FlatList = require('../../../Lists/FlatList');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(FlatList);
diff --git a/Libraries/Animated/src/components/AnimatedImage.js b/Libraries/Animated/src/components/AnimatedImage.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const Image = require('Image');
+const Image = require('../../../Image/Image');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(Image);
diff --git a/Libraries/Animated/src/components/AnimatedScrollView.js b/Libraries/Animated/src/components/AnimatedScrollView.js
@@ -10,9 +10,9 @@
 
 'use strict';
 
-const ScrollView = require('ScrollView');
+const ScrollView = require('../../../Components/ScrollView/ScrollView');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(ScrollView, {
   scrollEventThrottle: 0.0001,

diff --git a/Libraries/Animated/src/components/AnimatedSectionList.js b/Libraries/Animated/src/components/AnimatedSectionList.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const SectionList = require('SectionList');
+const SectionList = require('../../../Lists/SectionList');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(SectionList);
diff --git a/Libraries/Animated/src/components/AnimatedText.js b/Libraries/Animated/src/components/AnimatedText.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const Text = require('Text');
+const Text = require('../../../Text/Text');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(Text);
diff --git a/Libraries/Animated/src/components/AnimatedView.js b/Libraries/Animated/src/components/AnimatedView.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-const View = require('View');
+const View = require('../../../Components/View/View');
 
-const createAnimatedComponent = require('createAnimatedComponent');
+const createAnimatedComponent = require('../createAnimatedComponent');
 
 module.exports = createAnimatedComponent(View);
diff --git a/Libraries/Animated/src/createAnimatedComponent.js b/Libraries/Animated/src/createAnimatedComponent.js
@@ -11,8 +11,8 @@
 
 const {AnimatedEvent} = require('./AnimatedEvent');
 const AnimatedProps = require('./nodes/AnimatedProps');
-const React = require('React');
-const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
+const React = require('react');
+const DeprecatedViewStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedViewStylePropTypes');
 
 const invariant = require('invariant');
 

diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js
@@ -15,7 +15,7 @@ const AnimatedWithChildren = require('./AnimatedWithChildren');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 const invariant = require('invariant');
-const normalizeColor = require('normalizeColor');
+const normalizeColor = require('../../../Color/normalizeColor');
 
 type ExtrapolateType = 'extend' | 'identity' | 'clamp';
 

diff --git a/Libraries/Animated/src/nodes/AnimatedProps.js b/Libraries/Animated/src/nodes/AnimatedProps.js
@@ -13,7 +13,7 @@ const {AnimatedEvent} = require('../AnimatedEvent');
 const AnimatedNode = require('./AnimatedNode');
 const AnimatedStyle = require('./AnimatedStyle');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
-const ReactNative = require('ReactNative');
+const ReactNative = require('../../../Renderer/shims/ReactNative');
 
 const invariant = require('invariant');
 

diff --git a/Libraries/Animated/src/nodes/AnimatedStyle.js b/Libraries/Animated/src/nodes/AnimatedStyle.js
@@ -14,7 +14,7 @@ const AnimatedTransform = require('./AnimatedTransform');
 const AnimatedWithChildren = require('./AnimatedWithChildren');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
-const flattenStyle = require('flattenStyle');
+const flattenStyle = require('../../../StyleSheet/flattenStyle');
 
 class AnimatedStyle extends AnimatedWithChildren {
   _style: Object;

diff --git a/Libraries/Animated/src/nodes/AnimatedValue.js b/Libraries/Animated/src/nodes/AnimatedValue.js
@@ -11,7 +11,7 @@
 
 const AnimatedInterpolation = require('./AnimatedInterpolation');
 const AnimatedWithChildren = require('./AnimatedWithChildren');
-const InteractionManager = require('InteractionManager');
+const InteractionManager = require('../../../Interaction/InteractionManager');
 const NativeAnimatedHelper = require('../NativeAnimatedHelper');
 
 import type Animation, {EndCallback} from '../animations/Animation';