Skip to content

Commit e4d969a

Browse files
iwoplazafacebook-github-bot
authored andcommitted
Migrate StyleSheet/*.js to use export statements (#48609)
Summary: Pull Request resolved: #48609 # Motivation This is an attempt at modernizing the export syntax in some of the files in `Libraries/StyleSheet/`. It will allow these files to get properly ingested by modern Flow tooling. # This diff - Migrates the use of `module.exports` into `export default` for files located in `Libraries/StyleSheet/*.js`. Some files were omitted due to ballooning complexity, but will be addressed in other Diffs. - Updating internal *require*s to use ".default", no product code seems to be affected. - Migrating `require`s into `import`s where applicable, taking into account the performance implications (context: https://fb.workplace.com/groups/react.technologies.discussions/permalink/3638114866420225/) - Updates the current iteration of API snapshots (intended). - Updates `react-native-codegen`'s require of processColorArray, analogous to D42346452. Changelog: [General][Breaking] - Deep imports from some files in `StyleSheet/` can break when using the `require()` syntax, but can be easily fixed by appending `.default` Reviewed By: javache Differential Revision: D68017325 fbshipit-source-id: 3c5b94742f101db0b2914c91efab6003dba2b61a
1 parent d95909e commit e4d969a

20 files changed

+28
-27
lines changed

packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const __INTERNAL_VIEW_CONFIG = {
3131
radii: true,
3232
3333
colors: {
34-
process: require('react-native/Libraries/StyleSheet/processColorArray'),
34+
process: require('react-native/Libraries/StyleSheet/processColorArray').default,
3535
},
3636
3737
srcs: true,

packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function getReactDiffProcessValue(typeAnnotation: PropTypeAnnotation) {
9191
switch (typeAnnotation.elementType.name) {
9292
case 'ColorPrimitive':
9393
return j.template
94-
.expression`{ process: require('react-native/Libraries/StyleSheet/processColorArray') }`;
94+
.expression`{ process: require('react-native/Libraries/StyleSheet/processColorArray').default }`;
9595
case 'ImageSourcePrimitive':
9696
case 'PointPrimitive':
9797
case 'EdgeInsetsPrimitive':

packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const __INTERNAL_VIEW_CONFIG = {
3131
radii: true,
3232
3333
colors: {
34-
process: require('react-native/Libraries/StyleSheet/processColorArray'),
34+
process: require('react-native/Libraries/StyleSheet/processColorArray').default,
3535
},
3636
3737
srcs: true,

packages/react-native/Libraries/ReactNative/getNativeComponentAttributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const resolveAssetSource = require('../Image/resolveAssetSource');
1717
const processBackgroundImage =
1818
require('../StyleSheet/processBackgroundImage').default;
1919
const processColor = require('../StyleSheet/processColor').default;
20-
const processColorArray = require('../StyleSheet/processColorArray');
20+
const processColorArray = require('../StyleSheet/processColorArray').default;
2121
const processFilter = require('../StyleSheet/processFilter').default;
2222
const insetsDiffer = require('../Utilities/differ/insetsDiffer');
2323
const matricesDiffer = require('../Utilities/differ/matricesDiffer');

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/__flowtests__/StyleSheet-flowtest.js

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

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

15-
const StyleSheet = require('../StyleSheet');
15+
import * as StyleSheet from '../StyleSheet';
16+
1617
const imageStyle = {tintColor: 'rgb(0, 0, 0)'};
1718
const textStyle = {color: 'rgb(0, 0, 0)'};
1819

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+
import processAspectRatio from '../processAspectRatio';
1414

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const PlatformColorIOS =
1717
require('../PlatformColorValueTypes.ios').PlatformColor;
1818
const DynamicColorIOS =
1919
require('../PlatformColorValueTypesIOS.ios').DynamicColorIOS;
20-
const processColorArray = require('../processColorArray');
20+
const processColorArray = require('../processColorArray').default;
2121

2222
const platformSpecific =
2323
OS === 'android'

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', () => {

0 commit comments

Comments
 (0)