From b36dc83d3411febfc86e2719ea5d433920c9cf3d Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Fri, 17 Jan 2025 17:50:22 +0100 Subject: [PATCH 1/3] bump react-fast-pdf to version 1.0.22 --- package-lock.json | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5395d10b3eff6..f53eb30e1b70e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,7 +76,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.3.1", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "1.0.21", + "react-fast-pdf": "^1.0.22", "react-map-gl": "^7.1.3", "react-native": "0.76.3", "react-native-android-location-enabler": "^2.0.1", @@ -31907,9 +31907,9 @@ } }, "node_modules/react-fast-pdf": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.21.tgz", - "integrity": "sha512-8Uuz/jPHjHqElH+aUj3ldS/Hg/NoZ5ZS/VupGzDkVJST0UiGzxkvDxxFIQuYuiaI4NGwGmqtQGGYsjJKpyWnig==", + "version": "1.0.22", + "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.22.tgz", + "integrity": "sha512-bU1YEHFfazKFSdmNAauD267GtjVHdcuE39jyHJQ8CRI8ZWWLwckZ8azPuE25i+hodCBmQuTNBdg6Gx4OhP8HOQ==", "license": "MIT", "dependencies": { "react-pdf": "^9.1.1", diff --git a/package.json b/package.json index c01ea0af368f6..d86caf04b9916 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,8 @@ }, "dependencies": { "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "0.1.210", "@expensify/react-native-background-task": "file:./modules/background-task", + "@expensify/react-native-live-markdown": "0.1.210", "@expo/metro-runtime": "^4.0.0", "@firebase/app": "^0.10.10", "@firebase/performance": "^0.6.8", @@ -141,7 +141,7 @@ "react-content-loader": "^7.0.0", "react-dom": "18.3.1", "react-error-boundary": "^4.0.11", - "react-fast-pdf": "1.0.21", + "react-fast-pdf": "^1.0.22", "react-map-gl": "^7.1.3", "react-native": "0.76.3", "react-native-android-location-enabler": "^2.0.1", From 81b0523d209d4e4b6c0febed1bc037665359493b Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Tue, 21 Jan 2025 12:56:11 +0100 Subject: [PATCH 2/3] Update PDF.js worker import paths to use legacy version --- config/webpack/webpack.common.ts | 2 +- src/components/PDFThumbnail/index.tsx | 2 +- src/types/modules/pdf.worker.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/webpack/webpack.common.ts b/config/webpack/webpack.common.ts index e044c324837fe..1992a27c40c38 100644 --- a/config/webpack/webpack.common.ts +++ b/config/webpack/webpack.common.ts @@ -179,7 +179,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment): // We are importing this worker as a string by using asset/source otherwise it will default to loading via an HTTPS request later. // This causes issues if we have gone offline before the pdfjs web worker is set up as we won't be able to load it from the server. { - test: new RegExp('node_modules/pdfjs-dist/build/pdf.worker.min.mjs'), + test: new RegExp('node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs'), type: 'asset/source', }, diff --git a/src/components/PDFThumbnail/index.tsx b/src/components/PDFThumbnail/index.tsx index 6b83afe603c1c..495c14ff76e15 100644 --- a/src/components/PDFThumbnail/index.tsx +++ b/src/components/PDFThumbnail/index.tsx @@ -1,6 +1,6 @@ import 'core-js/proposals/promise-with-resolvers'; // eslint-disable-next-line import/extensions -import pdfWorkerSource from 'pdfjs-dist/build/pdf.worker.min.mjs'; +import pdfWorkerSource from 'pdfjs-dist/legacy/build/pdf.worker.min.mjs'; import React, {useMemo, useState} from 'react'; import {View} from 'react-native'; import {Document, pdfjs, Thumbnail} from 'react-pdf'; diff --git a/src/types/modules/pdf.worker.d.ts b/src/types/modules/pdf.worker.d.ts index c636372b411d1..a6d70e529b7f1 100644 --- a/src/types/modules/pdf.worker.d.ts +++ b/src/types/modules/pdf.worker.d.ts @@ -1 +1 @@ -declare module 'pdfjs-dist/build/pdf.worker.min.mjs'; +declare module 'pdfjs-dist/legacy/build/pdf.worker.min.mjs'; From de4c6cae90a003d8dae2ab40d4bd8a7256581809 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Tue, 21 Jan 2025 13:49:51 +0100 Subject: [PATCH 3/3] Move react-native-background-task dependency to the correct path in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cdd28d6caccf..685e5d3464c57 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,8 @@ }, "dependencies": { "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-background-task": "file:./modules/background-task", "@expensify/react-native-live-markdown": "0.1.210", + "@expensify/react-native-background-task": "file:./modules/background-task", "@expo/metro-runtime": "^4.0.0", "@firebase/app": "^0.10.10", "@firebase/performance": "^0.6.8",