Merge pull request #1021 from privy-open-source/renovate/pdfjs-dist-4.x

fix(deps): update dependency pdfjs-dist to v4

package.json

@@ -106,7 +106,7 @@
     "lodash-es": "4.17.21",
     "marked": "^13.0.0",
     "nanodelay": "2.0.2",
-    "pdfjs-dist": "^3.11.174",
+    "pdfjs-dist": "^4.0.0",
     "postcss-hexrgba": "^2.1.0",
     "postcss-lighten-darken": "^0.9.0",
     "pspdfkit": "^2024.3.1",

packages/persona/package.json

@@ -79,7 +79,7 @@
     "lodash-es": "4.17.21",
     "marked": "13.0.3",
     "nanodelay": "2.0.2",
-    "pdfjs-dist": "3.11.174",
+    "pdfjs-dist": "4.5.136",
     "scroll-into-view": "1.16.2",
     "tabbable": "6.2.0",
     "vue-collapsed": "1.3.3",

src/components/pdf-viewer/PdfViewer.vue

@@ -115,9 +115,8 @@ import PdfError from './PdfError.vue'
 import { useIdle } from './utils/use-idle'
 import PdfObjects from '../pdf-object/PdfObjects.vue'
 import { useViewer } from './utils/use-viewer'
-import type { PDFViewer } from 'pdfjs-dist/web/pdf_viewer'
-import type { PDFDocumentProxy } from 'pdfjs-dist'
 import type { OpenDocConfig } from './utils/use-viewer'
+import type { PDFJS, PDFJSViewer } from './utils/pdfjs'
 
 const props = defineProps({
   src: {
@@ -155,8 +154,8 @@ const props = defineProps({
 })
 
 const emit = defineEmits<{
-  'ready': [PDFViewer],
-  'loaded': [PDFDocumentProxy],
+  'ready': [PDFJSViewer.PDFViewer],
+  'loaded': [PDFJS.PDFDocumentProxy],
   'error': [Error],
   'error-password': [Error],
   'update:page': [number],
@@ -274,7 +273,7 @@ interface PdfViewerSlotScope {
   page: number,
   scale: number,
   totalPage: number,
-  doc: PDFDocumentProxy,
+  doc: PDFJS.PDFDocumentProxy,
   zoomIn: () => void,
   zoomOut: () => void,
   next: () => void,

src/components/pdf-viewer/utils/pdfjs.ts

@@ -1,5 +1,5 @@
 import type * as PDFJS from 'pdfjs-dist'
-import type * as PDFJSViewer from 'pdfjs-dist/web/pdf_viewer'
+import type * as PDFJSViewer from 'pdfjs-dist/web/pdf_viewer.mjs'
 import { withBase } from 'ufo'
 import { getCDN } from '../../global/store'
 
@@ -12,7 +12,7 @@ async function importPdfJS () {
     const pdfjs = await import('pdfjs-dist')
 
     if (typeof window !== 'undefined' && 'Worker' in window)
-      pdfjs.GlobalWorkerOptions.workerSrc = withBase(`pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js`, getCDN())
+      pdfjs.GlobalWorkerOptions.workerSrc = withBase(`pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`, getCDN())
 
     pdfjsLib = pdfjs
   }
@@ -24,7 +24,7 @@ async function importPdfJSViewer () {
   await importPdfJS()
 
   if (!pdfjsViewer)
-    pdfjsViewer = await import('pdfjs-dist/web/pdf_viewer')
+    pdfjsViewer = await import('pdfjs-dist/web/pdf_viewer.mjs')
 
   return pdfjsViewer
 }
@@ -62,3 +62,7 @@ export async function createLinkService (...params: ConstructorParameters<typeof
 
   return new pdfjsViewer.PDFLinkService(...params)
 }
+
+export type * as PDFJSViewer from 'pdfjs-dist/web/pdf_viewer.mjs'
+
+export type * as PDFJS from 'pdfjs-dist'

src/components/pdf-viewer/utils/use-viewer.ts

@@ -6,12 +6,10 @@ import {
   shallowRef,
   watch,
 } from 'vue-demi'
-import type * as PDFJS from 'pdfjs-dist'
 import type {
-  PDFViewer,
-  PDFLinkService,
-  EventBus,
-} from 'pdfjs-dist/web/pdf_viewer'
+  PDFJS,
+  PDFJSViewer,
+} from './pdfjs'
 import useLoading from '../../overlay/utils/use-loading'
 import { useClamp, useMax } from '@vueuse/math'
 import { createEventHook } from '@vueuse/core'
@@ -30,10 +28,10 @@ export interface OpenDocConfig {
 
 export function useViewer (container: Ref<HTMLDivElement>, viewer: Ref<HTMLDivElement>) {
   const pdfDoc         = shallowRef<PDFJS.PDFDocumentProxy>()
-  const pdfEventBus    = shallowRef<EventBus>()
-  const pdfViewer      = shallowRef<PDFViewer>()
+  const pdfEventBus    = shallowRef<PDFJSViewer.EventBus>()
+  const pdfViewer      = shallowRef<PDFJSViewer.PDFViewer>()
   const pdfLoadingTask = shallowRef<PDFJS.PDFDocumentLoadingTask>()
-  const pdfLinkService = shallowRef<PDFLinkService>()
+  const pdfLinkService = shallowRef<PDFJSViewer.PDFLinkService>()
 
   const totalPage = computed(() => pdfDoc.value?.numPages ?? 0)
   const scale     = useClamp(1, 0.1, 2)
@@ -44,7 +42,7 @@ export function useViewer (container: Ref<HTMLDivElement>, viewer: Ref<HTMLDivEl
 
   const loadEvent  = createEventHook<PDFJS.PDFDocumentProxy>()
   const errorEvent = createEventHook<Error>()
-  const readyEvent = createEventHook<PDFViewer>()
+  const readyEvent = createEventHook<PDFJSViewer.PDFViewer>()
 
   async function openDoc (url: string, password?: string, config: Partial<OpenDocConfig> = {}) {
     loading.value = true