fix: bundle latest dfa to fontkit (#1609)

diegomura · Dec 18, 2021 · 3217a89 · 3217a89
1 parent 4c5d527
commit 3217a89
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 331 deletions.
diff --git a/.changeset/beige-wombats-jump.md b/.changeset/beige-wombats-jump.md
@@ -0,0 +1,5 @@
+---
+'@react-pdf/fontkit': minor
+---
+
+added `dfa@1.2.0` to browser bundle to remove `core-js@2` and `regenerator-runtime`
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "@changesets/cli": "^2.17.0",
     "@rollup/plugin-alias": "^3.1.8",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.0.6",
     "@rollup/plugin-replace": "^3.0.0",

diff --git a/packages/fontkit/package.json b/packages/fontkit/package.json
@@ -26,11 +26,12 @@
   "author": "Devon Govett <devongovett@gmail.com>",
   "license": "MIT",
   "dependencies": {
+    "@babel/runtime": "^7.6.2",
     "@react-pdf/unicode-properties": "^2.4.2",
     "brotli": "^1.2.0",
     "clone": "^1.0.4",
     "deep-equal": "^1.0.0",
-    "dfa": "1.1.0",
+    "dfa": "^1.2.0",
     "restructure": "^0.5.3",
     "tiny-inflate": "^1.0.2",
     "unicode-trie": "^0.3.0"

diff --git a/packages/fontkit/rollup.config.js b/packages/fontkit/rollup.config.js
@@ -4,6 +4,8 @@ import replace from '@rollup/plugin-replace';
 import ignore from 'rollup-plugin-ignore';
 import { terser } from 'rollup-plugin-terser';
 import localResolve from 'rollup-plugin-local-resolve';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import pkg from './package.json';
 
 const cjs = {
@@ -80,16 +82,31 @@ const browserConfig = Object.assign({}, configBase, {
     getESM({ file: 'lib/fontkit.browser.es.js' }),
     getCJS({ file: 'lib/fontkit.browser.cjs.js' }),
   ],
-  plugins: configBase.plugins.concat(
-    babel(babelConfig({ browser: true })),
+  external: configBase.external
+    .filter(dep => dep !== 'dfa')
+    .concat(
+      '@babel/runtime/regenerator',
+      '@babel/runtime/helpers/createClass',
+      '@babel/runtime/helpers/applyDecoratedDescriptor',
+      '@babel/runtime/helpers/defineProperty',
+      '@babel/runtime/helpers/inheritsLoose',
+    ),
+  plugins: [
+    ignore(['fs', 'brotli', 'brotli/decompress', './WOFF2Font']),
     replace({
       preventAssignment: true,
       values: {
         BROWSER: JSON.stringify(true),
       },
     }),
-    ignore(['fs', 'brotli', 'brotli/decompress', './WOFF2Font']),
-  ),
+
+    json(),
+
+    resolve({ browser: true }),
+    commonjs({ include: /node_modules/ }),
+
+    babel(babelConfig({ browser: true })),
+  ],
 });
 
 const browserProdConfig = Object.assign({}, browserConfig, {