Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/persona/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 4 additions & 5 deletions src/components/pdf-viewer/PdfViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -274,7 +273,7 @@ interface PdfViewerSlotScope {
page: number,
scale: number,
totalPage: number,
doc: PDFDocumentProxy,
doc: PDFJS.PDFDocumentProxy,
zoomIn: () => void,
zoomOut: () => void,
next: () => void,
Expand Down
10 changes: 7 additions & 3 deletions src/components/pdf-viewer/utils/pdfjs.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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'
16 changes: 7 additions & 9 deletions src/components/pdf-viewer/utils/use-viewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/public/js/pdfjs-dist@3.11.174/build/pdf.js.map

This file was deleted.

22 changes: 0 additions & 22 deletions src/public/js/pdfjs-dist@3.11.174/build/pdf.min.js

This file was deleted.

280 changes: 0 additions & 280 deletions src/public/js/pdfjs-dist@3.11.174/build/pdf.sandbox.js

This file was deleted.

1 change: 0 additions & 1 deletion src/public/js/pdfjs-dist@3.11.174/build/pdf.sandbox.js.map

This file was deleted.

22 changes: 0 additions & 22 deletions src/public/js/pdfjs-dist@3.11.174/build/pdf.sandbox.min.js

This file was deleted.

19 changes: 0 additions & 19 deletions src/public/js/pdfjs-dist@3.11.174/build/pdf.worker.entry.js

This file was deleted.

1 change: 0 additions & 1 deletion src/public/js/pdfjs-dist@3.11.174/build/pdf.worker.js.map

This file was deleted.

22 changes: 0 additions & 22 deletions src/public/js/pdfjs-dist@3.11.174/build/pdf.worker.min.js

This file was deleted.

Loading
Loading