Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] ⬆️ (electron) upgrade electron dependencies #2844

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@actual-app/crdt": "workspace:^",
"better-sqlite3": "^9.6.0",
"better-sqlite3": "^11.0.0",
"compare-versions": "^6.1.0",
"node-fetch": "^3.3.2",
"uuid": "^9.0.1"
Expand Down
1 change: 1 addition & 0 deletions packages/desktop-client/src/components/tooltips.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export class Tooltip extends Component<TooltipProps> {
contentRef: RefObject<HTMLDivElement>;
cleanup: () => void;
target: HTMLDivElement;
// @ts-expect-error the Tooltip component will soon be removed; OK to ignore issues for now..
context: ContextType<typeof IntersectionBoundary> = this.context; // assign type to context without using declare.

constructor(props) {
Expand Down
1 change: 1 addition & 0 deletions packages/desktop-client/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export async function installPolyfills(): Promise<void> {
const module = await import(
/* webpackChunkName: 'resize-observer-polyfill' */ '@juggle/resize-observer'
);
// @ts-expect-error fix me
window.ResizeObserver = module.ResizeObserver;
}
}
2 changes: 1 addition & 1 deletion packages/desktop-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@electron/notarize": "2.2.0",
"@electron/rebuild": "3.6.0",
"cross-env": "^7.0.3",
"electron": "30.0.6",
"electron": "30.0.9",
"electron-builder": "24.13.3"
}
}
4 changes: 2 additions & 2 deletions packages/loot-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@rschedule/standard-date-adapter": "^1.5.0",
"absurd-sql": "0.0.54",
"adm-zip": "^0.5.10",
"better-sqlite3": "^9.6.0",
"better-sqlite3": "^11.0.0",
"csv-parse": "^4.16.3",
"csv-stringify": "^5.6.5",
"date-fns": "^2.30.0",
Expand All @@ -44,7 +44,7 @@
"@swc/helpers": "^0.5.11",
"@swc/jest": "^0.2.36",
"@types/adm-zip": "^0.5.0",
"@types/better-sqlite3": "^7.6.8",
"@types/better-sqlite3": "^7.6.10",
"@types/jest": "^27.5.2",
"@types/jlongster__sql.js": "npm:@types/sql.js@latest",
"@types/pegjs": "^0.10.3",
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/2844.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Bugfix
authors: [MatissJanis]
---

Desktop - fix loading budget files in MacOS; upgrade electron dependencies
149 changes: 79 additions & 70 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ __metadata:
"@swc/jest": "npm:^0.2.36"
"@types/jest": "npm:^27.5.2"
"@types/uuid": "npm:^9.0.2"
better-sqlite3: "npm:^9.6.0"
better-sqlite3: "npm:^11.0.0"
compare-versions: "npm:^6.1.0"
jest: "npm:^27.5.1"
node-fetch: "npm:^3.3.2"
Expand Down Expand Up @@ -1792,16 +1792,15 @@ __metadata:
linkType: hard

"@electron/asar@npm:^3.2.1":
version: 3.2.4
resolution: "@electron/asar@npm:3.2.4"
version: 3.2.10
resolution: "@electron/asar@npm:3.2.10"
dependencies:
chromium-pickle-js: "npm:^0.2.0"
commander: "npm:^5.0.0"
glob: "npm:^7.1.6"
minimatch: "npm:^3.0.4"
bin:
asar: bin/asar.js
checksum: 22cdef5ad3d71a1cdce85f12d9dd674f5fd58f1d91d8a72ef64c5887b9bd075bf676341bcdc85de91f4218cccf3ed35a6eaebf68813a0c83579947901ee301e2
checksum: 2ead53564c430fd4252a76e754936aab144e4aea968b2d9b06c8327d6a7ca9c082a1230d9e00f79d8087f3882c1a76f95c638c3290c7b0e76d8ebed2d552f97b
languageName: node
linkType: hard

Expand Down Expand Up @@ -5245,12 +5244,12 @@ __metadata:
languageName: node
linkType: hard

"@types/better-sqlite3@npm:^7.6.8":
version: 7.6.8
resolution: "@types/better-sqlite3@npm:7.6.8"
"@types/better-sqlite3@npm:^7.6.10":
version: 7.6.10
resolution: "@types/better-sqlite3@npm:7.6.10"
dependencies:
"@types/node": "npm:*"
checksum: 404e9b7210564866b0f8878353cc6a16c6ffb313077cbb5aec6176ad2b0a30f64236f03f0a40d36d86bf4eab7658bdcd6d6a8a65dc377de7910fc9e9932885a4
checksum: 7bb4d86f1ce05e91808fcecf90d928833b187d82688afbfa68ef0e73141a09c400cb4bdec94e838671da64e3ae8a94cc0f75c8502dcdbe84d79cd3a00d91692e
languageName: node
linkType: hard

