diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap index aa5b6089384..d74bb73cc85 100644 --- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap @@ -31,7 +31,7 @@ export const __INTERNAL_VIEW_CONFIG = { radii: true, colors: { - process: require('react-native/Libraries/StyleSheet/processColorArray').default, + process: require('react-native/Libraries/StyleSheet/processColorArray'), }, srcs: true, diff --git a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js index c7e0227428c..f09b38c7885 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js +++ b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js @@ -91,7 +91,7 @@ function getReactDiffProcessValue(typeAnnotation: PropTypeAnnotation) { switch (typeAnnotation.elementType.name) { case 'ColorPrimitive': return j.template - .expression`{ process: require('react-native/Libraries/StyleSheet/processColorArray').default }`; + .expression`{ process: require('react-native/Libraries/StyleSheet/processColorArray') }`; case 'ImageSourcePrimitive': case 'PointPrimitive': case 'EdgeInsetsPrimitive': diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap index eecbbe3eb73..0bb1612992f 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap @@ -31,7 +31,7 @@ export const __INTERNAL_VIEW_CONFIG = { radii: true, colors: { - process: require('react-native/Libraries/StyleSheet/processColorArray').default, + process: require('react-native/Libraries/StyleSheet/processColorArray'), }, srcs: true, diff --git a/packages/react-native/Libraries/ReactNative/getNativeComponentAttributes.js b/packages/react-native/Libraries/ReactNative/getNativeComponentAttributes.js index aae2d4d6796..2af83f4c4e5 100644 --- a/packages/react-native/Libraries/ReactNative/getNativeComponentAttributes.js +++ b/packages/react-native/Libraries/ReactNative/getNativeComponentAttributes.js @@ -17,7 +17,7 @@ const resolveAssetSource = require('../Image/resolveAssetSource'); const processBackgroundImage = require('../StyleSheet/processBackgroundImage').default; const processColor = require('../StyleSheet/processColor').default; -const processColorArray = require('../StyleSheet/processColorArray').default; +const processColorArray = require('../StyleSheet/processColorArray'); const processFilter = require('../StyleSheet/processFilter').default; const insetsDiffer = require('../Utilities/differ/insetsDiffer'); const matricesDiffer = require('../Utilities/differ/matricesDiffer'); diff --git a/packages/react-native/Libraries/StyleSheet/PlatformColorValueTypes.ios.js b/packages/react-native/Libraries/StyleSheet/PlatformColorValueTypes.ios.js index ba38455fd96..418df65ac95 100644 --- a/packages/react-native/Libraries/StyleSheet/PlatformColorValueTypes.ios.js +++ b/packages/react-native/Libraries/StyleSheet/PlatformColorValueTypes.ios.js @@ -56,7 +56,7 @@ const _normalizeColorObject = ( // an ios semantic color return color; } else if ('dynamic' in color && color.dynamic !== undefined) { - const normalizeColor = require('./normalizeColor').default; + const normalizeColor = require('./normalizeColor'); // a dynamic, appearance aware color const dynamic = color.dynamic; diff --git a/packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js b/packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js index 037eb5803d4..c8d564ac1c5 100644 --- a/packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js +++ b/packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js @@ -12,8 +12,7 @@ import type {ImageStyleProp, TextStyleProp} from '../StyleSheet'; -import * as StyleSheet from '../StyleSheet'; - +const StyleSheet = require('../StyleSheet'); const imageStyle = {tintColor: 'rgb(0, 0, 0)'}; const textStyle = {color: 'rgb(0, 0, 0)'}; diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/normalizeColor-test.js index 81cd20ad12d..a8c7e586224 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/normalizeColor-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/normalizeColor-test.js @@ -11,12 +11,12 @@ 'use strict'; const {OS} = require('../../Utilities/Platform'); -const normalizeColor = require('../normalizeColor').default; +const normalizeColor = require('../normalizeColor'); it('forwards calls to @react-native/normalize-colors', () => { jest.resetModules().mock('@react-native/normalize-colors', () => jest.fn()); - expect(require('../normalizeColor').default('#abc')).not.toBe(null); + expect(require('../normalizeColor')('#abc')).not.toBe(null); expect(require('@react-native/normalize-colors')).toBeCalled(); }); diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/processAspectRatio-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/processAspectRatio-test.js index 95a089e8e37..1097d956203 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/processAspectRatio-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/processAspectRatio-test.js @@ -10,7 +10,7 @@ 'use strict'; -import processAspectRatio from '../processAspectRatio'; +const processAspectRatio = require('../processAspectRatio'); describe('processAspectRatio', () => { it('should accept numbers', () => { diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/processColorArray-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/processColorArray-test.js index 4f4b5685119..0385dd7db75 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/processColorArray-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/processColorArray-test.js @@ -17,7 +17,7 @@ const PlatformColorIOS = require('../PlatformColorValueTypes.ios').PlatformColor; const DynamicColorIOS = require('../PlatformColorValueTypesIOS.ios').DynamicColorIOS; -const processColorArray = require('../processColorArray').default; +const processColorArray = require('../processColorArray'); const platformSpecific = OS === 'android' diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/processFontVariant-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/processFontVariant-test.js index 33b71522e54..1d9185178be 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/processFontVariant-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/processFontVariant-test.js @@ -10,7 +10,7 @@ 'use strict'; -const processFontVariant = require('../processFontVariant').default; +const processFontVariant = require('../processFontVariant'); describe('processFontVariant', () => { it('should accept arrays', () => { diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/processTransform-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/processTransform-test.js index a794c9a978a..fe7c5d28515 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/processTransform-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/processTransform-test.js @@ -10,7 +10,7 @@ 'use strict'; -import processTransform from '../processTransform'; +const processTransform = require('../processTransform'); describe('processTransform', () => { describe('validation', () => { diff --git a/packages/react-native/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js b/packages/react-native/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js index 456b5cb3996..1f257514acf 100644 --- a/packages/react-native/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js +++ b/packages/react-native/Libraries/StyleSheet/__tests__/setNormalizedColorAlpha-test.js @@ -10,8 +10,8 @@ 'use strict'; -const normalizeColor = require('../normalizeColor').default; -const setNormalizedColorAlpha = require('../setNormalizedColorAlpha').default; +const normalizeColor = require('../normalizeColor'); +const setNormalizedColorAlpha = require('../setNormalizedColorAlpha'); describe('setNormalizedColorAlpha', function () { it('should adjust the alpha of the color passed in', function () { diff --git a/packages/react-native/Libraries/StyleSheet/normalizeColor.js b/packages/react-native/Libraries/StyleSheet/normalizeColor.js index 0a565e83e01..e181ec28928 100755 --- a/packages/react-native/Libraries/StyleSheet/normalizeColor.js +++ b/packages/react-native/Libraries/StyleSheet/normalizeColor.js @@ -31,4 +31,4 @@ function normalizeColor( } } -export default normalizeColor; +module.exports = normalizeColor; diff --git a/packages/react-native/Libraries/StyleSheet/processAspectRatio.js b/packages/react-native/Libraries/StyleSheet/processAspectRatio.js index 6f5dce47bf1..a47ee101bb5 100644 --- a/packages/react-native/Libraries/StyleSheet/processAspectRatio.js +++ b/packages/react-native/Libraries/StyleSheet/processAspectRatio.js @@ -60,4 +60,4 @@ function processAspectRatio(aspectRatio?: number | string): ?number { return Number(matches[0]); } -export default processAspectRatio; +module.exports = processAspectRatio; diff --git a/packages/react-native/Libraries/StyleSheet/processColor.js b/packages/react-native/Libraries/StyleSheet/processColor.js index d8d0e996d28..2bac21b59bf 100644 --- a/packages/react-native/Libraries/StyleSheet/processColor.js +++ b/packages/react-native/Libraries/StyleSheet/processColor.js @@ -13,7 +13,7 @@ import type {ColorValue, NativeColorValue} from './StyleSheet'; const Platform = require('../Utilities/Platform'); -const normalizeColor = require('./normalizeColor').default; +const normalizeColor = require('./normalizeColor'); export type ProcessedColorValue = number | NativeColorValue; diff --git a/packages/react-native/Libraries/StyleSheet/processColorArray.js b/packages/react-native/Libraries/StyleSheet/processColorArray.js index 7a0aade44b1..7b3d53517ef 100644 --- a/packages/react-native/Libraries/StyleSheet/processColorArray.js +++ b/packages/react-native/Libraries/StyleSheet/processColorArray.js @@ -32,4 +32,4 @@ function processColorElement(color: ColorValue): ProcessedColorValue { return value; } -export default processColorArray; +module.exports = processColorArray; diff --git a/packages/react-native/Libraries/StyleSheet/processFontVariant.js b/packages/react-native/Libraries/StyleSheet/processFontVariant.js index 3019af2be5a..32a72f879e6 100644 --- a/packages/react-native/Libraries/StyleSheet/processFontVariant.js +++ b/packages/react-native/Libraries/StyleSheet/processFontVariant.js @@ -27,4 +27,4 @@ function processFontVariant( return match; } -export default processFontVariant; +module.exports = processFontVariant; diff --git a/packages/react-native/Libraries/StyleSheet/processTransform.js b/packages/react-native/Libraries/StyleSheet/processTransform.js index 79cfdaeb33f..8338e4f06d2 100644 --- a/packages/react-native/Libraries/StyleSheet/processTransform.js +++ b/packages/react-native/Libraries/StyleSheet/processTransform.js @@ -266,4 +266,4 @@ function _validateTransform( } } -export default processTransform; +module.exports = processTransform; diff --git a/packages/react-native/Libraries/StyleSheet/setNormalizedColorAlpha.js b/packages/react-native/Libraries/StyleSheet/setNormalizedColorAlpha.js index 581cc33d748..7cfce2dc9fb 100644 --- a/packages/react-native/Libraries/StyleSheet/setNormalizedColorAlpha.js +++ b/packages/react-native/Libraries/StyleSheet/setNormalizedColorAlpha.js @@ -28,4 +28,4 @@ function setNormalizedColorAlpha(input: number, alpha: number): number { return ((input & 0xffffff00) | alpha) >>> 0; } -export default setNormalizedColorAlpha; +module.exports = setNormalizedColorAlpha; diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap index d34ea1c5845..5ff675086e6 100644 --- a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap +++ b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap @@ -8284,7 +8284,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/norma "declare function normalizeColor( color: ?(ColorValue | ProcessedColorValue) ): ?ProcessedColorValue; -declare export default typeof normalizeColor; +declare module.exports: normalizeColor; " `; @@ -8332,7 +8332,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/priva exports[`public API should not change unintentionally Libraries/StyleSheet/processAspectRatio.js 1`] = ` "declare function processAspectRatio(aspectRatio?: number | string): ?number; -declare export default typeof processAspectRatio; +declare module.exports: processAspectRatio; " `; @@ -8382,7 +8382,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce "declare function processColorArray( colors: ?$ReadOnlyArray ): ?$ReadOnlyArray; -declare export default typeof processColorArray; +declare module.exports: processColorArray; " `; @@ -8414,7 +8414,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce "declare function processFontVariant( fontVariant: ____FontVariantArray_Internal | string ): ?____FontVariantArray_Internal; -declare export default typeof processFontVariant; +declare module.exports: processFontVariant; " `; @@ -8422,7 +8422,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce "declare function processTransform( transform: Array | string ): Array | Array; -declare export default typeof processTransform; +declare module.exports: processTransform; " `; @@ -8435,7 +8435,7 @@ exports[`public API should not change unintentionally Libraries/StyleSheet/proce exports[`public API should not change unintentionally Libraries/StyleSheet/setNormalizedColorAlpha.js 1`] = ` "declare function setNormalizedColorAlpha(input: number, alpha: number): number; -declare export default typeof setNormalizedColorAlpha; +declare module.exports: setNormalizedColorAlpha; " `;