Skip to content

Commit 33cd633

Browse files
ideCauldrath
authored andcommitted
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
1 parent 6c3ab71 commit 33cd633

File tree

347 files changed

+1401
-1333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+1401
-1333
lines changed

Libraries/ART/ReactNativeART.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
'use strict';
1111

1212
const Color = require('art/core/color');
13-
const Path = require('ARTSerializablePath');
13+
const Path = require('./ARTSerializablePath');
1414
const Transform = require('art/core/transform');
1515

16-
const React = require('React');
16+
const React = require('react');
1717
const PropTypes = require('prop-types');
18-
const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
18+
const ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes');
1919

20-
const createReactNativeComponentClass = require('createReactNativeComponentClass');
21-
const merge = require('merge');
20+
const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
21+
const merge = require('../vendor/core/merge');
2222
const invariant = require('invariant');
2323

2424
// Diff Helpers

Libraries/ActionSheetIOS/ActionSheetIOS.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
*/
1010
'use strict';
1111

12-
const RCTActionSheetManager = require('NativeModules').ActionSheetManager;
12+
const RCTActionSheetManager = require('../BatchedBridge/NativeModules')
13+
.ActionSheetManager;
1314

1415
const invariant = require('invariant');
15-
const processColor = require('processColor');
16+
const processColor = require('../StyleSheet/processColor');
1617

1718
/**
1819
* Display action sheets and share sheets on iOS.

Libraries/Alert/Alert.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
const NativeModules = require('NativeModules');
13+
const NativeModules = require('../BatchedBridge/NativeModules');
1414
const RCTAlertManager = NativeModules.AlertManager;
15-
const Platform = require('Platform');
15+
const Platform = require('../Utilities/Platform');
1616

1717
export type Buttons = Array<{
1818
text?: string,

Libraries/Alert/RCTAlertManager.android.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
const NativeModules = require('NativeModules');
12+
const NativeModules = require('../BatchedBridge/NativeModules');
1313

1414
function emptyCallback() {}
1515

Libraries/Alert/RCTAlertManager.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
'use strict';
1212

13-
const RCTAlertManager = require('NativeModules').AlertManager;
13+
const RCTAlertManager = require('../BatchedBridge/NativeModules').AlertManager;
1414

1515
module.exports = RCTAlertManager;

Libraries/Animated/src/Animated.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010

1111
'use strict';
1212

13-
import Platform from 'Platform';
13+
import Platform from '../../Utilities/Platform';
1414

1515
const AnimatedImplementation = Platform.isTesting
16-
? require('AnimatedMock')
17-
: require('AnimatedImplementation');
16+
? require('./AnimatedMock')
17+
: require('./AnimatedImplementation');
1818

1919
module.exports = {
2020
get FlatList() {
21-
return require('AnimatedFlatList');
21+
return require('./components/AnimatedFlatList');
2222
},
2323
get Image() {
24-
return require('AnimatedImage');
24+
return require('./components/AnimatedImage');
2525
},
2626
get ScrollView() {
27-
return require('AnimatedScrollView');
27+
return require('./components/AnimatedScrollView');
2828
},
2929
get SectionList() {
30-
return require('AnimatedSectionList');
30+
return require('./components/AnimatedSectionList');
3131
},
3232
get Text() {
33-
return require('AnimatedText');
33+
return require('./components/AnimatedText');
3434
},
3535
get View() {
36-
return require('AnimatedView');
36+
return require('./components/AnimatedView');
3737
},
3838
...AnimatedImplementation,
3939
};

Libraries/Animated/src/AnimatedEvent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
const AnimatedValue = require('./nodes/AnimatedValue');
1313
const NativeAnimatedHelper = require('./NativeAnimatedHelper');
14-
const ReactNative = require('ReactNative');
14+
const ReactNative = require('../../Renderer/shims/ReactNative');
1515

1616
const invariant = require('invariant');
1717
const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');

Libraries/Animated/src/AnimatedMock.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'use strict';
1111

1212
const {AnimatedEvent, attachNativeEvent} = require('./AnimatedEvent');
13-
const AnimatedImplementation = require('AnimatedImplementation');
13+
const AnimatedImplementation = require('./AnimatedImplementation');
1414
const AnimatedInterpolation = require('./nodes/AnimatedInterpolation');
1515
const AnimatedNode = require('./nodes/AnimatedNode');
1616
const AnimatedProps = require('./nodes/AnimatedProps');

Libraries/Animated/src/AnimatedWeb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const AnimatedImplementation = require('AnimatedImplementation');
13+
const AnimatedImplementation = require('./AnimatedImplementation');
1414

1515
module.exports = {
1616
...AnimatedImplementation,

Libraries/Animated/src/Easing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class Easing {
216216
x2: number,
217217
y2: number,
218218
): (t: number) => number {
219-
const _bezier = require('bezier');
219+
const _bezier = require('./bezier');
220220
return _bezier(x1, y1, x2, y2);
221221
}
222222

Libraries/Animated/src/NativeAnimatedHelper.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
*/
1010
'use strict';
1111

