chore(deps): Upgraded yoga to v2 and removed bundled package

diegomura · Jan 5, 2024 · 119b808 · 119b808
1 parent 9f7a2df
commit 119b808
Show file tree

Hide file tree

Showing 77 changed files with 47 additions and 16,375 deletions.
diff --git a/.changeset/eighty-boats-bow.md b/.changeset/eighty-boats-bow.md
@@ -0,0 +1,5 @@
+---
+'@react-pdf/layout': minor
+---
+
+Upgraded yoga to v2 and dropped bundled yoga v1 package
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -39,5 +39,6 @@ module.exports = {
     'react/jsx-filename-extension': 0,
     'react/jsx-props-no-spreading': 1,
     'react/destructuring-assignment': 0,
+    'import/no-unresolved': ['error', { ignore: ['^yoga-layout'] }],
   },
 };
diff --git a/jest.config.js b/jest.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   projects: [
     '<rootDir>packages/fns',
-    '<rootDir>packages/yoga',
     '<rootDir>packages/font',
     '<rootDir>packages/image',
     '<rootDir>packages/render',

diff --git a/packages/layout/package.json b/packages/layout/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/packages/layout/src/image/measureImage.js b/packages/layout/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/packages/layout/src/node/getBorderWidth.js b/packages/layout/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/packages/layout/src/node/getMargin.js b/packages/layout/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/packages/layout/src/node/getPadding.js b/packages/layout/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/packages/layout/src/node/setAlign.js b/packages/layout/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/packages/layout/src/node/setBorderWidth.js b/packages/layout/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/packages/layout/src/node/setDisplay.js b/packages/layout/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/packages/layout/src/node/setFlexDirection.js b/packages/layout/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/packages/layout/src/node/setFlexWrap.js b/packages/layout/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/packages/layout/src/node/setGap.js b/packages/layout/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/packages/layout/src/node/setJustifyContent.js b/packages/layout/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/packages/layout/src/node/setMargin.js b/packages/layout/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/packages/layout/src/node/setOverflow.js b/packages/layout/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/packages/layout/src/node/setPadding.js b/packages/layout/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/packages/layout/src/node/setPosition.js b/packages/layout/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/packages/layout/src/node/setPositionType.js b/packages/layout/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/packages/layout/src/steps/resolveDimensions.js b/packages/layout/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/packages/layout/src/svg/measureSvg.js b/packages/layout/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/packages/layout/src/text/measureText.js b/packages/layout/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/packages/layout/tests/node/getBorderWidth.test.js b/packages/layout/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/packages/layout/tests/node/getMargin.test.js b/packages/layout/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/packages/layout/tests/node/getPadding.test.js b/packages/layout/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/packages/layout/tests/node/setAlignContent.test.js b/packages/layout/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/packages/layout/tests/node/setAlignItems.test.js b/packages/layout/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/packages/layout/tests/node/setAlignSelf.test.js b/packages/layout/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/packages/layout/tests/node/setBorderWidth.test.js b/packages/layout/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/packages/layout/tests/node/setDisplay.test.js b/packages/layout/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/packages/layout/tests/node/setFlexDirection.test.js b/packages/layout/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/packages/layout/tests/node/setFlexWrap.test.js b/packages/layout/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/packages/layout/tests/node/setJustifyContent.test.js b/packages/layout/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/packages/layout/tests/node/setMargin.test.js b/packages/layout/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/packages/layout/tests/node/setOverflow.test.js b/packages/layout/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/packages/layout/tests/node/setPadding.test.js b/packages/layout/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/packages/layout/tests/node/setPosition.test.js b/packages/layout/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/packages/layout/tests/node/setPositionType.test.js b/packages/layout/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';
 

diff --git a/packages/yoga/.gitignore b/packages/yoga/.gitignore
diff --git a/packages/yoga/CHANGELOG.md b/packages/yoga/CHANGELOG.md
diff --git a/packages/yoga/README.md b/packages/yoga/README.md
diff --git a/packages/yoga/babel.config.js b/packages/yoga/babel.config.js
diff --git a/packages/yoga/index.d.ts b/packages/yoga/index.d.ts
diff --git a/packages/yoga/index.js b/packages/yoga/index.js
diff --git a/packages/yoga/package.json b/packages/yoga/package.json
diff --git a/packages/yoga/rollup.config.js b/packages/yoga/rollup.config.js