301194963b
一些检查失败了
automerge / automerge (push) Has been cancelled
react-native-android-build-apk / AssembleRelease (push) Has been cancelled
Build macOS M1 / Main (push) Has been cancelled
Joplin Continuous Integration / Main (macos-15-intel) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / Main (ubuntu-22.04-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-11-vs2026-arm) (push) Has been cancelled
Joplin Continuous Integration / Main (windows-2025) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04) (push) Has been cancelled
Joplin Continuous Integration / ServerDockerImage (ubuntu-22.04-arm) (push) Has been cancelled
Joplin UI tests / Main (ubuntu-22.04) (push) Has been cancelled
Joplin UI tests / Main (windows-2025) (push) Has been cancelled
Joplin UI tests / Mobile (push) Has been cancelled
Close stale issues / ProcessStaleIssues (push) Has been cancelled
32 行
1.2 KiB
Diff
32 行
1.2 KiB
Diff
|
|
# We remove the `canvas` optional dependency because electron-rebuild fails to build it, and
|
|
# the `canvas` API is already part of Electron
|
|
diff --git a/build/pdf.js b/build/pdf.js
|
|
index 4acf16b1d6f9351bda1a98649ea4f926618fe617..f63dbc6050ca63ca8e8ed982edea134103fa15dd 100644
|
|
--- a/build/pdf.js
|
|
+++ b/build/pdf.js
|
|
@@ -6244,8 +6244,9 @@ class NodeFilterFactory extends _base_factory.BaseFilterFactory {}
|
|
exports.NodeFilterFactory = NodeFilterFactory;
|
|
class NodeCanvasFactory extends _base_factory.BaseCanvasFactory {
|
|
_createCanvas(width, height) {
|
|
- const Canvas = require("canvas");
|
|
- return Canvas.createCanvas(width, height);
|
|
+ throw new Error('Node canvas disabled');
|
|
+ // const Canvas = require("canvas");
|
|
+ // return Canvas.createCanvas(width, height);
|
|
}
|
|
}
|
|
exports.NodeCanvasFactory = NodeCanvasFactory;
|
|
diff --git a/package.json b/package.json
|
|
index 105811f53d508486e08a60dc1b6e437cd24d7427..dea6a4e6612c4a4006cc482e46ff5270dcfda1e5 100644
|
|
--- a/package.json
|
|
+++ b/package.json
|
|
@@ -13,7 +13,6 @@
|
|
"bugs": "https://github.com/mozilla/pdf.js/issues",
|
|
"license": "Apache-2.0",
|
|
"optionalDependencies": {
|
|
- "canvas": "^2.11.2",
|
|
"path2d-polyfill": "^2.0.1"
|
|
},
|
|
"browser": {
|