bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

[PM-23377] electron v36 (#839)

Browse Source 
* 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
This commit is contained in:
Brandon Treston
2025-07-28 09:40:15 -04:00
committed by GitHub
parent 4784d45d23
commit 460de6a075
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package-lock.json generated
View File

@@ -72,7 +72,7 @@
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"dotenv": "17.2.0",
"electron": "34.5.8",
"electron": "^36.7.3",
"electron-builder": "24.13.3",
"electron-log": "5.4.1",
"electron-reload": "2.0.0-alpha.1",
@@ -12075,15 +12075,15 @@
}
},
"node_modules/electron": {
"version": "34.5.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-34.5.8.tgz",
"integrity": "sha512-vxLD65mabTzYmEVa9KceMHM0+zO+vqgrhcyNVlmTd0IGV5J7XZ8v/qElm0o4YQ4wPeq7olZkUjZkBQQEdr23/g==",
"version": "36.7.3",
"resolved": "https://registry.npmjs.org/electron/-/electron-36.7.3.tgz",
"integrity": "sha512-vO2xQsPr+YAIJZNv5ufuTqjiDVJgd67q80028fLPkC+iZWgXXM9OEC0KPhoebhqQTRmuzgB866NG01GfjRmQTw==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"@electron/get": "^2.0.0",
"@types/node": "^20.9.0",
"@types/node": "^22.7.7",
"extract-zip": "^2.0.1"
},
"bin": {
@@ -12361,9 +12361,9 @@
}
},
"node_modules/electron/node_modules/@types/node": {
"version": "20.19.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.9.tgz",
"integrity": "sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==",
"version": "22.16.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.16.5.tgz",
"integrity": "sha512-bJFoMATwIGaxxx8VJPeM8TonI8t579oRvgAuT8zFugJsJZgzqv0Fu8Mhp68iecjzG7cnN3mO2dJQ5uUM2EFrgQ==",
"dev": true,
"license": "MIT",
"dependencies": {

2
package.json
View File

@@ -99,7 +99,7 @@
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"dotenv": "17.2.0",
"electron": "34.5.8",
"electron": "^36.7.3",
"electron-builder": "24.13.3",
"electron-log": "5.4.1",
"electron-reload": "2.0.0-alpha.1",

3
src/app/tabs/settings.component.ts
View File

@@ -1,4 +1,5 @@
import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core";
import { webUtils } from "electron";
import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
import { LogService } from "@/jslib/common/src/abstractions/log.service";
@@ -122,7 +123,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
return;
}
(this.ldap as any)[id] = filePicker.files[0].path;
(this.ldap as any)[id] = webUtils.getPathForFile(filePicker.files[0]);
// reset file input
// ref: https://stackoverflow.com/a/20552042
filePicker.type = "";