diff --git a/Libraries/Inspector/ElementBox.js b/Libraries/Inspector/ElementBox.js index 4d271fe7155..96f5cf76454 100644 --- a/Libraries/Inspector/ElementBox.js +++ b/Libraries/Inspector/ElementBox.js @@ -10,10 +10,11 @@ 'use strict'; +import Dimensions from '../Utilities/Dimensions'; + const View = require('../Components/View/View'); const flattenStyle = require('../StyleSheet/flattenStyle'); const StyleSheet = require('../StyleSheet/StyleSheet'); -const Dimensions = require('../Utilities/Dimensions'); const BorderBox = require('./BorderBox'); const resolveBoxStyle = require('./resolveBoxStyle'); const React = require('react'); diff --git a/Libraries/Inspector/Inspector.js b/Libraries/Inspector/Inspector.js index dcde8ec513b..c09ef3723b5 100644 --- a/Libraries/Inspector/Inspector.js +++ b/Libraries/Inspector/Inspector.js @@ -13,12 +13,13 @@ import type {TouchedViewDataAtPoint} from '../Renderer/shims/ReactNativeTypes'; import type {HostRef} from './getInspectorDataForViewAtPoint'; +import Dimensions from '../Utilities/Dimensions'; + const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes'); const View = require('../Components/View/View'); const PressabilityDebug = require('../Pressability/PressabilityDebug'); const {findNodeHandle} = require('../ReactNative/RendererProxy'); const StyleSheet = require('../StyleSheet/StyleSheet'); -const Dimensions = require('../Utilities/Dimensions'); const Platform = require('../Utilities/Platform'); const getInspectorDataForViewAtPoint = require('./getInspectorDataForViewAtPoint'); const InspectorOverlay = require('./InspectorOverlay'); diff --git a/Libraries/Inspector/InspectorOverlay.js b/Libraries/Inspector/InspectorOverlay.js index f6bb0b7b098..6eb639d22d2 100644 --- a/Libraries/Inspector/InspectorOverlay.js +++ b/Libraries/Inspector/InspectorOverlay.js @@ -13,9 +13,10 @@ import type {ViewStyleProp} from '../StyleSheet/StyleSheet'; import type {PressEvent} from '../Types/CoreEventTypes'; +import Dimensions from '../Utilities/Dimensions'; + const View = require('../Components/View/View'); const StyleSheet = require('../StyleSheet/StyleSheet'); -const Dimensions = require('../Utilities/Dimensions'); const ElementBox = require('./ElementBox'); const React = require('react'); diff --git a/Libraries/Utilities/Dimensions.js b/Libraries/Utilities/Dimensions.js index e7fe880d0db..37ab1e0f929 100644 --- a/Libraries/Utilities/Dimensions.js +++ b/Libraries/Utilities/Dimensions.js @@ -127,4 +127,4 @@ if (!initialDims) { Dimensions.set(initialDims); -module.exports = Dimensions; +export default Dimensions; diff --git a/Libraries/Utilities/PixelRatio.js b/Libraries/Utilities/PixelRatio.js index e824de41487..b0dfa328189 100644 --- a/Libraries/Utilities/PixelRatio.js +++ b/Libraries/Utilities/PixelRatio.js @@ -10,7 +10,7 @@ 'use strict'; -const Dimensions = require('./Dimensions'); +import Dimensions from './Dimensions'; /** * PixelRatio class gives access to the device pixel density. diff --git a/Libraries/Utilities/__tests__/Dimensions-test.js b/Libraries/Utilities/__tests__/Dimensions-test.js index c9acae1e26d..ce71cacbdd1 100644 --- a/Libraries/Utilities/__tests__/Dimensions-test.js +++ b/Libraries/Utilities/__tests__/Dimensions-test.js @@ -11,7 +11,7 @@ 'use strict'; describe('Dimensions', () => { - const Dimensions = require('../Dimensions'); + const Dimensions = require('../Dimensions').default; const Platform = require('../Platform'); it('should set window dimensions', () => { diff --git a/Libraries/Utilities/__tests__/PixelRatio-test.js b/Libraries/Utilities/__tests__/PixelRatio-test.js index 5b8f3ebc780..20eea7114c7 100644 --- a/Libraries/Utilities/__tests__/PixelRatio-test.js +++ b/Libraries/Utilities/__tests__/PixelRatio-test.js @@ -11,8 +11,8 @@ 'use strict'; describe('PixelRatio', () => { - const Dimensions = require('../Dimensions'); const PixelRatio = require('../PixelRatio'); + const Dimensions = require('../Dimensions').default; beforeEach(() => { Dimensions.set({ diff --git a/index.js b/index.js index c3cd7bf981d..9719d4cb53d 100644 --- a/index.js +++ b/index.js @@ -258,7 +258,7 @@ module.exports = { return require('./Libraries/Utilities/DevSettings'); }, get Dimensions(): Dimensions { - return require('./Libraries/Utilities/Dimensions'); + return require('./Libraries/Utilities/Dimensions').default; }, get Easing(): Easing { return require('./Libraries/Animated/Easing').default;