From e0d03da85089227c9d8020a1163ded9d4544624f Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 7 May 2024 22:04:23 +0200 Subject: [PATCH] upgrade to pdfjs-dist 4.* --- config/webpack.base.js | 3 +-- package-lock.json | 20 ++++++++++---------- package.json | 2 +- src/js/main.js | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/config/webpack.base.js b/config/webpack.base.js index bbbc1ad..27f91a2 100644 --- a/config/webpack.base.js +++ b/config/webpack.base.js @@ -10,8 +10,7 @@ const __dirname = path.dirname(__filename); const config = { entry: { - main: ["./src/js/index.js"], - "pdf.worker": "pdfjs-dist/build/pdf.worker.entry", + main: ["./src/js/index.js"] }, output: { path: path.join(__dirname, "..", "dist"), diff --git a/package-lock.json b/package-lock.json index 261595f..aa7e895 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "jquery": "^3.6.0", "jquery-ui": "^1.13.2", "keymage": "^1.1.3", - "pdfjs-dist": "^3.11.174", + "pdfjs-dist": "^4.2.67", "prettier": "^2.5.1", "pretty-quick": "^2.0.1", "style-loader": "^1.1.4", @@ -10697,27 +10697,27 @@ "node": ">=8" } }, - "node_modules/path2d-polyfill": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz", - "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==", + "node_modules/path2d": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.0.tgz", + "integrity": "sha512-KdPAykQX6kmLSOO6Jpu2KNcCED7CKjmaBNGGNuctOsG0hgYO1OdYQaan6cYXJiG0WmXOwZZPILPBimu5QAIw3A==", "dev": true, "optional": true, "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/pdfjs-dist": { - "version": "3.11.174", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz", - "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==", + "version": "4.2.67", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.2.67.tgz", + "integrity": "sha512-rJmuBDFpD7cqC8WIkQUEClyB4UAH05K4AsyewToMTp2gSy3Rrx8c1ydAVqlJlGv3yZSOrhEERQU/4ScQQFlLHA==", "dev": true, "engines": { "node": ">=18" }, "optionalDependencies": { "canvas": "^2.11.2", - "path2d-polyfill": "^2.0.1" + "path2d": "^0.2.0" } }, "node_modules/picocolors": { diff --git a/package.json b/package.json index 5d7fd79..c7093b6 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "jquery": "^3.6.0", "jquery-ui": "^1.13.2", "keymage": "^1.1.3", - "pdfjs-dist": "^3.11.174", + "pdfjs-dist": "^4.2.67", "prettier": "^2.5.1", "pretty-quick": "^2.0.1", "style-loader": "^1.1.4", diff --git a/src/js/main.js b/src/js/main.js index 9cc33c1..660eefc 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -11,7 +11,7 @@ import { getSubDir } from "./utils.js"; import ConfigService from "./services/ConfigService.js"; import { v4 as uuidv4 } from "uuid"; -import pdfjsLib from "pdfjs-dist"; +import * as pdfjsLib from 'pdfjs-dist/webpack.mjs'; const urlParams = new URLSearchParams(window.location.search); let whiteboardId = urlParams.get("whiteboardid");