Expand Down Expand Up @@ -6938,14 +6937,14 @@ __metadata:
languageName: node
linkType: hard

"better-sqlite3@npm:^9.6.0":
version: 9.6.0
resolution: "better-sqlite3@npm:9.6.0"
"better-sqlite3@npm:^11.0.0":
version: 11.0.0
resolution: "better-sqlite3@npm:11.0.0"
dependencies:
bindings: "npm:^1.5.0"
node-gyp: "npm:latest"
prebuild-install: "npm:^7.1.1"
checksum: 06b3d95221071a06c2e22a9746d9b7049c0bce7962e5e3290ccf088fffbf4d4d52868f0d98b8ae2565fe33b1adab89823145f23c6f6eb63ecc4fc1b883f9082c
checksum: 2fe3743ff5744cac0b76a7d4eb0b1318f576bdaf643ab994f4ae257082063c5649a878e3748e55ca2ae1b457afb327ca123d5961d0f6e4b53a165a91c024d1b3
languageName: node
linkType: hard

Expand Down Expand Up @@ -8486,7 +8485,7 @@ __metadata:
"@electron/notarize": "npm:2.2.0"
"@electron/rebuild": "npm:3.6.0"
cross-env: "npm:^7.0.3"
electron: "npm:30.0.6"
electron: "npm:30.0.9"
electron-builder: "npm:24.13.3"
electron-is-dev: "npm:2.0.0"
electron-log: "npm:4.4.8"
Expand Down Expand Up @@ -8866,16 +8865,16 @@ __metadata:
languageName: node
linkType: hard

"electron@npm:30.0.6":
version: 30.0.6
resolution: "electron@npm:30.0.6"
"electron@npm:30.0.9":
version: 30.0.9
resolution: "electron@npm:30.0.9"
dependencies:
"@electron/get": "npm:^2.0.0"
"@types/node": "npm:^20.9.0"
extract-zip: "npm:^2.0.1"
bin:
electron: cli.js
checksum: 3e48725701c348d6152cbed53266bb349b93687ba241a051235af6425e509413d1430a3b50e9be9dd153996eee2c2e9ab529cc16f58b28589db679effb69a2f8
checksum: 8ffcc8fd594b26ed176227151b247f28e65a4292940a755e30e931b09867ae0b334e043119f02aaf41b7bccf1e7a571d34c27cd5721de425cf198ac9f4af9b53
languageName: node
linkType: hard

Expand Down Expand Up @@ -10498,17 +10497,17 @@ __metadata:
linkType: hard

"glob@npm:^10.2.2":
version: 10.3.4
resolution: "glob@npm:10.3.4"
version: 10.4.1
resolution: "glob@npm:10.4.1"
dependencies:
foreground-child: "npm:^3.1.0"
jackspeak: "npm:^2.0.3"
minimatch: "npm:^9.0.1"
minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
path-scurry: "npm:^1.10.1"
jackspeak: "npm:^3.1.2"
minimatch: "npm:^9.0.4"
minipass: "npm:^7.1.2"
path-scurry: "npm:^1.11.1"
bin:
glob: dist/cjs/src/bin.js
checksum: 6375721bcd0c615fe4c1d61faaf9eb93e15d428f26bac6e85739221a84659b42601b2a085b20915142c0eb3d8a7155914884ff80f145d8c9f2397c8b771b8b60
glob: dist/esm/bin.mjs
checksum: d7bb49d2b413f77bdd59fea4ca86dcc12450deee221af0ca93e09534b81b9ef68fe341345751d8ff0c5b54bad422307e0e44266ff8ad7fbbd0c200e8ec258b16
languageName: node
linkType: hard

Expand Down Expand Up @@ -11118,10 +11117,13 @@ __metadata:
languageName: node
linkType: hard

"ip@npm:^2.0.0":
version: 2.0.0
resolution: "ip@npm:2.0.0"
checksum: 1270b11e534a466fb4cf4426cbcc3a907c429389f7f4e4e3b288b42823562e88d6a509ceda8141a507de147ca506141f745005c0aa144569d94cf24a54eb52bc
"ip-address@npm:^9.0.5":
version: 9.0.5
resolution: "ip-address@npm:9.0.5"
dependencies:
jsbn: "npm:1.1.0"
sprintf-js: "npm:^1.1.3"
checksum: 1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c
languageName: node
linkType: hard