12-
const NativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
13-
const NativeEventEmitter = require('NativeEventEmitter');
12+
const NativeAnimatedModule = require('../../BatchedBridge/NativeModules')
13+
.NativeAnimatedModule;
14+
const NativeEventEmitter = require('../../EventEmitter/NativeEventEmitter');
1415

1516
const invariant = require('invariant');
1617

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
let Animated = require('Animated');
13+
let Animated = require('../Animated');
1414
describe('Animated tests', () => {
1515
beforeEach(() => {
1616
jest.resetModules();
@@ -614,13 +614,13 @@ describe('Animated tests', () => {
614614
let InteractionManager;
615615

616616
beforeEach(() => {
617-
jest.mock('InteractionManager');
618-
Animated = require('Animated');
619-
InteractionManager = require('InteractionManager');
617+
jest.mock('../../../Interaction/InteractionManager');
618+
Animated = require('../Animated');
619+
InteractionManager = require('../../../Interaction/InteractionManager');
620620
});
621621

622622
afterEach(() => {
623-
jest.unmock('InteractionManager');
623+
jest.unmock('../../../Interaction/InteractionManager');
624624
});
625625

626626
it('registers an interaction by default', () => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const AnimatedMock = require('AnimatedMock');
14-
const AnimatedImplementation = require('AnimatedImplementation');
13+
const AnimatedMock = require('../AnimatedMock');
14+
const AnimatedImplementation = require('../AnimatedImplementation');
1515

1616
describe('Animated Mock', () => {
1717
it('matches implementation keys', () => {

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ ClassComponentMock.prototype.isReactComponent = true;
1515

1616
jest
1717
.clearAllMocks()
18-
.setMock('Text', ClassComponentMock)
19-
.setMock('View', ClassComponentMock)
20-
.setMock('Image', ClassComponentMock)
21-
.setMock('ScrollView', ClassComponentMock)
22-
.setMock('FlatList', ClassComponentMock)
23-
.setMock('SectionList', ClassComponentMock)
24-
.setMock('React', {Component: class {}})
25-
.setMock('NativeModules', {
18+
.setMock('../../../Text/Text', ClassComponentMock)
19+
.setMock('../../../Components/View/View', ClassComponentMock)
20+
.setMock('../../../Image/Image', ClassComponentMock)
21+
.setMock('../../../Components/ScrollView/ScrollView', ClassComponentMock)
22+
.setMock('../../../Lists/FlatList', ClassComponentMock)
23+
.setMock('../../../Lists/SectionList', ClassComponentMock)
24+
.setMock('react', {Component: class {}})
25+
.setMock('../../../BatchedBridge/NativeModules', {
2626
NativeAnimatedModule: {},
2727
})
28-
.mock('NativeEventEmitter')
28+
.mock('../../../EventEmitter/NativeEventEmitter')
2929
// findNodeHandle is imported from ReactNative so mock that whole module.
30-
.setMock('ReactNative', {findNodeHandle: () => 1});
30+
.setMock('../../../Renderer/shims/ReactNative', {findNodeHandle: () => 1});
3131

32-
const Animated = require('Animated');
33-
const NativeAnimatedHelper = require('NativeAnimatedHelper');
32+
const Animated = require('../Animated');
33+
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
3434

3535
function createAndMountComponent(ComponentClass, props) {
3636
const component = new ComponentClass();
@@ -43,7 +43,8 @@ function createAndMountComponent(ComponentClass, props) {
4343
}
4444

4545
describe('Native Animated', () => {
46-
const nativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
46+
const nativeAnimatedModule = require('../../../BatchedBridge/NativeModules')
47+
.NativeAnimatedModule;
4748

4849
beforeEach(() => {
4950
nativeAnimatedModule.addAnimatedEventToView = jest.fn();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const Easing = require('Easing');
13+
const Easing = require('../Easing');
1414
describe('Easing', () => {
1515
it('should work with linear', () => {
1616
const easing = Easing.linear;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'use strict';
1212

1313
const AnimatedInterpolation = require('../nodes/AnimatedInterpolation');
14-
const Easing = require('Easing');
14+
const Easing = require('../Easing');
1515

1616
describe('Interpolation', () => {
1717
it('should work with defaults', () => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
'use strict';
1717

18-
const bezier = require('bezier');
18+
const bezier = require('../bezier');
1919

2020
const identity = function(x) {
2121
return x;

Libraries/Animated/src/animations/Animation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
'use strict';
1111

12-
const NativeAnimatedHelper = require('NativeAnimatedHelper');
12+
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1313

1414
import type AnimatedValue from '../nodes/AnimatedValue';
1515

Libraries/Animated/src/animations/TimingAnimation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export type TimingAnimationConfigSingle = AnimationConfig & {
3434
let _easeInOut;
3535
function easeInOut() {
3636
if (!_easeInOut) {
37-
const Easing = require('Easing');
37+
const Easing = require('../Easing');
3838
_easeInOut = Easing.inOut(Easing.ease);
3939
}
4040
return _easeInOut;

Libraries/Animated/src/components/AnimatedFlatList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const FlatList = require('FlatList');
13+
const FlatList = require('../../../Lists/FlatList');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(FlatList);

Libraries/Animated/src/components/AnimatedImage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const Image = require('Image');
13+
const Image = require('../../../Image/Image');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(Image);

Libraries/Animated/src/components/AnimatedScrollView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
const ScrollView = require('ScrollView');
13+
const ScrollView = require('../../../Components/ScrollView/ScrollView');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(ScrollView, {
1818
scrollEventThrottle: 0.0001,

Libraries/Animated/src/components/AnimatedSectionList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const SectionList = require('SectionList');
13+
const SectionList = require('../../../Lists/SectionList');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(SectionList);

Libraries/Animated/src/components/AnimatedText.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const Text = require('Text');
13+
const Text = require('../../../Text/Text');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(Text);

Libraries/Animated/src/components/AnimatedView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
'use strict';
1212

13-
const View = require('View');
13+
const View = require('../../../Components/View/View');
1414

15-
const createAnimatedComponent = require('createAnimatedComponent');
15+
const createAnimatedComponent = require('../createAnimatedComponent');
1616

1717
module.exports = createAnimatedComponent(View);

Libraries/Animated/src/createAnimatedComponent.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
const {AnimatedEvent} = require('./AnimatedEvent');
1313
const AnimatedProps = require('./nodes/AnimatedProps');
14-
const React = require('React');
15-
const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
14+
const React = require('react');
15+
const DeprecatedViewStylePropTypes = require('../../DeprecatedPropTypes/DeprecatedViewStylePropTypes');
1616

1717
const invariant = require('invariant');
1818

Libraries/Animated/src/nodes/AnimatedInterpolation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const AnimatedWithChildren = require('./AnimatedWithChildren');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1616

1717
const invariant = require('invariant');
18-
const normalizeColor = require('normalizeColor');
18+
const normalizeColor = require('../../../Color/normalizeColor');
1919

2020
type ExtrapolateType = 'extend' | 'identity' | 'clamp';
2121

Libraries/Animated/src/nodes/AnimatedProps.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const {AnimatedEvent} = require('../AnimatedEvent');
1313
const AnimatedNode = require('./AnimatedNode');
1414
const AnimatedStyle = require('./AnimatedStyle');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
16-
const ReactNative = require('ReactNative');
16+
const ReactNative = require('../../../Renderer/shims/ReactNative');
1717

1818
const invariant = require('invariant');
1919

Libraries/Animated/src/nodes/AnimatedStyle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AnimatedTransform = require('./AnimatedTransform');
1414
const AnimatedWithChildren = require('./AnimatedWithChildren');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1616

17-
const flattenStyle = require('flattenStyle');
17+
const flattenStyle = require('../../../StyleSheet/flattenStyle');
1818

1919
class AnimatedStyle extends AnimatedWithChildren {
2020
_style: Object;

Libraries/Animated/src/nodes/AnimatedValue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
const AnimatedInterpolation = require('./AnimatedInterpolation');
1313
const AnimatedWithChildren = require('./AnimatedWithChildren');
14-
const InteractionManager = require('InteractionManager');
14+
const InteractionManager = require('../../../Interaction/InteractionManager');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1616

1717
import type Animation, {EndCallback} from '../animations/Animation';

0 commit comments

Comments
 (0)