Merge branch 'release-2.12' into dev

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.12.15",
+  "version": "2.12.16",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -108,7 +108,7 @@
   },
   "homepage": "https://github.com/laurent22/joplin#readme",
   "devDependencies": {
-    "@electron/rebuild": "3.2.13",
+    "@electron/rebuild": "3.3.0",
     "@joplin/tools": "~2.12",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.5.3",

yarn.lock

@@ -3534,7 +3534,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@electron/rebuild@npm:3.2.13, @electron/rebuild@npm:^3.2.13":
+"@electron/rebuild@npm:3.3.0":
+  version: 3.3.0
+  resolution: "@electron/rebuild@npm:3.3.0"
+  dependencies:
+    "@malept/cross-spawn-promise": ^2.0.0
+    chalk: ^4.0.0
+    debug: ^4.1.1
+    detect-libc: ^2.0.1
+    fs-extra: ^10.0.0
+    got: ^11.7.0
+    node-abi: ^3.45.0
+    node-api-version: ^0.1.4
+    node-gyp: ^9.0.0
+    ora: ^5.1.0
+    semver: ^7.3.5
+    tar: ^6.0.5
+    yargs: ^17.0.1
+  bin:
+    electron-rebuild: lib/cli.js
+  checksum: 95d2fdc392d30c3fde7f87a2dfa4bdd4663b77685497329eb21622cdb4c46dc3eb504636647e0df93a1d8c2319282d1f0dd0212626a1f23755b0990c3f0d135d
+  languageName: node
+  linkType: hard
+
+"@electron/rebuild@npm:^3.2.13":
   version: 3.2.13
   resolution: "@electron/rebuild@npm:3.2.13"
   dependencies:
@@ -4467,7 +4490,7 @@ __metadata:
     7zip-bin-mac: ^1.0.1
     7zip-bin-win: ^2.1.1
     "@electron/notarize": 1.2.4
-    "@electron/rebuild": 3.2.13
+    "@electron/rebuild": 3.3.0
     "@electron/remote": 2.0.10
     "@fortawesome/fontawesome-free": 5.15.4
     "@joeattardi/emoji-button": 4.6.4
@@ -25108,6 +25131,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-abi@npm:^3.45.0":
+  version: 3.47.0
+  resolution: "node-abi@npm:3.47.0"
+  dependencies:
+    semver: ^7.3.5
+  checksum: ff8498dcd4a805ebf0af27162023bb17e56cb973c955d6c411ebce0938b0827e34323ede846b635daff516d5cd2ea8d64f9d99f2d63f61d1d7469415323fa9a6
+  languageName: node
+  linkType: hard
+
 "node-addon-api@npm:^1.6.3":
   version: 1.7.2
   resolution: "node-addon-api@npm:1.7.2"