Expand Down Expand Up @@ -11715,16 +11717,16 @@ __metadata:
languageName: node
linkType: hard

"jackspeak@npm:^2.0.3":
version: 2.3.3
resolution: "jackspeak@npm:2.3.3"
"jackspeak@npm:^3.1.2":
version: 3.3.0
resolution: "jackspeak@npm:3.3.0"
dependencies:
"@isaacs/cliui": "npm:^8.0.2"
"@pkgjs/parseargs": "npm:^0.11.0"
dependenciesMeta:
"@pkgjs/parseargs":
optional: true
checksum: a4c7c1a3ffea90bbcaa2f7a0d2885861e94138982aef0ced8efd299b32ccb69645b49d27f5e3e81c57005002674dd7e2b5d08a4287e9110534e512ada53557b2
checksum: 8a72147e68cfbb8714fff4305a8b2efe02ae7ac81116355132740156973f6e520e339f8e23b01834d9f9431afd3e4616e4613f66571e0b13b9d0d52c65d3d633
languageName: node
linkType: hard

Expand Down Expand Up @@ -12449,6 +12451,13 @@ __metadata:
languageName: node
linkType: hard

"jsbn@npm:1.1.0":
version: 1.1.0
resolution: "jsbn@npm:1.1.0"
checksum: bebe7ae829bbd586ce8cbe83501dd8cb8c282c8902a8aeeed0a073a89dc37e8103b1244f3c6acd60278bcbfe12d93a3f83c9ac396868a3b3bbc3c5e5e3b648ef
languageName: node
linkType: hard

"jsdom@npm:^16.6.0":
version: 16.7.0
resolution: "jsdom@npm:16.7.0"
Expand Down Expand Up @@ -12909,7 +12918,7 @@ __metadata:
"@swc/helpers": "npm:^0.5.11"
"@swc/jest": "npm:^0.2.36"
"@types/adm-zip": "npm:^0.5.0"
"@types/better-sqlite3": "npm:^7.6.8"
"@types/better-sqlite3": "npm:^7.6.10"
"@types/jest": "npm:^27.5.2"
"@types/jlongster__sql.js": "npm:@types/sql.js@latest"
"@types/pegjs": "npm:^0.10.3"
Expand All @@ -12920,7 +12929,7 @@ __metadata:
absurd-sql: "npm:0.0.54"
adm-zip: "npm:^0.5.10"
assert: "npm:^2.1.0"
better-sqlite3: "npm:^9.6.0"
better-sqlite3: "npm:^11.0.0"
browserify-zlib: "npm:^0.2.0"
buffer: "npm:^6.0.3"
cross-env: "npm:^7.0.3"
Expand Down Expand Up @@ -12993,6 +13002,13 @@ __metadata:
languageName: node
linkType: hard

"lru-cache@npm:^10.2.0":
version: 10.2.2
resolution: "lru-cache@npm:10.2.2"
checksum: ff1a496d30b5eaec2c9079080965bb0cede203cf878371f7033a007f1e54cd4aa13cc8abf7ccec4c994a83a22ed5476e83a55bb57cc07e6c1547a42937e42c37
languageName: node
linkType: hard

"lru-cache@npm:^4.0.1":
version: 4.1.5
resolution: "lru-cache@npm:4.1.5"
Expand Down Expand Up @@ -13028,13 +13044,6 @@ __metadata:
languageName: node
linkType: hard

"lru-cache@npm:^9.1.1 || ^10.0.0":
version: 10.0.1
resolution: "lru-cache@npm:10.0.1"
checksum: 5bb91a97a342a41fd049c3494b44d9e21a7d4843f9284d0a0b26f00bb0e436f1f627d0641c78f88be16b86b4231546c5ee4f284733fb530c7960f0bcd7579026
languageName: node
linkType: hard

"lz-string@npm:^1.5.0":
version: 1.5.0
resolution: "lz-string@npm:1.5.0"
Expand Down Expand Up @@ -13833,12 +13842,12 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:^9.0.1":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
"minimatch@npm:^9.0.4":
version: 9.0.4
resolution: "minimatch@npm:9.0.4"
dependencies:
brace-expansion: "npm:^2.0.1"
checksum: c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
checksum: 4cdc18d112b164084513e890d6323370db14c22249d536ad1854539577a895e690a27513dc346392f61a4a50afbbd8abc88f3f25558bfbbbb862cd56508b20f5
languageName: node
linkType: hard

