From 4530872372e6dfc2796dc7ff8a233b7fdfe028d1 Mon Sep 17 00:00:00 2001 From: suyao Date: Sun, 15 Jun 2025 21:00:04 +0800 Subject: [PATCH] chore: update dependencies and improve OCR functionality - Added @cherrystudio/pdf-to-img-napi dependency to package.json and yarn.lock for enhanced PDF processing. - Updated pdfjs-dist to version 4.10.38 for improved PDF rendering capabilities. - Modified MacSysOcrProvider to utilize the new pdf-to-img-napi module for OCR processing of PDF files. - Removed unnecessary Windows build steps from the release workflow to streamline the process. --- .github/workflows/release.yml | 40 +--- package.json | 8 +- src/main/ocr/MacSysOcrProvider.ts | 2 +- yarn.lock | 357 ++++++++++++------------------ 4 files changed, 145 insertions(+), 262 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da8313387..e14a2de13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - os: [macos-latest, windows-latest, ubuntu-latest, windows-11-arm] + os: [macos-latest, windows-latest, ubuntu-latest] fail-fast: false steps: @@ -44,32 +44,6 @@ jobs: with: node-version: 20 - - name: macos-latest dependencies fix - if: matrix.os == 'macos-latest' - run: | - brew update - brew install pkg-config cairo pango libpng jpeg giflib librsvg pixman python-setuptools - - - name: ubuntu-latest dependencies fix - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev - - name: windows-latest dependencies fix - if: matrix.os == 'windows-latest' - run: | - Invoke-WebRequest "https://ftp.gnome.org/pub/GNOME/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip" - Expand-Archive gtk.zip -DestinationPath "C:\GTK" - Invoke-WebRequest "https://downloads.sourceforge.net/project/libjpeg-turbo/2.0.4/libjpeg-turbo-2.0.4-vc64.exe" -OutFile "libjpeg.exe" -UserAgent NativeHost - .\libjpeg.exe /S - npm install -g node-gyp@8 - npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"} - - name: windows-11-arm dependencies fix - if: matrix.os == 'windows-11-arm' - run: | - Invoke-WebRequest "https://ftp.gnome.org/pub/GNOME/binaries/win64/gtk+/2.22/gtk+-bundle_2.22.1-20101229_win64.zip" -OutFile "gtk.zip" - Expand-Archive gtk.zip -DestinationPath "C:\GTK" - Invoke-WebRequest "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.1/libjpeg-turbo-3.1.1-vc-arm64.exe" -OutFile "libjpeg.exe" -UserAgent NativeHost - .\libjpeg.exe /S - name: Install corepack run: corepack enable && corepack prepare yarn@4.6.0 --activate @@ -119,18 +93,8 @@ jobs: NODE_OPTIONS: --max-old-space-size=8192 MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }} - - name: Build canvas for Windows x64 - if: matrix.os == 'windows-latest' - run: | - cd node_modules/canvas && node-gyp rebuild --arch=x64 && cd ../.. - - - name: Build canvas for Windows ARM64 - if: matrix.os == 'windows-11-arm' - run: | - cd node_modules/canvas && node-gyp rebuild --arch=arm64 && cd ../.. - - name: Build Windows - if: matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm' + if: matrix.os == 'windows-latest' run: | yarn build:npm windows yarn build:win diff --git a/package.json b/package.json index 64bf5ca2f..2f62784bc 100644 --- a/package.json +++ b/package.json @@ -58,13 +58,13 @@ "prepare": "husky" }, "dependencies": { + "@cherrystudio/pdf-to-img-napi": "^0.0.1", "@libsql/client": "0.14.0", "@libsql/win32-x64-msvc": "^0.4.7", "@strongtz/win32-arm64-msvc": "^0.4.7", "jsdom": "26.1.0", "os-proxy-config": "^1.1.2", - "pdf-to-img": "^4.4.0", - "pdfjs-dist": "4.2.67", + "pdfjs-dist": "4.10.38", "selection-hook": "^0.9.23", "turndown": "7.2.0" }, @@ -234,7 +234,9 @@ "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch", "openai@npm:^4.87.3": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch", "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch", - "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch" + "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch", + "canvas@npm:3.1.0": "patch:canvas@npm%3A3.1.0#~/.yarn/patches/canvas-npm-3.1.0-88957473bd.patch", + "canvas@npm:^2.11.2": "patch:canvas@npm%3A3.1.0#~/.yarn/patches/canvas-npm-3.1.0-88957473bd.patch" }, "packageManager": "yarn@4.9.1", "lint-staged": { diff --git a/src/main/ocr/MacSysOcrProvider.ts b/src/main/ocr/MacSysOcrProvider.ts index faf48bb8d..df281eb60 100644 --- a/src/main/ocr/MacSysOcrProvider.ts +++ b/src/main/ocr/MacSysOcrProvider.ts @@ -86,7 +86,7 @@ export default class MacSysOcrProvider extends BaseOcrProvider { Logger.info(`[OCR] Starting OCR process for file: ${file.name}`) if (file.ext === '.pdf') { try { - const { pdf } = await import('pdf-to-img') + const { pdf } = await import('@cherrystudio/pdf-to-img-napi') const pdfBuffer = await fs.promises.readFile(file.path) const results = await pdf(pdfBuffer, { scale: 2 diff --git a/yarn.lock b/yarn.lock index 26f0a95b6..99322bc4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -723,6 +723,18 @@ __metadata: languageName: node linkType: hard +"@cherrystudio/pdf-to-img-napi@npm:^0.0.1": + version: 0.0.1 + resolution: "@cherrystudio/pdf-to-img-napi@npm:0.0.1" + dependencies: + "@napi-rs/canvas": "npm:^0.1.71" + pdfjs-dist: "npm:^4.10.38" + bin: + pdf2img: bin/cli.mjs + checksum: 10c0/d4cd5600960ef42e7b43e3fcd2698b4c874523a0654991e78ebd2bae54cde62258c12ac8dbf60f25e1bf6e5286cf4ccb5d4341c4fc9153369ebf86771e451a5a + languageName: node + linkType: hard + "@chevrotain/cst-dts-gen@npm:11.0.3": version: 11.0.3 resolution: "@chevrotain/cst-dts-gen@npm:11.0.3" @@ -3031,25 +3043,6 @@ __metadata: languageName: node linkType: hard -"@mapbox/node-pre-gyp@npm:^1.0.0": - version: 1.0.11 - resolution: "@mapbox/node-pre-gyp@npm:1.0.11" - dependencies: - detect-libc: "npm:^2.0.0" - https-proxy-agent: "npm:^5.0.0" - make-dir: "npm:^3.1.0" - node-fetch: "npm:^2.6.7" - nopt: "npm:^5.0.0" - npmlog: "npm:^5.0.1" - rimraf: "npm:^3.0.2" - semver: "npm:^7.3.5" - tar: "npm:^6.1.11" - bin: - node-pre-gyp: bin/node-pre-gyp - checksum: 10c0/2b24b93c31beca1c91336fa3b3769fda98e202fb7f9771f0f4062588d36dcc30fcf8118c36aa747fa7f7610d8cf601872bdaaf62ce7822bb08b545d1bbe086cc - languageName: node - linkType: hard - "@marijn/find-cluster-break@npm:^1.0.0": version: 1.0.2 resolution: "@marijn/find-cluster-break@npm:1.0.2" @@ -3110,6 +3103,115 @@ __metadata: languageName: node linkType: hard +"@napi-rs/canvas-android-arm64@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-android-arm64@npm:0.1.71" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@napi-rs/canvas-darwin-arm64@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-darwin-arm64@npm:0.1.71" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@napi-rs/canvas-darwin-x64@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-darwin-x64@npm:0.1.71" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.71" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm64-gnu@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-arm64-gnu@npm:0.1.71" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-arm64-musl@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-arm64-musl@npm:0.1.71" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-riscv64-gnu@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-riscv64-gnu@npm:0.1.71" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-x64-gnu@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-x64-gnu@npm:0.1.71" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@napi-rs/canvas-linux-x64-musl@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-linux-x64-musl@npm:0.1.71" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@napi-rs/canvas-win32-x64-msvc@npm:0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas-win32-x64-msvc@npm:0.1.71" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"@napi-rs/canvas@npm:^0.1.65, @napi-rs/canvas@npm:^0.1.71": + version: 0.1.71 + resolution: "@napi-rs/canvas@npm:0.1.71" + dependencies: + "@napi-rs/canvas-android-arm64": "npm:0.1.71" + "@napi-rs/canvas-darwin-arm64": "npm:0.1.71" + "@napi-rs/canvas-darwin-x64": "npm:0.1.71" + "@napi-rs/canvas-linux-arm-gnueabihf": "npm:0.1.71" + "@napi-rs/canvas-linux-arm64-gnu": "npm:0.1.71" + "@napi-rs/canvas-linux-arm64-musl": "npm:0.1.71" + "@napi-rs/canvas-linux-riscv64-gnu": "npm:0.1.71" + "@napi-rs/canvas-linux-x64-gnu": "npm:0.1.71" + "@napi-rs/canvas-linux-x64-musl": "npm:0.1.71" + "@napi-rs/canvas-win32-x64-msvc": "npm:0.1.71" + dependenciesMeta: + "@napi-rs/canvas-android-arm64": + optional: true + "@napi-rs/canvas-darwin-arm64": + optional: true + "@napi-rs/canvas-darwin-x64": + optional: true + "@napi-rs/canvas-linux-arm-gnueabihf": + optional: true + "@napi-rs/canvas-linux-arm64-gnu": + optional: true + "@napi-rs/canvas-linux-arm64-musl": + optional: true + "@napi-rs/canvas-linux-riscv64-gnu": + optional: true + "@napi-rs/canvas-linux-x64-gnu": + optional: true + "@napi-rs/canvas-linux-x64-musl": + optional: true + "@napi-rs/canvas-win32-x64-msvc": + optional: true + checksum: 10c0/839b07a338b63965dd2dd4d9726c932d87572843c9868e340d6dd6166daa7943571982f8118bcc49b772c88b0b2d948e4dd91d37f72e437d6dcf0bbbfda96e90 + languageName: node + linkType: hard + "@neon-rs/load@npm:^0.0.4": version: 0.0.4 resolution: "@neon-rs/load@npm:0.0.4" @@ -5629,6 +5731,7 @@ __metadata: "@cherrystudio/embedjs-ollama": "npm:^0.1.31" "@cherrystudio/embedjs-openai": "npm:^0.1.31" "@cherrystudio/mac-system-ocr": "npm:^0.2.2" + "@cherrystudio/pdf-to-img-napi": "npm:^0.0.1" "@electron-toolkit/eslint-config-prettier": "npm:^3.0.0" "@electron-toolkit/eslint-config-ts": "npm:^3.0.0" "@electron-toolkit/preload": "npm:^3.0.0" @@ -5730,8 +5833,7 @@ __metadata: openai: "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch" os-proxy-config: "npm:^1.1.2" p-queue: "npm:^8.1.0" - pdf-to-img: "npm:^4.4.0" - pdfjs-dist: "npm:4.2.67" + pdfjs-dist: "npm:4.10.38" playwright: "npm:^1.52.0" prettier: "npm:^3.5.3" proxy-agent: "npm:^6.5.0" @@ -5778,7 +5880,7 @@ __metadata: languageName: unknown linkType: soft -"abbrev@npm:1, abbrev@npm:^1.0.0": +"abbrev@npm:^1.0.0": version: 1.1.1 resolution: "abbrev@npm:1.1.1" checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6 @@ -6133,13 +6235,6 @@ __metadata: languageName: node linkType: hard -"aproba@npm:^1.0.3 || ^2.0.0": - version: 2.0.0 - resolution: "aproba@npm:2.0.0" - checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5 - languageName: node - linkType: hard - "archiver-utils@npm:^5.0.0, archiver-utils@npm:^5.0.2": version: 5.0.2 resolution: "archiver-utils@npm:5.0.2" @@ -6170,16 +6265,6 @@ __metadata: languageName: node linkType: hard -"are-we-there-yet@npm:^2.0.0": - version: 2.0.0 - resolution: "are-we-there-yet@npm:2.0.0" - dependencies: - delegates: "npm:^1.0.0" - readable-stream: "npm:^3.6.0" - checksum: 10c0/375f753c10329153c8d66dc95e8f8b6c7cc2aa66e05cb0960bd69092b10dae22900cacc7d653ad11d26b3ecbdbfe1e8bfb6ccf0265ba8077a7d979970f16b99c - languageName: node - linkType: hard - "are-we-there-yet@npm:~1.1.2": version: 1.1.7 resolution: "are-we-there-yet@npm:1.1.7" @@ -6762,29 +6847,6 @@ __metadata: languageName: node linkType: hard -"canvas@npm:3.1.0": - version: 3.1.0 - resolution: "canvas@npm:3.1.0" - dependencies: - node-addon-api: "npm:^7.0.0" - node-gyp: "npm:latest" - prebuild-install: "npm:^7.1.1" - checksum: 10c0/28da5184c1d7e97049ba6a24f10690b9ed4b303bbd25517d95c892fa3a6331417791657a3a7467068e40af0dda2dcc9120d062f7426a3d796131e69a30e3cbf1 - languageName: node - linkType: hard - -"canvas@npm:^2.11.2": - version: 2.11.2 - resolution: "canvas@npm:2.11.2" - dependencies: - "@mapbox/node-pre-gyp": "npm:^1.0.0" - nan: "npm:^2.17.0" - node-gyp: "npm:latest" - simple-get: "npm:^3.0.3" - checksum: 10c0/943368798ad1b66b18633aa34b6181e1038dac5433fc9727cd07be35f0a633f572b60d9edb95f5ff90b6a9128e86d5312035f91a2934101c73185b15d906230a - languageName: node - linkType: hard - "ccount@npm:^1.0.0": version: 1.1.0 resolution: "ccount@npm:1.1.0" @@ -7145,15 +7207,6 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.2": - version: 1.1.3 - resolution: "color-support@npm:1.1.3" - bin: - color-support: bin.js - checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6 - languageName: node - linkType: hard - "color@npm:^5.0.0": version: 5.0.0 resolution: "color@npm:5.0.0" @@ -7305,7 +7358,7 @@ __metadata: languageName: node linkType: hard -"console-control-strings@npm:^1.0.0, console-control-strings@npm:^1.1.0, console-control-strings@npm:~1.1.0": +"console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50 @@ -8233,13 +8286,6 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.0": - version: 2.0.4 - resolution: "detect-libc@npm:2.0.4" - checksum: 10c0/c15541f836eba4b1f521e4eecc28eefefdbc10a94d3b8cb4c507689f332cc111babb95deda66f2de050b22122113189986d5190be97d51b5a2b23b938415e67c - languageName: node - linkType: hard - "detect-libc@npm:^2.0.1": version: 2.0.3 resolution: "detect-libc@npm:2.0.3" @@ -10124,23 +10170,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^3.0.0": - version: 3.0.2 - resolution: "gauge@npm:3.0.2" - dependencies: - aproba: "npm:^1.0.3 || ^2.0.0" - color-support: "npm:^1.1.2" - console-control-strings: "npm:^1.0.0" - has-unicode: "npm:^2.0.1" - object-assign: "npm:^4.1.1" - signal-exit: "npm:^3.0.0" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - wide-align: "npm:^1.1.2" - checksum: 10c0/75230ccaf216471e31025c7d5fcea1629596ca20792de50c596eb18ffb14d8404f927cd55535aab2eeecd18d1e11bd6f23ec3c2e9878d2dda1dc74bccc34b913 - languageName: node - linkType: hard - "gauge@npm:~2.7.3": version: 2.7.4 resolution: "gauge@npm:2.7.4" @@ -10523,7 +10552,7 @@ __metadata: languageName: node linkType: hard -"has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1": +"has-unicode@npm:^2.0.0": version: 2.0.1 resolution: "has-unicode@npm:2.0.1" checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c @@ -12265,15 +12294,6 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.1.0": - version: 3.1.0 - resolution: "make-dir@npm:3.1.0" - dependencies: - semver: "npm:^6.0.0" - checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa - languageName: node - linkType: hard - "make-dir@npm:^4.0.0": version: 4.0.0 resolution: "make-dir@npm:4.0.0" @@ -13759,15 +13779,6 @@ __metadata: languageName: node linkType: hard -"nan@npm:^2.17.0": - version: 2.22.2 - resolution: "nan@npm:2.22.2" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/971f963b8120631880fa47a389c71b00cadc1c1b00ef8f147782a3f4387d4fc8195d0695911272d57438c11562fb27b24c4ae5f8c05d5e4eeb4478ba51bb73c5 - languageName: node - linkType: hard - "nanoid@npm:^3.3.7, nanoid@npm:^3.3.8": version: 3.3.11 resolution: "nanoid@npm:3.3.11" @@ -13793,13 +13804,6 @@ __metadata: languageName: node linkType: hard -"napi-build-utils@npm:^2.0.0": - version: 2.0.0 - resolution: "napi-build-utils@npm:2.0.0" - checksum: 10c0/5833aaeb5cc5c173da47a102efa4680a95842c13e0d9cc70428bd3ee8d96bb2172f8860d2811799b5daa5cbeda779933601492a2028a6a5351c6d0fcf6de83db - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -13844,15 +13848,6 @@ __metadata: languageName: node linkType: hard -"node-abi@npm:^3.3.0": - version: 3.75.0 - resolution: "node-abi@npm:3.75.0" - dependencies: - semver: "npm:^7.3.5" - checksum: 10c0/c43a2409407df3737848fd96202b0a49e15039994aecce963969e9ef7342a8fc544aba94e0bfd8155fb9de5f5fe9a4b6ccad8bf509e7c46caf096fc4491d63f2 - languageName: node - linkType: hard - "node-abi@npm:^3.45.0": version: 3.74.0 resolution: "node-abi@npm:3.74.0" @@ -13996,17 +13991,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^5.0.0": - version: 5.0.0 - resolution: "nopt@npm:5.0.0" - dependencies: - abbrev: "npm:1" - bin: - nopt: bin/nopt.js - checksum: 10c0/fc5c4f07155cb455bf5fc3dd149fac421c1a40fd83c6bfe83aa82b52f02c17c5e88301321318adaa27611c8a6811423d51d29deaceab5fa158b585a61a551061 - languageName: node - linkType: hard - "nopt@npm:^6.0.0": version: 6.0.0 resolution: "nopt@npm:6.0.0" @@ -14071,18 +14055,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^5.0.1": - version: 5.0.1 - resolution: "npmlog@npm:5.0.1" - dependencies: - are-we-there-yet: "npm:^2.0.0" - console-control-strings: "npm:^1.1.0" - gauge: "npm:^3.0.0" - set-blocking: "npm:^2.0.0" - checksum: 10c0/489ba519031013001135c463406f55491a17fc7da295c18a04937fe3a4d523fd65e88dd418a28b967ab743d913fdeba1e29838ce0ad8c75557057c481f7d49fa - languageName: node - linkType: hard - "npx-scope-finder@npm:^1.2.0": version: 1.3.0 resolution: "npx-scope-finder@npm:1.3.0" @@ -14104,7 +14076,7 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": +"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.0": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 @@ -14648,13 +14620,6 @@ __metadata: languageName: node linkType: hard -"path2d@npm:^0.2.0": - version: 0.2.2 - resolution: "path2d@npm:0.2.2" - checksum: 10c0/1bb76c7f275d07f1bc7ca12171d828e91bf8a12596f0765a52e9d4d47fe1a428455dc1dd4c9002924a9bc554f6ac25e09a6c22eaecf32e5e33fba2985b5168f8 - languageName: node - linkType: hard - "pathe@npm:^2.0.1, pathe@npm:^2.0.3": version: 2.0.3 resolution: "pathe@npm:2.0.3" @@ -14689,30 +14654,15 @@ __metadata: languageName: node linkType: hard -"pdf-to-img@npm:^4.4.0": - version: 4.5.0 - resolution: "pdf-to-img@npm:4.5.0" +"pdfjs-dist@npm:4.10.38, pdfjs-dist@npm:^4.10.38": + version: 4.10.38 + resolution: "pdfjs-dist@npm:4.10.38" dependencies: - canvas: "npm:3.1.0" - pdfjs-dist: "npm:4.2.67" - bin: - pdf2img: bin/cli.mjs - checksum: 10c0/b7df570dc70acc88829e3583b3d89676f03ee9c36af2d53e8530190ecf5b04f263d927d704d2e40334f1f18b97387f2ae640e4b6532b33a5c8b828fe853f55cb - languageName: node - linkType: hard - -"pdfjs-dist@npm:4.2.67": - version: 4.2.67 - resolution: "pdfjs-dist@npm:4.2.67" - dependencies: - canvas: "npm:^2.11.2" - path2d: "npm:^0.2.0" + "@napi-rs/canvas": "npm:^0.1.65" dependenciesMeta: - canvas: + "@napi-rs/canvas": optional: true - path2d: - optional: true - checksum: 10c0/1d6d427a2253b2c15cbb168d7f95fc26428134ff61113359653c36f92475a4abd8552913b1492489933304ccc4285328b5cbcff36825ae533b8cd4c279881348 + checksum: 10c0/77b022109be7aac00372750a53decea3979409e6ef1cf93bf554351569cd4d1fafc70afae4a9a3e4b4de3facf59d3acd54d324b0fcff781374bcb00493d449ce languageName: node linkType: hard @@ -14955,28 +14905,6 @@ __metadata: languageName: node linkType: hard -"prebuild-install@npm:^7.1.1": - version: 7.1.3 - resolution: "prebuild-install@npm:7.1.3" - dependencies: - detect-libc: "npm:^2.0.0" - expand-template: "npm:^2.0.3" - github-from-package: "npm:0.0.0" - minimist: "npm:^1.2.3" - mkdirp-classic: "npm:^0.5.3" - napi-build-utils: "npm:^2.0.0" - node-abi: "npm:^3.3.0" - pump: "npm:^3.0.0" - rc: "npm:^1.2.7" - simple-get: "npm:^4.0.0" - tar-fs: "npm:^2.0.0" - tunnel-agent: "npm:^0.6.0" - bin: - prebuild-install: bin.js - checksum: 10c0/25919a42b52734606a4036ab492d37cfe8b601273d8dfb1fa3c84e141a0a475e7bad3ab848c741d2f810cef892fcf6059b8c7fe5b29f98d30e0c29ad009bedff - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -15978,7 +15906,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": +"readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -16729,7 +16657,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.1": +"semver@npm:^6.2.0, semver@npm:^6.3.1": version: 6.3.1 resolution: "semver@npm:6.3.1" bin: @@ -16787,7 +16715,7 @@ __metadata: languageName: node linkType: hard -"set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0": +"set-blocking@npm:~2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 @@ -16934,17 +16862,6 @@ __metadata: languageName: node linkType: hard -"simple-get@npm:^4.0.0": - version: 4.0.1 - resolution: "simple-get@npm:4.0.1" - dependencies: - decompress-response: "npm:^6.0.0" - once: "npm:^1.3.1" - simple-concat: "npm:^1.0.0" - checksum: 10c0/b0649a581dbca741babb960423248899203165769747142033479a7dc5e77d7b0fced0253c731cd57cf21e31e4d77c9157c3069f4448d558ebc96cf9e1eebcf0 - languageName: node - linkType: hard - "simple-update-notifier@npm:2.0.0": version: 2.0.0 resolution: "simple-update-notifier@npm:2.0.0" @@ -18854,7 +18771,7 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2": +"wide-align@npm:^1.1.0": version: 1.1.5 resolution: "wide-align@npm:1.1.5" dependencies: