chore(deps): upgraded yoga to v2 and removed bundled package (diegomura#2473)

mskec · web-flow · commit 898a93e46657 · 2024-01-14T22:11:28.000+01:00
diff --git a/package.json b/package.json
@@ -26,10 +26,10 @@
     "@react-pdf/stylesheet": "^4.1.8",
     "@react-pdf/textkit": "^4.2.0",
     "@react-pdf/types": "^2.3.4",
-    "@react-pdf/yoga": "^4.1.2",
     "cross-fetch": "^3.1.5",
     "emoji-regex": "^10.2.1",
-    "queue": "^6.0.1"
+    "queue": "^6.0.1",
+    "yoga-layout": "^2.0.1"
   },
   "devDependencies": {
     "jest-fetch-mock": "^2.1.1"
diff --git a/src/image/measureImage.js b/src/image/measureImage.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import getRatio from './getRatio';
 import getMargin from '../node/getMargin';
diff --git a/src/node/getBorderWidth.js b/src/node/getBorderWidth.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const getComputedBorder = (yogaNode, edge) =>
   yogaNode ? yogaNode.getComputedBorder(edge) : 0;
diff --git a/src/node/getMargin.js b/src/node/getMargin.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const getComputedMargin = (node, edge) => {
   const { yogaNode } = node;
diff --git a/src/node/getPadding.js b/src/node/getPadding.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const getComputedPadding = (node, edge) => {
   const { yogaNode } = node;
diff --git a/src/node/setAlign.js b/src/node/setAlign.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import { upperFirst } from '@react-pdf/fns';
 
 const ALIGN = {
diff --git a/src/node/setBorderWidth.js b/src/node/setBorderWidth.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setYogaValue from './setYogaValue';
 
diff --git a/src/node/setDisplay.js b/src/node/setDisplay.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 /**
  * Set display attribute to node's Yoga instance
diff --git a/src/node/setFlexDirection.js b/src/node/setFlexDirection.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const FLEX_DIRECTIONS = {
   row: Yoga.FLEX_DIRECTION_ROW,
diff --git a/src/node/setFlexWrap.js b/src/node/setFlexWrap.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const FLEX_WRAP = {
   wrap: Yoga.WRAP_WRAP,
diff --git a/src/node/setGap.js b/src/node/setGap.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import { isNil, matchPercent } from '@react-pdf/fns';
 
 const checkPercents = (attr, value) => {
diff --git a/src/node/setJustifyContent.js b/src/node/setJustifyContent.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import { isNil } from '@react-pdf/fns';
 
 const JUSTIFY_CONTENT = {
diff --git a/src/node/setMargin.js b/src/node/setMargin.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setYogaValue from './setYogaValue';
 
diff --git a/src/node/setOverflow.js b/src/node/setOverflow.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import { isNil } from '@react-pdf/fns';
 
 const OVERFLOW = {
diff --git a/src/node/setPadding.js b/src/node/setPadding.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setYogaValue from './setYogaValue';
 
diff --git a/src/node/setPosition.js b/src/node/setPosition.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setYogaValue from './setYogaValue';
 
diff --git a/src/node/setPositionType.js b/src/node/setPositionType.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import { isNil } from '@react-pdf/fns';
 
 /**
diff --git a/src/steps/resolveDimensions.js b/src/steps/resolveDimensions.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 import * as P from '@react-pdf/primitives';
 import { isNil, compose } from '@react-pdf/fns';
 
diff --git a/src/svg/measureSvg.js b/src/svg/measureSvg.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 const getAspectRatio = viewbox => {
   if (!viewbox) return null;
diff --git a/src/text/measureText.js b/src/text/measureText.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import layoutText from './layoutText';
 import linesWidth from './linesWidth';
diff --git a/tests/node/getBorderWidth.test.js b/tests/node/getBorderWidth.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import getBorderWidth from '../../src/node/getBorderWidth';
 
diff --git a/tests/node/getMargin.test.js b/tests/node/getMargin.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import getMargin from '../../src/node/getMargin';
 
diff --git a/tests/node/getPadding.test.js b/tests/node/getPadding.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import getPadding from '../../src/node/getPadding';
 
diff --git a/tests/node/setAlignContent.test.js b/tests/node/setAlignContent.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setAlignContent from '../../src/node/setAlignContent';
 
diff --git a/tests/node/setAlignItems.test.js b/tests/node/setAlignItems.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setAlignItems from '../../src/node/setAlignItems';
 
diff --git a/tests/node/setAlignSelf.test.js b/tests/node/setAlignSelf.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setAlignSelf from '../../src/node/setAlignSelf';
 
diff --git a/tests/node/setBorderWidth.test.js b/tests/node/setBorderWidth.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setBorder, {
   setBorderTop,
diff --git a/tests/node/setDisplay.test.js b/tests/node/setDisplay.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setDisplay from '../../src/node/setDisplay';
 
diff --git a/tests/node/setFlexDirection.test.js b/tests/node/setFlexDirection.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setFlexDirection from '../../src/node/setFlexDirection';
 
diff --git a/tests/node/setFlexWrap.test.js b/tests/node/setFlexWrap.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setFlexWrap from '../../src/node/setFlexWrap';
 
diff --git a/tests/node/setJustifyContent.test.js b/tests/node/setJustifyContent.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setJustifyContent from '../../src/node/setJustifyContent';
 
diff --git a/tests/node/setMargin.test.js b/tests/node/setMargin.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setMargin, {
   setMarginTop,
diff --git a/tests/node/setOverflow.test.js b/tests/node/setOverflow.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setOverflow from '../../src/node/setOverflow';
 
diff --git a/tests/node/setPadding.test.js b/tests/node/setPadding.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setPadding, {
   setPaddingTop,
diff --git a/tests/node/setPosition.test.js b/tests/node/setPosition.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setPosition, {
   setPositionTop,
diff --git a/tests/node/setPositionType.test.js b/tests/node/setPositionType.test.js
@@ -1,4 +1,4 @@
-import Yoga from '@react-pdf/yoga';
+import Yoga from 'yoga-layout/sync';
 
 import setPositionType from '../../src/node/setPositionType';
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Yoga from '@react-pdf/yoga';`
	`1`	`+import Yoga from 'yoga-layout/sync';`
`2`	`2`
`3`	`3`	`import getRatio from './getRatio';`
`4`	`4`	`import getMargin from '../node/getMargin';`