Expand Down Expand Up @@ -13931,10 +13940,10 @@ __metadata:
languageName: node
linkType: hard

"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3":
version: 7.0.3
resolution: "minipass@npm:7.0.3"
checksum: 04d72c8a437de54a024f3758ff17c0226efb532ef37dbdaca1ea6039c7b9b1704e612abbd2e3a0d2c825c64eb0a9ab266c843baa71d18ad1a279baecee28ed97
"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
version: 7.1.2
resolution: "minipass@npm:7.1.2"
checksum: c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950
languageName: node
linkType: hard

Expand Down Expand Up @@ -14810,13 +14819,13 @@ __metadata:
languageName: node
linkType: hard

"path-scurry@npm:^1.10.1":
version: 1.10.1
resolution: "path-scurry@npm:1.10.1"
"path-scurry@npm:^1.11.1":
version: 1.11.1
resolution: "path-scurry@npm:1.11.1"
dependencies:
lru-cache: "npm:^9.1.1 || ^10.0.0"
lru-cache: "npm:^10.2.0"
minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
checksum: eebfb8304fef1d4f7e1486df987e4fd77413de4fce16508dea69fcf8eb318c09a6b15a7a2f4c22877cec1cb7ecbd3071d18ca9de79eeece0df874a00f1f0bdc8
checksum: 5e8845c159261adda6f09814d7725683257fcc85a18f329880ab4d7cc1d12830967eae5d5894e453f341710d5484b8fdbbd4d75181b4d6e1eb2f4dc7aeadc434
languageName: node
linkType: hard

Expand Down Expand Up @@ -16647,12 +16656,12 @@ __metadata:
linkType: hard

"socks@npm:^2.6.2":
version: 2.7.1
resolution: "socks@npm:2.7.1"
version: 2.8.3
resolution: "socks@npm:2.8.3"
dependencies:
ip: "npm:^2.0.0"
ip-address: "npm:^9.0.5"
smart-buffer: "npm:^4.2.0"
checksum: 5074f7d6a13b3155fa655191df1c7e7a48ce3234b8ccf99afa2ccb56591c195e75e8bb78486f8e9ea8168e95a29573cbaad55b2b5e195160ae4d2ea6811ba833
checksum: ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb
languageName: node
linkType: hard

Expand Down Expand Up @@ -16769,10 +16778,10 @@ __metadata:
languageName: node
linkType: hard

"sprintf-js@npm:^1.1.2":
version: 1.1.2
resolution: "sprintf-js@npm:1.1.2"
checksum: 0044322a252b36bffc3d8a462a4882de57830e18d37d1cc000104ff4744b512d6a9b1ca6240e7ad141a987a1eaad071668fe12d11c496c11d3641c4797a6cf3f
"sprintf-js@npm:^1.1.2, sprintf-js@npm:^1.1.3":
version: 1.1.3
resolution: "sprintf-js@npm:1.1.3"
checksum: e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb
languageName: node
linkType: hard

Expand Down Expand Up @@ -17894,12 +17903,12 @@ __metadata:
linkType: hard

"typescript@npm:^5.0.2":
version: 5.0.4
resolution: "typescript@npm:5.0.4"
version: 5.4.5
resolution: "typescript@npm:5.4.5"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: e5c3adff09a138c0e27d13b5bb2b106ca17a162ffa945d66161669c265c65436309c5817358a2af1abb69d07440d358f8c1ed7cbb63a2c8680e19b9c268fe4ef
checksum: d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5
languageName: node
linkType: hard

Expand All @@ -17914,12 +17923,12 @@ __metadata:
linkType: hard

"typescript@patch:typescript@npm%3A^5.0.2#optional!builtin<compat/typescript>":
version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#optional!builtin<compat/typescript>::version=5.0.4&hash=b5f058"
version: 5.4.5
resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=e012d7"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: b1b62606c7ec75efe9edc61e195d9e69f0440cac1bcd111dfa864f839255f0d9a7b79869f2823559c608826fc0c9894d2917ae4063e0aa06f5d0784a35170497
checksum: 584be8bac7112ad49a9eb9992f71d542b1ff2fafb5bb315e1c196145e8feab589f1d7223cfb2d5df6770789582e6918f8287d1f2f89911b38eb80e29c560ad00
languageName: node
linkType: hard

Expand Down
Loading