Bump fontkit and linebreak deps (#1367)

* Bump fontkit and linebreak deps

* Bump fontkit to 2.0.0

* Bump

* Drop old node versions

* Bump testing dependencies

* Update pdfjs

* fix jest to compatibility with restructure, update fontkit, refresh snapshots

* Update CHANGELOG.md

---------

Co-authored-by: Libor M. <liborm85@gmail.com>

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## pdfkit changelog
 
+### Unreleased
+
+- Update fontkit to 2.0
+- Update linebreak to 1.1
+
 ### [v0.15.2] - 2024-12-15
 
 - Fix index not counting when rendering ordered lists (#1517)

examples/webpack/README.md

@@ -14,7 +14,7 @@ Simple example of using PdfKit with webpack
 [`webpack.config.js`](webpack.config.js)
 
 - add alias to map `fs` calls to pdfkit virtual file system [implementation](../../lib/virtual-fs.js)
-- ignore iconv-lite and crypto packages to save bundle file size
+- ignore crypto package to save bundle file size
 - add aliases to native node packages (buffer, stream, zlib, util, assert)
 - configure `*.afm` files to be imported as text
 - configure all files in `src/static-assets` folder to be imported encoded as base64

examples/webpack/package.json

@@ -11,7 +11,6 @@
     "util": "^0.12.5"
   },
   "devDependencies": {
-    "brfs": "^2.0.2",
     "html-webpack-plugin": "^5.6.0",
     "transform-loader": "^0.2.4",
     "webpack": "^5.91.0",

examples/webpack/webpack.config.js

@@ -13,11 +13,10 @@ module.exports = {
     })
   ],
   resolve: {
+    symlinks: false,
     alias: {
       // maps fs to a virtual one allowing to register file content dynamically
-      fs: 'pdfkit/js/virtual-fs.js',
-      // iconv-lite is used to load cid less fonts (not spec compliant)
-      'iconv-lite': false
+      fs: __dirname + '/../../js/virtual-fs.js'
     },
     fallback: {
       // crypto module is not necessary at browser
@@ -48,23 +47,6 @@ module.exports = {
       {
         test: /src[/\\]lazy-assets/,
         type: 'asset/resource'
-      },
-      // convert to base64 and include inline file system binary files used by fontkit and linebreak
-      {
-        enforce: 'post',
-        test: /fontkit[/\\]index.js$/,
-        loader: 'transform-loader',
-        options: {
-          brfs: {}
-        }
-      },
-      {
-        enforce: 'post',
-        test: /linebreak[/\\]src[/\\]linebreaker.js/,
-        loader: 'transform-loader',
-        options: {
-          brfs: {}
-        }
       }
     ]
   }

lib/font/embedded.js

@@ -128,10 +128,7 @@ class EmbeddedFont extends PDFFont {
       fontFile.data.Subtype = 'CIDFontType0C';
     }
 
-    this.subset
-      .encodeStream()
-      .on('data', data => fontFile.write(data))
-      .on('end', () => fontFile.end());
+    fontFile.end(this.subset.encode());
 
     const familyClass =
       ((this.font['OS/2'] != null

lib/font_factory.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import fontkit from 'fontkit';
+import * as fontkit from 'fontkit';
 import StandardFont from './font/standard';
 import EmbeddedFont from './font/embedded';
 
@@ -13,12 +13,10 @@ class PDFFontFactory {
 
       src = fs.readFileSync(src);
     }
-    if (Buffer.isBuffer(src)) {
+    if (src instanceof Uint8Array) {
       font = fontkit.create(src, family);
-    } else if (src instanceof Uint8Array) {
-      font = fontkit.create(Buffer.from(src), family);
     } else if (src instanceof ArrayBuffer) {
-      font = fontkit.create(Buffer.from(new Uint8Array(src)), family);
+      font = fontkit.create(new Uint8Array(src), family);
     }
 
     if (font == null) {

lib/reference.js

@@ -20,7 +20,7 @@ class PDFReference extends PDFAbstractReference {
   }
 
   write(chunk) {
-    if (!Buffer.isBuffer(chunk)) {
+    if (!(chunk instanceof Uint8Array)) {
       chunk = Buffer.from(chunk + '\n', 'binary');
     }
 

package.json

@@ -35,12 +35,11 @@
     "codemirror": "~5.49.2",
     "eslint": "^7.8.1",
     "gh-pages": "^3.1.0",
-    "iconv-lite": "^0.5.0",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.4.3",
     "jest-image-snapshot": "^6.1.0",
     "markdown": "~0.5.0",
-    "pdfjs-dist": "^2.4.456",
+    "pdfjs-dist": "^2.14.305",
     "prettier": "1.19.1",
     "pug": "^2.0.4",
     "rollup": "^1.27.0",
@@ -49,25 +48,25 @@
   },
   "dependencies": {
     "crypto-js": "^4.2.0",
-    "fontkit": "^1.8.1",
+    "fontkit": "^2.0.4",
     "jpeg-exif": "^1.1.4",
-    "linebreak": "^1.0.2",
+    "linebreak": "^1.1.0",
     "png-js": "^1.0.0"
   },
   "scripts": {
     "prepublishOnly": "npm run build",
     "build": "rollup -c && npm run build-standalone",
-    "build-standalone": "browserify --standalone PDFDocument --ignore crypto --ignore iconv-lite js/pdfkit.js > js/pdfkit.standalone.js",
+    "build-standalone": "browserify --standalone PDFDocument --ignore crypto js/pdfkit.js > js/pdfkit.standalone.js",
     "browserify-example": "browserify examples/browserify/browser.js > examples/browserify/bundle.js",
     "pdf-guide": "node docs/generate.js",
     "website": "node docs/generate_website.js",
     "publish-website": "node docs/publish_website.js",
     "docs": "npm run pdf-guide && npm run website && npm run browserify-example",
     "lint": "eslint {lib,tests}/**/*.js",
     "prettier": "prettier {lib,tests,examples,docs}/**/*.js",
-    "test": "jest -i",
-    "test:visual": "jest visual/ -i",
-    "test:unit": "jest unit/"
+    "test": "jest -i --env=node",
+    "test:visual": "jest visual/ -i --env=node",
+    "test:unit": "jest unit/ --env=node"
   },
   "main": "js/pdfkit.js",
   "module": "js/pdfkit.es.js",

tests/visual/helpers.js

@@ -10,21 +10,25 @@ function runDocTest(options, fn) {
     options.info = {};
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const doc = new PDFDocument(options);
     const buffers = [];
 
     fn(doc);
 
     doc.on('data', buffers.push.bind(buffers));
     doc.on('end', async () => {
-      const pdfData = Buffer.concat(buffers);
-      const { systemFonts = false } = options;
-      const images = await pdf2png(pdfData, { systemFonts });
-      for (let image of images) {
-        expect(image).toMatchImageSnapshot();
+      try {
+        const pdfData = Buffer.concat(buffers);
+        const { systemFonts = false } = options;
+        const images = await pdf2png(pdfData, { systemFonts });
+        for (let image of images) {
+          expect(image).toMatchImageSnapshot();
+        }
+        resolve();
+      } catch (err) {
+        reject(err)
       }
-      resolve();
     });
     doc.end();
   });

tests/visual/pdf2png.js

@@ -1,6 +1,6 @@
 import Canvas from 'canvas';
 import { strict as assert } from 'assert';
-import * as pdfjsLib from 'pdfjs-dist/es5/build/pdf';
+import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf';
 
 // adapted from https://github.com/mozilla/pdf.js/tree/master/examples/node/pdf2png