Desktop: Fixes #11508: Upgrade electron-builder and `@electron/rebu…

…ild` (#11512)
laurent22 · Dec 17, 2024 · ac28d31 · ac28d31
1 parent b147cc6
commit ac28d31
Show file tree

Hide file tree

Showing 5 changed files with 270 additions and 182 deletions.
diff --git a/.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch b/.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch
diff --git a/package.json b/package.json
@@ -105,7 +105,6 @@
     "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
     "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
     "eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
-    "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
     "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
     "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch",

diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
@@ -115,8 +115,10 @@
       "icon": "../../Assets/LinuxIcons",
       "category": "Office",
       "desktop": {
-        "Icon": "joplin",
-        "MimeType": "x-scheme-handler/joplin;"
+        "entry": {
+          "Icon": "joplin",
+          "MimeType": "x-scheme-handler/joplin;"
+        }
       },
       "target": ["AppImage", "deb"],
       "executableName": "joplin",
@@ -128,7 +130,7 @@
   "devDependencies": {
     "7zip-bin": "5.2.0",
     "@axe-core/playwright": "4.10.0",
-    "@electron/rebuild": "3.6.0",
+    "@electron/rebuild": "3.7.1",
     "@joplin/default-plugins": "~3.2",
     "@joplin/tools": "~3.2",
     "@playwright/test": "1.45.3",
@@ -142,7 +144,7 @@
     "@types/tesseract.js": "2.0.0",
     "axios": "^1.7.7",
     "electron": "32.2.0",
-    "electron-builder": "24.13.3",
+    "electron-builder": "26.0.0-alpha.7",
     "glob": "10.4.5",
     "gulp": "4.0.2",
     "jest": "29.7.0",

diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -28,7 +28,6 @@
     "@types/node-rsa": "1.1.4",
     "@types/react": "18.3.3",
     "@types/uuid": "9.0.7",
-    "canvas": "2.11.2",
     "clean-html": "1.5.0",
     "jest": "29.7.0",
     "jsdom": "23.2.0",