diff --git a/packages/layout/src/image/measureImage.js b/packages/layout/src/image/measureImage.js index 9806f5e30..f1e0e3267 100644 --- a/packages/layout/src/image/measureImage.js +++ b/packages/layout/src/image/measureImage.js @@ -1,14 +1,10 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import getRatio from './getRatio'; import getMargin from '../node/getMargin'; import getPadding from '../node/getPadding'; import isHeightAuto from '../page/isHeightAuto'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const SAFETY_HEIGHT = 10; /** diff --git a/packages/layout/src/node/getBorderWidth.js b/packages/layout/src/node/getBorderWidth.js index bc3a579ae..0801389f4 100644 --- a/packages/layout/src/node/getBorderWidth.js +++ b/packages/layout/src/node/getBorderWidth.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const getComputedBorder = (yogaNode, edge) => yogaNode ? yogaNode.getComputedBorder(edge) : 0; diff --git a/packages/layout/src/node/getMargin.js b/packages/layout/src/node/getMargin.js index 6b7054497..bb45ff8fc 100644 --- a/packages/layout/src/node/getMargin.js +++ b/packages/layout/src/node/getMargin.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const getComputedMargin = (node, edge) => { const { yogaNode } = node; diff --git a/packages/layout/src/node/getPadding.js b/packages/layout/src/node/getPadding.js index cfa990302..70e5afe52 100644 --- a/packages/layout/src/node/getPadding.js +++ b/packages/layout/src/node/getPadding.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const getComputedPadding = (node, edge) => { const { yogaNode } = node; diff --git a/packages/layout/src/node/setAlign.js b/packages/layout/src/node/setAlign.js index 9b947f57f..7e3edf527 100644 --- a/packages/layout/src/node/setAlign.js +++ b/packages/layout/src/node/setAlign.js @@ -1,10 +1,5 @@ -import yogaModule from 'yoga-layout/sync'; - import { upperFirst } from '@react-pdf/fns'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const ALIGN = { 'flex-start': Yoga.ALIGN_FLEX_START, diff --git a/packages/layout/src/node/setBorderWidth.js b/packages/layout/src/node/setBorderWidth.js index 36fbf93f0..58b3bcf66 100644 --- a/packages/layout/src/node/setBorderWidth.js +++ b/packages/layout/src/node/setBorderWidth.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setYogaValue from './setYogaValue'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - /** * Set border top attribute to node's Yoga instance * diff --git a/packages/layout/src/node/setDisplay.js b/packages/layout/src/node/setDisplay.js index dfe35c566..bf06ab00f 100644 --- a/packages/layout/src/node/setDisplay.js +++ b/packages/layout/src/node/setDisplay.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; /** * Set display attribute to node's Yoga instance diff --git a/packages/layout/src/node/setFlexDirection.js b/packages/layout/src/node/setFlexDirection.js index 3ad131c69..85cc2a77a 100644 --- a/packages/layout/src/node/setFlexDirection.js +++ b/packages/layout/src/node/setFlexDirection.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const FLEX_DIRECTIONS = { row: Yoga.FLEX_DIRECTION_ROW, diff --git a/packages/layout/src/node/setFlexWrap.js b/packages/layout/src/node/setFlexWrap.js index deaf37b81..f7ad6e1b0 100644 --- a/packages/layout/src/node/setFlexWrap.js +++ b/packages/layout/src/node/setFlexWrap.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const FLEX_WRAP = { wrap: Yoga.WRAP_WRAP, diff --git a/packages/layout/src/node/setGap.js b/packages/layout/src/node/setGap.js index db85cf380..f327dd464 100644 --- a/packages/layout/src/node/setGap.js +++ b/packages/layout/src/node/setGap.js @@ -1,10 +1,5 @@ -import yogaModule from 'yoga-layout/sync'; - import { isNil, matchPercent } from '@react-pdf/fns'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const checkPercents = (attr, value) => { const percent = matchPercent(value); diff --git a/packages/layout/src/node/setJustifyContent.js b/packages/layout/src/node/setJustifyContent.js index 8fc60f735..509f80fd9 100644 --- a/packages/layout/src/node/setJustifyContent.js +++ b/packages/layout/src/node/setJustifyContent.js @@ -1,10 +1,5 @@ -import yogaModule from 'yoga-layout/sync'; - import { isNil } from '@react-pdf/fns'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const JUSTIFY_CONTENT = { center: Yoga.JUSTIFY_CENTER, diff --git a/packages/layout/src/node/setMargin.js b/packages/layout/src/node/setMargin.js index f7d18961d..4c81a42ea 100644 --- a/packages/layout/src/node/setMargin.js +++ b/packages/layout/src/node/setMargin.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setYogaValue from './setYogaValue'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - /** * Set margin top attribute to node's Yoga instance * diff --git a/packages/layout/src/node/setOverflow.js b/packages/layout/src/node/setOverflow.js index 343ce4298..ab86a1b93 100644 --- a/packages/layout/src/node/setOverflow.js +++ b/packages/layout/src/node/setOverflow.js @@ -1,10 +1,5 @@ -import yogaModule from 'yoga-layout/sync'; - import { isNil } from '@react-pdf/fns'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const OVERFLOW = { hidden: Yoga.OVERFLOW_HIDDEN, diff --git a/packages/layout/src/node/setPadding.js b/packages/layout/src/node/setPadding.js index 6488895a7..b403803b7 100644 --- a/packages/layout/src/node/setPadding.js +++ b/packages/layout/src/node/setPadding.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setYogaValue from './setYogaValue'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - /** * Set padding top attribute to node's Yoga instance * diff --git a/packages/layout/src/node/setPosition.js b/packages/layout/src/node/setPosition.js index e13e86be8..790330300 100644 --- a/packages/layout/src/node/setPosition.js +++ b/packages/layout/src/node/setPosition.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setYogaValue from './setYogaValue'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - /** * Set position top attribute to node's Yoga instance * diff --git a/packages/layout/src/node/setPositionType.js b/packages/layout/src/node/setPositionType.js index 7942a6116..69761ea98 100644 --- a/packages/layout/src/node/setPositionType.js +++ b/packages/layout/src/node/setPositionType.js @@ -1,10 +1,5 @@ -import yogaModule from 'yoga-layout/sync'; - import { isNil } from '@react-pdf/fns'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; /** * Set position type attribute to node's Yoga instance diff --git a/packages/layout/src/steps/resolveDimensions.js b/packages/layout/src/steps/resolveDimensions.js index 22848ac4e..dc3e9d099 100644 --- a/packages/layout/src/steps/resolveDimensions.js +++ b/packages/layout/src/steps/resolveDimensions.js @@ -1,6 +1,6 @@ -import yogaModule from 'yoga-layout/sync'; import * as P from '@react-pdf/primitives'; import { isNil, compose } from '@react-pdf/fns'; +import Yoga from '../../yoga'; import getMargin from '../node/getMargin'; import getPadding from '../node/getPadding'; @@ -58,10 +58,6 @@ import measureText from '../text/measureText'; import measureImage from '../image/measureImage'; import measureCanvas from '../canvas/measureCanvas'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const YOGA_CONFIG = Yoga.Config.create(); YOGA_CONFIG.setPointScaleFactor(0); diff --git a/packages/layout/src/svg/measureSvg.js b/packages/layout/src/svg/measureSvg.js index 38210b680..74b5525bd 100644 --- a/packages/layout/src/svg/measureSvg.js +++ b/packages/layout/src/svg/measureSvg.js @@ -1,8 +1,4 @@ -import yogaModule from 'yoga-layout/sync'; - -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; +import Yoga from '../../yoga'; const getAspectRatio = viewbox => { if (!viewbox) return null; diff --git a/packages/layout/src/text/measureText.js b/packages/layout/src/text/measureText.js index 628fdfa79..8b9e5f658 100644 --- a/packages/layout/src/text/measureText.js +++ b/packages/layout/src/text/measureText.js @@ -1,15 +1,11 @@ /* eslint-disable no-param-reassign */ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import layoutText from './layoutText'; import linesWidth from './linesWidth'; import linesHeight from './linesHeight'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const ALIGNMENT_FACTORS = { center: 0.5, right: 1 }; /** diff --git a/packages/layout/tests/node/getBorderWidth.test.js b/packages/layout/tests/node/getBorderWidth.test.js index 230c86563..fefb26d2c 100644 --- a/packages/layout/tests/node/getBorderWidth.test.js +++ b/packages/layout/tests/node/getBorderWidth.test.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import getBorderWidth from '../../src/node/getBorderWidth'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const getComputedBorder = value => { if (value === Yoga.EDGE_TOP) return 1; if (value === Yoga.EDGE_RIGHT) return 2; diff --git a/packages/layout/tests/node/getMargin.test.js b/packages/layout/tests/node/getMargin.test.js index a88af0d48..b098790cd 100644 --- a/packages/layout/tests/node/getMargin.test.js +++ b/packages/layout/tests/node/getMargin.test.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import getMargin from '../../src/node/getMargin'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const getComputedMargin = value => { if (value === Yoga.EDGE_TOP) return 1; if (value === Yoga.EDGE_RIGHT) return 2; diff --git a/packages/layout/tests/node/getPadding.test.js b/packages/layout/tests/node/getPadding.test.js index 15baf7666..d9719a20b 100644 --- a/packages/layout/tests/node/getPadding.test.js +++ b/packages/layout/tests/node/getPadding.test.js @@ -1,11 +1,7 @@ -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import getPadding from '../../src/node/getPadding'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - const getComputedPadding = value => { if (value === Yoga.EDGE_TOP) return 1; if (value === Yoga.EDGE_RIGHT) return 2; diff --git a/packages/layout/tests/node/setAlignContent.test.js b/packages/layout/tests/node/setAlignContent.test.js index e33640666..80f757243 100644 --- a/packages/layout/tests/node/setAlignContent.test.js +++ b/packages/layout/tests/node/setAlignContent.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setAlignContent from '../../src/node/setAlignContent'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setAlignContent', () => { const mock = jest.fn(); const node = { yogaNode: { setAlignContent: mock } }; diff --git a/packages/layout/tests/node/setAlignItems.test.js b/packages/layout/tests/node/setAlignItems.test.js index 4be0ae178..5ab866e44 100644 --- a/packages/layout/tests/node/setAlignItems.test.js +++ b/packages/layout/tests/node/setAlignItems.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setAlignItems from '../../src/node/setAlignItems'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setAlignItems', () => { const mock = jest.fn(); const node = { yogaNode: { setAlignItems: mock } }; diff --git a/packages/layout/tests/node/setAlignSelf.test.js b/packages/layout/tests/node/setAlignSelf.test.js index e11518433..f70083881 100644 --- a/packages/layout/tests/node/setAlignSelf.test.js +++ b/packages/layout/tests/node/setAlignSelf.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setAlignSelf from '../../src/node/setAlignSelf'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setAlignSelf', () => { const mock = jest.fn(); const node = { yogaNode: { setAlignSelf: mock } }; diff --git a/packages/layout/tests/node/setBorderWidth.test.js b/packages/layout/tests/node/setBorderWidth.test.js index e58bd7be6..1e2d9de23 100644 --- a/packages/layout/tests/node/setBorderWidth.test.js +++ b/packages/layout/tests/node/setBorderWidth.test.js @@ -1,5 +1,5 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setBorder, { setBorderTop, @@ -8,10 +8,6 @@ import setBorder, { setBorderLeft, } from '../../src/node/setBorderWidth'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setBorderWidth', () => { const mock = jest.fn(); const node = { yogaNode: { setBorder: mock } }; diff --git a/packages/layout/tests/node/setDisplay.test.js b/packages/layout/tests/node/setDisplay.test.js index bc9df58f7..bd733613d 100644 --- a/packages/layout/tests/node/setDisplay.test.js +++ b/packages/layout/tests/node/setDisplay.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setDisplay from '../../src/node/setDisplay'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setDisplay', () => { const mock = jest.fn(); const node = { yogaNode: { setDisplay: mock } }; diff --git a/packages/layout/tests/node/setFlexDirection.test.js b/packages/layout/tests/node/setFlexDirection.test.js index 22eed8f26..38ce13274 100644 --- a/packages/layout/tests/node/setFlexDirection.test.js +++ b/packages/layout/tests/node/setFlexDirection.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setFlexDirection from '../../src/node/setFlexDirection'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setFlexDirection', () => { const mock = jest.fn(); const node = { yogaNode: { setFlexDirection: mock } }; diff --git a/packages/layout/tests/node/setFlexWrap.test.js b/packages/layout/tests/node/setFlexWrap.test.js index 57b536179..b79782f20 100644 --- a/packages/layout/tests/node/setFlexWrap.test.js +++ b/packages/layout/tests/node/setFlexWrap.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setFlexWrap from '../../src/node/setFlexWrap'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setFlexWrap', () => { const mock = jest.fn(); const node = { yogaNode: { setFlexWrap: mock } }; diff --git a/packages/layout/tests/node/setJustifyContent.test.js b/packages/layout/tests/node/setJustifyContent.test.js index 83cd7f5b1..1d8cc3643 100644 --- a/packages/layout/tests/node/setJustifyContent.test.js +++ b/packages/layout/tests/node/setJustifyContent.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setJustifyContent from '../../src/node/setJustifyContent'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setJustifyContent', () => { const mock = jest.fn(); const node = { yogaNode: { setJustifyContent: mock } }; diff --git a/packages/layout/tests/node/setMargin.test.js b/packages/layout/tests/node/setMargin.test.js index 0254da9f7..fca16849e 100644 --- a/packages/layout/tests/node/setMargin.test.js +++ b/packages/layout/tests/node/setMargin.test.js @@ -1,5 +1,5 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setMargin, { setMarginTop, @@ -8,10 +8,6 @@ import setMargin, { setMarginLeft, } from '../../src/node/setMargin'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setMargin', () => { const mock = jest.fn(); const mockAuto = jest.fn(); diff --git a/packages/layout/tests/node/setOverflow.test.js b/packages/layout/tests/node/setOverflow.test.js index 09a583c40..871c6b5ea 100644 --- a/packages/layout/tests/node/setOverflow.test.js +++ b/packages/layout/tests/node/setOverflow.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setOverflow from '../../src/node/setOverflow'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setOverflow', () => { const mock = jest.fn(); const node = { yogaNode: { setOverflow: mock } }; diff --git a/packages/layout/tests/node/setPadding.test.js b/packages/layout/tests/node/setPadding.test.js index c3120d846..91e3b896e 100644 --- a/packages/layout/tests/node/setPadding.test.js +++ b/packages/layout/tests/node/setPadding.test.js @@ -1,5 +1,5 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setPadding, { setPaddingTop, @@ -8,10 +8,6 @@ import setPadding, { setPaddingLeft, } from '../../src/node/setPadding'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setPadding', () => { const mock = jest.fn(); const mockPercent = jest.fn(); diff --git a/packages/layout/tests/node/setPosition.test.js b/packages/layout/tests/node/setPosition.test.js index 17a23b861..3665b0338 100644 --- a/packages/layout/tests/node/setPosition.test.js +++ b/packages/layout/tests/node/setPosition.test.js @@ -1,5 +1,5 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setPosition, { setPositionTop, @@ -8,10 +8,6 @@ import setPosition, { setPositionLeft, } from '../../src/node/setPosition'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setPosition', () => { const mock = jest.fn(); const mockPercent = jest.fn(); diff --git a/packages/layout/tests/node/setPositionType.test.js b/packages/layout/tests/node/setPositionType.test.js index fb55cea34..caab729f1 100644 --- a/packages/layout/tests/node/setPositionType.test.js +++ b/packages/layout/tests/node/setPositionType.test.js @@ -1,12 +1,8 @@ import { jest } from '@jest/globals'; -import yogaModule from 'yoga-layout/sync'; +import Yoga from '../../yoga'; import setPositionType from '../../src/node/setPositionType'; -// yoga-layout sets default export using non-standard __esModule property, so we need to -// make an additional check in case it's used in a bundler that does not support it. -const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; - describe('node setPositionType', () => { const mock = jest.fn(); const node = { yogaNode: { setPositionType: mock } }; diff --git a/packages/layout/yoga.js b/packages/layout/yoga.js new file mode 100644 index 000000000..04ec637a4 --- /dev/null +++ b/packages/layout/yoga.js @@ -0,0 +1,7 @@ +import yogaModule from 'yoga-layout/sync'; + +// yoga-layout sets default export using non-standard __esModule property, so we need to +// make an additional check in case it's used in a bundler that does not support it. +const Yoga = 'default' in yogaModule ? yogaModule.default : yogaModule; + +export default Yoga;