fix attachments mixin (#2121)

* fix attachments mixin * add change set
diegomura · Dec 27, 2022 · 8536f10 · 8536f10
1 parent 0d9c891
commit 8536f10
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/.changeset/tough-squids-cough.md b/.changeset/tough-squids-cough.md
@@ -0,0 +1,5 @@
+---
+'@react-pdf/pdfkit': patch
+---
+
+fix `attachments` mixin
diff --git a/packages/pdfkit/rollup.config.js b/packages/pdfkit/rollup.config.js
@@ -30,15 +30,13 @@ const babelConfig = () => ({
 });
 
 const getExternal = ({ browser }) => [
-  ...Object.keys(pkg.dependencies)
-    .filter(dep => 'crypto-js' !== dep)
-    .filter(
-      dep =>
-        !browser ||
-        !['vite-compatible-readable-stream', 'browserify-zlib'].includes(dep)
-    ),
+  ...Object.keys(pkg.dependencies).filter(
+    dep =>
+      !browser ||
+      !['vite-compatible-readable-stream', 'browserify-zlib'].includes(dep)
+  ),
   /\/node_modules\/pako\//,
-  'crypto-js/md5',
+  /crypto-js/,
   '@babel/runtime/helpers/inheritsLoose',
   '@babel/runtime/helpers/assertThisInitialized',
   '@babel/runtime/helpers/createForOfIteratorHelperLoose',

diff --git a/packages/pdfkit/src/mixins/attachments.js b/packages/pdfkit/src/mixins/attachments.js
@@ -1,5 +1,6 @@
 import fs from 'fs';
-import CryptoJS from 'crypto-js/md5';
+import * as CryptoJS from 'crypto-js/core';
+import MD5 from 'crypto-js/md5';
 
 export default {
   /**
@@ -65,9 +66,7 @@ export default {
     }
 
     // add checksum and size information
-    const checksum = CryptoJS.MD5(
-      CryptoJS.lib.WordArray.create(new Uint8Array(data))
-    );
+    const checksum = MD5(CryptoJS.lib.WordArray.create(new Uint8Array(data)));
     refBody.Params.CheckSum = new String(checksum);
     refBody.Params.Size = data.byteLength;
 
@@ -107,14 +106,11 @@ export default {
 
 /** check two embedded file metadata objects for equality */
 function isEqual(a, b) {
-  if (
-    a.Subtype !== b.Subtype ||
-    a.Params.CheckSum.toString() !== b.Params.CheckSum.toString() ||
-    a.Params.Size !== b.Params.Size ||
-    a.Params.CreationDate !== b.Params.CreationDate ||
-    a.Params.ModDate !== b.Params.ModDate
-  ) {
-    return false;
-  }
-  return true;
+  return (
+    a.Subtype === b.Subtype &&
+    a.Params.CheckSum.toString() === b.Params.CheckSum.toString() &&
+    a.Params.Size === b.Params.Size &&
+    a.Params.CreationDate === b.Params.CreationDate &&
+    a.Params.ModDate === b.Params.ModDate
+  );
 }