Skip to content

Commit 460de6a

Browse files
authored
[PM-23377] electron v36 (#839)
* angular 18 upgrade * wip * wip * remove @types/glob, fix jest version, use standalone: false * clean up * npm ci * update electron to v36 * fix electron v36 update * fix package-lock.json
1 parent 4784d45 commit 460de6a

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"cross-env": "7.0.3",
100100
"css-loader": "7.1.2",
101101
"dotenv": "17.2.0",
102-
"electron": "34.5.8",
102+
"electron": "^36.7.3",
103103
"electron-builder": "24.13.3",
104104
"electron-log": "5.4.1",
105105
"electron-reload": "2.0.0-alpha.1",

src/app/tabs/settings.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core";
2+
import { webUtils } from "electron";
23

34
import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
45
import { LogService } from "@/jslib/common/src/abstractions/log.service";
@@ -122,7 +123,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
122123
return;
123124
}
124125

125-
(this.ldap as any)[id] = filePicker.files[0].path;
126+
(this.ldap as any)[id] = webUtils.getPathForFile(filePicker.files[0]);
126127
// reset file input
127128
// ref: https://stackoverflow.com/a/20552042
128129
filePicker.type = "";

0 commit comments

Comments
 (0)