From a0467e7c4db27d27dc17f588bbaaebbb6f22d259 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Mon, 3 Feb 2025 15:20:33 +0530 Subject: [PATCH] fix: Fix PDF export not working on Android The request for loading the PDF worker gets canceled since it tries to load it from a `file:` url, so we need to inline the loader as a blob so that it can be loaded correctly. --- ...r-loader-npm-3.0.8-6423aa0002-84f4a7eeb2.zip | Bin 0 -> 13440 bytes packages/mobile/ios/Podfile.lock | 4 ++-- packages/web/package.json | 3 ++- .../Lexical/Utils/PDFExport/PDFExport.tsx | 6 ++++-- .../{PDFWorker.tsx => PDFWorker.worker.tsx} | 2 +- packages/web/web.webpack.config.js | 7 +++++++ yarn.lock | 13 +++++++++++++ 7 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 .yarn/cache/worker-loader-npm-3.0.8-6423aa0002-84f4a7eeb2.zip rename packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/{PDFWorker.tsx => PDFWorker.worker.tsx} (98%) diff --git a/.yarn/cache/worker-loader-npm-3.0.8-6423aa0002-84f4a7eeb2.zip b/.yarn/cache/worker-loader-npm-3.0.8-6423aa0002-84f4a7eeb2.zip new file mode 100644 index 0000000000000000000000000000000000000000..2bc36fc66e0f169f1b94a722f3d7354f0bf3033c GIT binary patch literal 13440 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 literal 0 HcmV?d00001 diff --git a/packages/mobile/ios/Podfile.lock b/packages/mobile/ios/Podfile.lock index 9bd9ad202..b482ee951 100644 --- a/packages/mobile/ios/Podfile.lock +++ b/packages/mobile/ios/Podfile.lock @@ -1545,7 +1545,7 @@ PODS: - React-Core - RNPrivacySnapshot (1.0.0): - React-Core - - RNShare (9.4.1): + - RNShare (10.2.1): - React-Core - RNStoreReview (0.4.1): - React-Core @@ -1873,7 +1873,7 @@ SPEC CHECKSUMS: RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c RNNotifee: f3c01b391dd8e98e67f539f9a35a9cbcd3bae744 RNPrivacySnapshot: 8eaf571478a353f2e5184f5c803164f22428b023 - RNShare: 32e97adc8d8c97d4a26bcdd3c45516882184f8b6 + RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c RNStoreReview: 923b1c888c13469925bf0256dc2c046eab557ce5 SNReactNative: b5e9e529c175c13f3a618e27c76cf3071213d5e1 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d diff --git a/packages/web/package.json b/packages/web/package.json index 2fd217142..71292c27e 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -99,7 +99,8 @@ "webextension-polyfill": "^0.10.0", "webpack": "*", "webpack-dev-server": "*", - "webpack-merge": "*" + "webpack-merge": "*", + "worker-loader": "^3.0.8" }, "lint-staged": { "app/**/*.{js,ts,jsx,tsx}": "eslint --cache --fix", diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx index 5cd197b15..847476749 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFExport.tsx @@ -19,7 +19,8 @@ import { $isRemoteImageNode } from '../../../Plugins/RemoteImagePlugin/RemoteIma import { $isCollapsibleContainerNode } from '../../../Plugins/CollapsiblePlugin/CollapsibleContainerNode' import { $isCollapsibleContentNode } from '../../../Plugins/CollapsiblePlugin/CollapsibleContentNode' import { $isCollapsibleTitleNode } from '../../../Plugins/CollapsiblePlugin/CollapsibleTitleNode' -import { PDFDataNode, PDFWorker } from './PDFWorker' +// @ts-expect-error TS thinks there's no default export but that is added by the webpack loader. +import PDFWorker, { PDFDataNode, PDFWorkerInterface } from './PDFWorker.worker' import { wrap } from 'comlink' import { PrefKey, PrefValue } from '@standardnotes/snjs' @@ -417,7 +418,8 @@ const getPDFDataNodesFromLexicalNodes = (nodes: LexicalNode[]): PDFDataNode[] => return nodes.map(getPDFDataNodeFromLexicalNode) } -const PDFWorkerComlink = wrap(new Worker(new URL('./PDFWorker.tsx', import.meta.url))) +const pdfWorker = new PDFWorker() +const PDFWorkerComlink = wrap(pdfWorker) /** * @returns The PDF as an object url diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.tsx b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx similarity index 98% rename from packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.tsx rename to packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx index 7181c176f..6b130c84f 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Utils/PDFExport/PDFWorker.worker.tsx @@ -102,6 +102,6 @@ expose({ renderPDF, }) -export type PDFWorker = { +export type PDFWorkerInterface = { renderPDF: typeof renderPDF } diff --git a/packages/web/web.webpack.config.js b/packages/web/web.webpack.config.js index fc128c75b..b6898c0f7 100644 --- a/packages/web/web.webpack.config.js +++ b/packages/web/web.webpack.config.js @@ -92,6 +92,13 @@ module.exports = (env) => { }, module: { rules: [ + { + test: /\.worker\.tsx?$/, + loader: 'worker-loader', + options: { + inline: 'fallback', + }, + }, { test: /\.(js|tsx?)$/, /** diff --git a/yarn.lock b/yarn.lock index 44763e434..9fc00171f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8414,6 +8414,7 @@ __metadata: webpack: "*" webpack-dev-server: "*" webpack-merge: "*" + worker-loader: ^3.0.8 languageName: unknown linkType: soft @@ -28047,6 +28048,18 @@ __metadata: languageName: node linkType: hard +"worker-loader@npm:^3.0.8": + version: 3.0.8 + resolution: "worker-loader@npm:3.0.8" + dependencies: + loader-utils: ^2.0.0 + schema-utils: ^3.0.0 + peerDependencies: + webpack: ^4.0.0 || ^5.0.0 + checksum: 84f4a7eeb2a1d8b9704425837e017c91eedfae67ac89e0b866a2dcf283323c1dcabe0258196278b7d5fd0041392da895c8a0c59ddf3a94f1b2e003df68ddfec3 + languageName: node + linkType: hard + "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": version: 7.0.0 resolution: "wrap-ansi@npm:7.0.0"