A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
desktop: update electron to v31
Abdullah Atta84b3892053a1
diff --git a/apps/desktop/package-lock.json b/apps/desktop/package-lock.jsonindex f52edc899..a69353a5a 100644--- a/apps/desktop/package-lock.json+++ b/apps/desktop/package-lock.json@@ -1,12 +1,12 @@{"name": "@notesnook/desktop",- "version": "3.0.18",+ "version": "3.0.19","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "@notesnook/desktop",- "version": "3.0.18",+ "version": "3.0.19","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {@@ -27,8 +27,8 @@"@types/node": "22.7.0","@types/yargs": "^17.0.33","chokidar": "^4.0.1",- "electron": "^30.5.1",- "electron-builder": "^25.1.7",+ "electron": "^31.7.4",+ "electron-builder": "^25.1.8","esbuild": "^0.24.0","node-abi": "^3.68.0","node-gyp-build": "^4.8.2",@@ -102,13 +102,12 @@}},"node_modules/@electron/asar": {- "version": "3.2.13",- "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.13.tgz",- "integrity": "sha512-pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg==",+ "version": "3.2.17",+ "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.17.tgz",+ "integrity": "sha512-OcWImUI686w8LkghQj9R2ynZ2ME693Ek6L1SiaAgqGKzBaTIZw3fHDqN82Rcl+EU1Gm9EgkJ5KLIY/q5DCRbbA==","dev": true,"license": "MIT","dependencies": {- "@types/glob": "^7.1.0","commander": "^5.0.0","glob": "^7.1.6","minimatch": "^3.0.4"@@ -1366,17 +1365,6 @@"@types/node": "*"}},- "node_modules/@types/glob": {- "version": "7.2.0",- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",- "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",- "dev": true,- "license": "MIT",- "dependencies": {- "@types/minimatch": "*",- "@types/node": "*"- }- },"node_modules/@types/http-cache-semantics": {"version": "4.0.4","resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",@@ -1392,13 +1380,6 @@"@types/node": "*"}},- "node_modules/@types/minimatch": {- "version": "5.1.2",- "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",- "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",- "dev": true,- "license": "MIT"- },"node_modules/@types/ms": {"version": "0.7.34","resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz",@@ -1599,9 +1580,9 @@"license": "MIT"},"node_modules/app-builder-lib": {- "version": "25.1.7",- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.7.tgz",- "integrity": "sha512-JxmN+D/Dn7BLQoN+cTFO+zbMHcpI10v/xjyjFO1FKpHbApOG+OQt/xUyVjKWp4FYplIfuHdpxqTXo1PN/Wzm/A==",+ "version": "25.1.8",+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz",+ "integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==","dev": true,"license": "MIT","dependencies": {@@ -1642,8 +1623,8 @@"node": ">=14.0.0"},"peerDependencies": {- "dmg-builder": "25.1.7",- "electron-builder-squirrel-windows": "25.1.7"+ "dmg-builder": "25.1.8",+ "electron-builder-squirrel-windows": "25.1.8"}},"node_modules/app-builder-lib/node_modules/fs-extra": {@@ -2525,9 +2506,9 @@}},"node_modules/cross-spawn": {- "version": "7.0.3",- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",+ "version": "7.0.5",+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",+ "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==","dev": true,"license": "MIT","dependencies": {@@ -2758,13 +2739,13 @@}},"node_modules/dmg-builder": {- "version": "25.1.7",- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.7.tgz",- "integrity": "sha512-Hac0AfXQrAV62JT99Had6bvUJb/f7vjJTaLOsmA/gAQcrc/cLmNAqCJ0ZZDqwKy2+LKXnxx45TvMXvovKd4iMg==",+ "version": "25.1.8",+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz",+ "integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==","dev": true,"license": "MIT","dependencies": {- "app-builder-lib": "25.1.7",+ "app-builder-lib": "25.1.8","builder-util": "25.1.7","builder-util-runtime": "9.2.10","fs-extra": "^10.1.0",@@ -2853,13 +2834,13 @@}},"node_modules/dotenv-expand": {- "version": "11.0.6",- "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz",- "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==",+ "version": "11.0.7",+ "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",+ "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==","dev": true,"license": "BSD-2-Clause","dependencies": {- "dotenv": "^16.4.4"+ "dotenv": "^16.4.5"},"engines": {"node": ">=12"@@ -2892,9 +2873,9 @@}},"node_modules/electron": {- "version": "30.5.1",- "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz",- "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==",+ "version": "31.7.4",+ "resolved": "https://registry.npmjs.org/electron/-/electron-31.7.4.tgz",+ "integrity": "sha512-uvSxcYq349bbCp60vmsTJGviI0pBfrvZK+YQHs3L0nzhZeBin0+o7bC1j3vmK+CeTxAZlWWjtgtc3z7XYrHm5w==","hasInstallScript": true,"license": "MIT","dependencies": {@@ -2910,17 +2891,17 @@}},"node_modules/electron-builder": {- "version": "25.1.7",- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.7.tgz",- "integrity": "sha512-lsKtX93GSHWnmuteNRvBzgJIjRiiYB0qrJVRjShwBi75Ns+mRdWeOGZiXItqOWj+3g5UyY722kgoq2WlqCB87A==",+ "version": "25.1.8",+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz",+ "integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==","dev": true,"license": "MIT","dependencies": {- "app-builder-lib": "25.1.7",+ "app-builder-lib": "25.1.8","builder-util": "25.1.7","builder-util-runtime": "9.2.10","chalk": "^4.1.2",- "dmg-builder": "25.1.7",+ "dmg-builder": "25.1.8","fs-extra": "^10.1.0","is-ci": "^3.0.0","lazy-val": "^1.0.5",@@ -2936,14 +2917,14 @@}},"node_modules/electron-builder-squirrel-windows": {- "version": "25.1.7",- "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.1.7.tgz",- "integrity": "sha512-nJMvw1FNy+6YP8HmjSb0JwMowpdlZpydZGab9KevKO/fIC9wTcr5rkhbLsTfEPOjdAqOTycRoK0mOJCFB/1uig==",+ "version": "25.1.8",+ "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.1.8.tgz",+ "integrity": "sha512-2ntkJ+9+0GFP6nAISiMabKt6eqBB0kX1QqHNWFWAXgi0VULKGisM46luRFpIBiU3u/TDmhZMM8tzvo2Abn3ayg==","dev": true,"license": "MIT","peer": true,"dependencies": {- "app-builder-lib": "25.1.7",+ "app-builder-lib": "25.1.8","archiver": "^5.3.1","builder-util": "25.1.7","fs-extra": "^10.1.0"@@ -3470,9 +3451,9 @@}},"node_modules/form-data": {- "version": "4.0.0",- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",- "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",+ "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==","dev": true,"license": "MIT","dependencies": {@@ -4087,9 +4068,9 @@"peer": true},"node_modules/isbinaryfile": {- "version": "5.0.2",- "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.2.tgz",- "integrity": "sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg==",+ "version": "5.0.4",+ "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.4.tgz",+ "integrity": "sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==","dev": true,"license": "MIT","engines": {@@ -4720,9 +4701,9 @@"license": "MIT"},"node_modules/negotiator": {- "version": "0.6.3",- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",+ "version": "0.6.4",+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",+ "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==","dev": true,"license": "MIT","engines": {@@ -5394,9 +5375,9 @@}},"node_modules/resedit": {- "version": "1.7.1",- "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.1.tgz",- "integrity": "sha512-/FJ6/gKAXbcHtivannhecWsa43kGVFK3aHHv9Jm3x0eFiM31MoGihkAOWbm3UsvjYLRVw0zTkfARy2dI96JL1Q==",+ "version": "1.7.2",+ "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",+ "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==","dev": true,"license": "MIT","dependencies": {@@ -6156,9 +6137,9 @@}},"node_modules/typescript": {- "version": "5.6.2",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",- "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",+ "version": "5.6.3",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",+ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==","dev": true,"license": "Apache-2.0","bin": {diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex b3724c13f..998bfb822 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -5,18 +5,19 @@"version": "3.0.18","appAppleId": "1544027013","private": true,- "main": "./dist/index.js",- "module": "./dist/index.mjs",- "types": "./dist/index.d.ts",+ "main": "./dist/cjs/index.js",+ "module": "./dist/esm/index.js",+ "types": "./dist/types/index.d.ts",+ "sideEffects": false,"exports": {".": {"require": {- "types": "./dist/index.d.ts",- "default": "./dist/index.js"+ "types": "./dist/types/index.d.ts",+ "default": "./dist/cjs/index.js"},"import": {- "types": "./dist/index.d.mts",- "default": "./dist/index.mjs"+ "types": "./dist/types/index.d.ts",+ "default": "./dist/esm/index.js"}}},@@ -41,8 +42,8 @@"@types/node": "22.7.0","@types/yargs": "^17.0.33","chokidar": "^4.0.1",- "electron": "^30.5.1",- "electron-builder": "^25.1.7",+ "electron": "^31.7.4",+ "electron-builder": "^25.1.8","esbuild": "^0.24.0","node-abi": "^3.68.0","node-gyp-build": "^4.8.2",@@ -57,7 +58,7 @@"start": "node scripts/dev.mjs","staging": "node scripts/build.mjs --run","release": "node scripts/build.mjs",- "build": "tsup-node src/index.ts",+ "build": "node ../../scripts/build.mjs","bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --external:better-sqlite3-multiple-ciphers --external:sodium-native --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true","bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true","postinstall": "patch-package"@@ -162,10 +163,12 @@]}],- "signingHashAlgorithms": [- "sha256"- ],- "sign": "./scripts/sign.js",+ "signtoolOptions": {+ "signingHashAlgorithms": [+ "sha256"+ ],+ "sign": "./scripts/sign.js"+ },"icon": "assets/icons/app.ico"},"portable": {diff --git a/apps/desktop/src/utils/asset-manager.ts b/apps/desktop/src/utils/asset-manager.tsindex ed4c3a48e..c8f7b959a 100644--- a/apps/desktop/src/utils/asset-manager.ts+++ b/apps/desktop/src/utils/asset-manager.ts@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { NativeImage, nativeImage } from "electron";import path from "path";import { isDevelopment } from "./index";-// @ts-expect-error stupid icojsimport { ParsedImage, parseICO } from "icojs";import { getSystemTheme } from "./theme";import { readFile } from "fs/promises";diff --git a/apps/desktop/src/utils/theme.ts b/apps/desktop/src/utils/theme.tsindex ca4528e2b..902a4b79e 100644--- a/apps/desktop/src/utils/theme.ts+++ b/apps/desktop/src/utils/theme.ts@@ -57,7 +57,8 @@ function getSystemTheme() {nativeTheme.themeSource = oldThemeSource;setTimeout(- () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),+ () =>+ listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),1000);return currentTheme;@@ -72,7 +73,8 @@ function changeTheme(theme: Theme) {nativeTheme.themeSource = theme;setTimeout(- () => listeners.forEach((a) => nativeTheme.addListener("updated", a)),+ () =>+ listeners.forEach((a) => nativeTheme.addListener("updated", () => a())),1000);}diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.jsonindex 7aee472c8..c5f8b44da 100644--- a/apps/desktop/tsconfig.json+++ b/apps/desktop/tsconfig.json@@ -3,8 +3,7 @@"compilerOptions": {"outDir": "./dist/","lib": ["ESNext"],- "moduleResolution": "nodenext",- "module": "nodenext"+ "moduleResolution": "Bundler"},"include": ["src", "global.d.ts"]}