Skip to content

Commit 4f20362

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Migrate files in Libraries/StyleSheet to use export syntax (#49303)
Summary: Pull Request resolved: #49303 Changelog: [General][Breaking] Deep imports to modules inside `Libraries/StyleSheet` using `require` may need to be appended with `.default` Reviewed By: huntie Differential Revision: D69400980 fbshipit-source-id: 053f40a8677ac877b93c27e87422ea0ef540c272
1 parent 04b4085 commit 4f20362

34 files changed

+50
-45
lines changed

packages/react-native/Libraries/Animated/__tests__/Animated-web-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @oncall react_native
99
*/
1010

11-
const StyleSheet = require('../../StyleSheet/StyleSheet');
11+
const StyleSheet = require('../../StyleSheet/StyleSheet').default;
1212
let Animated = require('../Animated').default;
1313
let AnimatedProps = require('../nodes/AnimatedProps').default;
1414

packages/react-native/Libraries/Core/setUpReactDevTools.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ if (__DEV__) {
7272

7373
const ReactNativeStyleAttributes =
7474
require('../Components/View/ReactNativeStyleAttributes').default;
75-
const resolveRNStyle = require('../StyleSheet/flattenStyle');
75+
const resolveRNStyle = require('../StyleSheet/flattenStyle').default;
7676

7777
function handleReactDevToolsSettingsUpdate(settings: Object) {
7878
reactDevToolsSettingsManager.setGlobalHookSettings(

packages/react-native/Libraries/Lists/FlatList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import VirtualizedLists from '@react-native/virtualized-lists';
2424
import memoizeOne from 'memoize-one';
2525
import React from 'react';
2626

27-
const StyleSheet = require('../StyleSheet/StyleSheet');
27+
const StyleSheet = require('../StyleSheet/StyleSheet').default;
2828
const deepDiffer = require('../Utilities/differ/deepDiffer').default;
2929
const Platform = require('../Utilities/Platform');
3030
const invariant = require('invariant');

packages/react-native/Libraries/Modal/Modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const View = require('../Components/View/View').default;
2525
const AppContainer = require('../ReactNative/AppContainer').default;
2626
const I18nManager = require('../ReactNative/I18nManager').default;
2727
const {RootTagContext} = require('../ReactNative/RootTag');
28-
const StyleSheet = require('../StyleSheet/StyleSheet');
28+
const StyleSheet = require('../StyleSheet/StyleSheet').default;
2929
const Platform = require('../Utilities/Platform');
3030

3131
const VirtualizedListContextResetter =

packages/react-native/Libraries/ReactNative/AppContainer-dev.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ const reactDevToolsHook: ReactDevToolsGlobalHook =
3333
// Required for React DevTools to view / edit React Native styles in Flipper.
3434
// Flipper doesn't inject these values when initializing DevTools.
3535
if (reactDevToolsHook) {
36-
reactDevToolsHook.resolveRNStyle = require('../StyleSheet/flattenStyle');
36+
reactDevToolsHook.resolveRNStyle =
37+
require('../StyleSheet/flattenStyle').default;
3738
reactDevToolsHook.nativeStyleEditorValidAttributes = Object.keys(
3839
ReactNativeStyleAttributes,
3940
);

packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ module.exports = {
7474
get flattenStyle(): flattenStyle<DangerouslyImpreciseStyleProp> {
7575
// $FlowFixMe[underconstrained-implicit-instantiation]
7676
// $FlowFixMe[incompatible-return]
77-
return require('../StyleSheet/flattenStyle');
77+
return require('../StyleSheet/flattenStyle').default;
7878
},
7979
get ReactFiberErrorDialog(): ReactFiberErrorDialog {
8080
return require('../Core/ReactFiberErrorDialog').default;

packages/react-native/Libraries/StyleSheet/PlatformColorValueTypes.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const _normalizeColorObject = (
5656
// an ios semantic color
5757
return color;
5858
} else if ('dynamic' in color && color.dynamic !== undefined) {
59-
const normalizeColor = require('./normalizeColor');
59+
const normalizeColor = require('./normalizeColor').default;
6060

6161
// a dynamic, appearance aware color
6262
const dynamic = color.dynamic;

packages/react-native/Libraries/StyleSheet/StyleSheet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ if (__DEV__) {
228228
* and suggestions to help you write valid styles.
229229
*
230230
*/
231-
module.exports = {
231+
export default {
232232
/**
233233
* This is defined as the width of a thin line on the platform. It can be
234234
* used as the thickness of a border or division between two elements.

packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js

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

1313
import type {ImageStyleProp, TextStyleProp} from '../StyleSheet';
1414

15-
const StyleSheet = require('../StyleSheet');
15+
const StyleSheet = require('../StyleSheet').default;
1616
const imageStyle = {tintColor: 'rgb(0, 0, 0)'};
1717
const textStyle = {color: 'rgb(0, 0, 0)'};
1818

packages/react-native/Libraries/StyleSheet/__tests__/StyleSheet-test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
* @oncall react_native
99
*/
1010

11-
import {setStyleAttributePreprocessor} from '../StyleSheet';
11+
import StyleSheet from '../StyleSheet';
12+
13+
const setStyleAttributePreprocessor = StyleSheet.setStyleAttributePreprocessor;
1214

1315
describe(setStyleAttributePreprocessor, () => {
1416
const originalConsoleWarn = console.warn;

packages/react-native/Libraries/StyleSheet/__tests__/flattenStyle-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 flattenStyle = require('../flattenStyle');
14-
const StyleSheet = require('../StyleSheet');
13+
const flattenStyle = require('../flattenStyle').default;
14+
const StyleSheet = require('../StyleSheet').default;
1515

1616
function getFixture() {
1717
return StyleSheet.create({

packages/react-native/Libraries/StyleSheet/__tests__/normalizeColor-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
'use strict';
1212

1313
const {OS} = require('../../Utilities/Platform');
14-
const normalizeColor = require('../normalizeColor');
14+
const normalizeColor = require('../normalizeColor').default;
1515

1616
it('forwards calls to @react-native/normalize-colors', () => {
1717
jest.resetModules().mock('@react-native/normalize-colors', () => jest.fn());
1818

19-
expect(require('../normalizeColor')('#abc')).not.toBe(null);
19+
expect(require('../normalizeColor').default('#abc')).not.toBe(null);
2020
expect(require('@react-native/normalize-colors')).toBeCalled();
2121
});
2222

packages/react-native/Libraries/StyleSheet/__tests__/processAspectRatio-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 processAspectRatio = require('../processAspectRatio');
13+
const processAspectRatio = require('../processAspectRatio').default;
1414

1515
describe('processAspectRatio', () => {
1616
it('should accept numbers', () => {

packages/react-native/Libraries/StyleSheet/__tests__/processFontVariant-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 processFontVariant = require('../processFontVariant');
13+
const processFontVariant = require('../processFontVariant').default;
1414

1515
describe('processFontVariant', () => {
1616
it('should accept arrays', () => {

packages/react-native/Libraries/StyleSheet/__tests__/processTransform-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 processTransform = require('../processTransform');
13+
const processTransform = require('../processTransform').default;
1414

1515
describe('processTransform', () => {
1616
describe('validation', () => {

packages/react-native/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-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 normalizeColor = require('../normalizeColor');
14-
const setNormalizedColorAlpha = require('../setNormalizedColorAlpha');
13+
const normalizeColor = require('../normalizeColor').default;
14+
const setNormalizedColorAlpha = require('../setNormalizedColorAlpha').default;
1515

1616
describe('setNormalizedColorAlpha', function () {
1717
it('should adjust the alpha of the color passed in', function () {

packages/react-native/Libraries/StyleSheet/flattenStyle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ function flattenStyle<TStyleProp: DangerouslyImpreciseStyleProp>(
4343
return result;
4444
}
4545

46-
module.exports = flattenStyle;
46+
export default flattenStyle;

packages/react-native/Libraries/StyleSheet/normalizeColor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ function normalizeColor(
3131
}
3232
}
3333

34-
module.exports = normalizeColor;
34+
export default normalizeColor;

packages/react-native/Libraries/StyleSheet/processAspectRatio.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ function processAspectRatio(aspectRatio?: number | string): ?number {
6060
return Number(matches[0]);
6161
}
6262

63-
module.exports = processAspectRatio;
63+
export default processAspectRatio;

packages/react-native/Libraries/StyleSheet/processColor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import type {ColorValue, NativeColorValue} from './StyleSheet';
1414

1515
const Platform = require('../Utilities/Platform');
16-
const normalizeColor = require('./normalizeColor');
16+
const normalizeColor = require('./normalizeColor').default;
1717

1818
export type ProcessedColorValue = number | NativeColorValue;
1919

packages/react-native/Libraries/StyleSheet/processFontVariant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ function processFontVariant(
2727
return match;
2828
}
2929

30-
module.exports = processFontVariant;
30+
export default processFontVariant;

packages/react-native/Libraries/StyleSheet/processTransform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,4 @@ function _validateTransform(
266266
}
267267
}
268268

269-
module.exports = processTransform;
269+
export default processTransform;

packages/react-native/Libraries/StyleSheet/setNormalizedColorAlpha.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ function setNormalizedColorAlpha(input: number, alpha: number): number {
2828
return ((input & 0xffffff00) | alpha) >>> 0;
2929
}
3030

31-
module.exports = setNormalizedColorAlpha;
31+
export default setNormalizedColorAlpha;

packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7083,7 +7083,7 @@ declare const absoluteFill: {
70837083
+right: 0,
70847084
+top: 0,
70857085
};
7086-
declare module.exports: {
7086+
declare export default {
70877087
hairlineWidth: hairlineWidth,
70887088
absoluteFill: any,
70897089
absoluteFillObject: absoluteFill,
@@ -7507,15 +7507,15 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/flatt
75077507
"declare function flattenStyle<TStyleProp: DangerouslyImpreciseStyleProp>(
75087508
style: ?TStyleProp
75097509
): ?____FlattenStyleProp_Internal<TStyleProp>;
7510-
declare module.exports: flattenStyle;
7510+
declare export default typeof flattenStyle;
75117511
"
75127512
`;
75137513

75147514
exports[`public API should not change unintentionally Libraries/StyleSheet/normalizeColor.js 1`] = `
75157515
"declare function normalizeColor(
75167516
color: ?(ColorValue | ProcessedColorValue)
75177517
): ?ProcessedColorValue;
7518-
declare module.exports: normalizeColor;
7518+
declare export default typeof normalizeColor;
75197519
"
75207520
`;
75217521

@@ -7563,7 +7563,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/priva
75637563

75647564
exports[`public API should not change unintentionally Libraries/StyleSheet/processAspectRatio.js 1`] = `
75657565
"declare function processAspectRatio(aspectRatio?: number | string): ?number;
7566-
declare module.exports: processAspectRatio;
7566+
declare export default typeof processAspectRatio;
75677567
"
75687568
`;
75697569

@@ -7647,15 +7647,15 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce
76477647
"declare function processFontVariant(
76487648
fontVariant: ____FontVariantArray_Internal | string
76497649
): ?____FontVariantArray_Internal;
7650-
declare module.exports: processFontVariant;
7650+
declare export default typeof processFontVariant;
76517651
"
76527652
`;
76537653

76547654
exports[`public API should not change unintentionally Libraries/StyleSheet/processTransform.js 1`] = `
76557655
"declare function processTransform(
76567656
transform: Array<Object> | string
76577657
): Array<Object> | Array<number>;
7658-
declare module.exports: processTransform;
7658+
declare export default typeof processTransform;
76597659
"
76607660
`;
76617661

@@ -7668,7 +7668,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce
76687668

76697669
exports[`public API should not change unintentionally Libraries/StyleSheet/setNormalizedColorAlpha.js 1`] = `
76707670
"declare function setNormalizedColorAlpha(input: number, alpha: number): number;
7671-
declare module.exports: setNormalizedColorAlpha;
7671+
declare export default typeof setNormalizedColorAlpha;
76727672
"
76737673
`;
76747674

packages/react-native/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ module.exports = {
321321
return require('./Libraries/Share/Share').default;
322322
},
323323
get StyleSheet(): StyleSheet {
324-
return require('./Libraries/StyleSheet/StyleSheet');
324+
return require('./Libraries/StyleSheet/StyleSheet').default;
325325
},
326326
get Systrace(): Systrace {
327327
return require('./Libraries/Performance/Systrace');

packages/react-native/src/private/inspector/BoxInspector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import type {InspectedElementFrame} from './Inspector';
1919
import React from 'react';
2020

2121
const View = require('../../../Libraries/Components/View/View').default;
22-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
22+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2323
const Text = require('../../../Libraries/Text/Text').default;
2424
const resolveBoxStyle = require('./resolveBoxStyle').default;
2525

packages/react-native/src/private/inspector/ElementBox.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ import type {InspectedElementFrame} from './Inspector';
1616
import React from 'react';
1717

1818
const View = require('../../../Libraries/Components/View/View').default;
19-
const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle');
20-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
19+
const flattenStyle =
20+
require('../../../Libraries/StyleSheet/flattenStyle').default;
21+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2122
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
2223
const BorderBox = require('./BorderBox').default;
2324
const resolveBoxStyle = require('./resolveBoxStyle').default;

packages/react-native/src/private/inspector/ElementProperties.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ const TouchableHighlight =
2020
const TouchableWithoutFeedback =
2121
require('../../../Libraries/Components/Touchable/TouchableWithoutFeedback').default;
2222
const View = require('../../../Libraries/Components/View/View').default;
23-
const flattenStyle = require('../../../Libraries/StyleSheet/flattenStyle');
24-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
23+
const flattenStyle =
24+
require('../../../Libraries/StyleSheet/flattenStyle').default;
25+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2526
const Text = require('../../../Libraries/Text/Text').default;
2627
const mapWithSeparator = require('../../../Libraries/Utilities/mapWithSeparator');
2728
const BoxInspector = require('./BoxInspector').default;

packages/react-native/src/private/inspector/Inspector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const PressabilityDebug = require('../../../Libraries/Pressability/PressabilityD
2626
const {
2727
findNodeHandle,
2828
} = require('../../../Libraries/ReactNative/RendererProxy');
29-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
29+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
3030
const Dimensions = require('../../../Libraries/Utilities/Dimensions').default;
3131
const Platform = require('../../../Libraries/Utilities/Platform');
3232
const getInspectorDataForViewAtPoint =

packages/react-native/src/private/inspector/InspectorOverlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {InspectedElement} from './Inspector';
1616
import React from 'react';
1717

1818
const View = require('../../../Libraries/Components/View/View').default;
19-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
19+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2020
const ElementBox = require('./ElementBox').default;
2121

2222
type Props = $ReadOnly<{

packages/react-native/src/private/inspector/InspectorPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const ScrollView =
2020
const TouchableHighlight =
2121
require('../../../Libraries/Components/Touchable/TouchableHighlight').default;
2222
const View = require('../../../Libraries/Components/View/View').default;
23-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
23+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2424
const Text = require('../../../Libraries/Text/Text').default;
2525
const ElementProperties = require('./ElementProperties').default;
2626
const NetworkOverlay = require('./NetworkOverlay').default;

packages/react-native/src/private/inspector/NetworkOverlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TouchableHighlight =
2020
require('../../../Libraries/Components/Touchable/TouchableHighlight').default;
2121
const View = require('../../../Libraries/Components/View/View').default;
2222
const FlatList = require('../../../Libraries/Lists/FlatList').default;
23-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
23+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2424
const Text = require('../../../Libraries/Text/Text').default;
2525
const WebSocketInterceptor =
2626
require('../../../Libraries/WebSocket/WebSocketInterceptor').default;

packages/react-native/src/private/inspector/PerformanceOverlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import React from 'react';
1414

1515
const View = require('../../../Libraries/Components/View/View').default;
16-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
16+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
1717
const Text = require('../../../Libraries/Text/Text').default;
1818
const PerformanceLogger = require('../../../Libraries/Utilities/GlobalPerformanceLogger');
1919

packages/react-native/src/private/inspector/StyleInspector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {____FlattenStyleProp_Internal} from '../../../Libraries/StyleSheet/
1616
import React from 'react';
1717

1818
const View = require('../../../Libraries/Components/View/View').default;
19-
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet');
19+
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
2020
const Text = require('../../../Libraries/Text/Text').default;
2121

2222
type Props = $ReadOnly<{

0 commit comments

Comments
 (0)