From 3bfe5e4a65ab643813127b1bf32ec12468a05009 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann
Date: Mon, 9 Dec 2024 02:09:57 -0800
Subject: [PATCH 01/14] [PM-13099] Enable browserintegration on dmg builds on
adding an env variable (#11359)
* Enable browserintegration on dmg builds on adding an env variable
* Fix crash
* Cleanup
---
.../src/app/accounts/settings.component.ts | 76 ++++++++++---------
apps/desktop/src/platform/preload.ts | 11 ++-
apps/desktop/src/utils.ts | 10 +++
3 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index a8ce45f53c7..387e6823f31 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -632,43 +632,51 @@ export class SettingsComponent implements OnInit, OnDestroy {
}
async saveBrowserIntegration() {
- if (
- ipc.platform.deviceType === DeviceType.MacOsDesktop &&
- !this.platformUtilsService.isMacAppStore() &&
- !ipc.platform.isDev
- ) {
- await this.dialogService.openSimpleDialog({
- title: { key: "browserIntegrationUnsupportedTitle" },
- content: { key: "browserIntegrationMasOnlyDesc" },
- acceptButtonText: { key: "ok" },
- cancelButtonText: null,
- type: "warning",
- });
+ const skipSupportedPlatformCheck =
+ ipc.platform.allowBrowserintegrationOverride || ipc.platform.isDev;
- this.form.controls.enableBrowserIntegration.setValue(false);
- return;
- } else if (ipc.platform.isWindowsStore) {
- await this.dialogService.openSimpleDialog({
- title: { key: "browserIntegrationUnsupportedTitle" },
- content: { key: "browserIntegrationWindowsStoreDesc" },
- acceptButtonText: { key: "ok" },
- cancelButtonText: null,
- type: "warning",
- });
+ if (skipSupportedPlatformCheck) {
+ if (
+ ipc.platform.deviceType === DeviceType.MacOsDesktop &&
+ !this.platformUtilsService.isMacAppStore()
+ ) {
+ await this.dialogService.openSimpleDialog({
+ title: { key: "browserIntegrationUnsupportedTitle" },
+ content: { key: "browserIntegrationMasOnlyDesc" },
+ acceptButtonText: { key: "ok" },
+ cancelButtonText: null,
+ type: "warning",
+ });
- this.form.controls.enableBrowserIntegration.setValue(false);
- return;
- } else if (ipc.platform.isSnapStore || ipc.platform.isFlatpak) {
- await this.dialogService.openSimpleDialog({
- title: { key: "browserIntegrationUnsupportedTitle" },
- content: { key: "browserIntegrationLinuxDesc" },
- acceptButtonText: { key: "ok" },
- cancelButtonText: null,
- type: "warning",
- });
+ this.form.controls.enableBrowserIntegration.setValue(false);
+ return;
+ }
- this.form.controls.enableBrowserIntegration.setValue(false);
- return;
+ if (ipc.platform.isWindowsStore) {
+ await this.dialogService.openSimpleDialog({
+ title: { key: "browserIntegrationUnsupportedTitle" },
+ content: { key: "browserIntegrationWindowsStoreDesc" },
+ acceptButtonText: { key: "ok" },
+ cancelButtonText: null,
+ type: "warning",
+ });
+
+ this.form.controls.enableBrowserIntegration.setValue(false);
+ return;
+ }
+
+ if (ipc.platform.isSnapStore || ipc.platform.isFlatpak) {
+ await this.dialogService.openSimpleDialog({
+ title: { key: "browserIntegrationUnsupportedTitle" },
+ content: { key: "browserIntegrationLinuxDesc" },
+ acceptButtonText: { key: "ok" },
+ cancelButtonText: null,
+ type: "warning",
+ });
+
+ this.form.controls.enableBrowserIntegration.setValue(false);
+ return;
+ }
}
await this.desktopSettingsService.setBrowserIntegrationEnabled(
diff --git a/apps/desktop/src/platform/preload.ts b/apps/desktop/src/platform/preload.ts
index 30e248d352c..0b61d894776 100644
--- a/apps/desktop/src/platform/preload.ts
+++ b/apps/desktop/src/platform/preload.ts
@@ -11,7 +11,15 @@ import {
Message,
UnencryptedMessageResponse,
} from "../models/native-messaging";
-import { isAppImage, isDev, isFlatpak, isMacAppStore, isSnapStore, isWindowsStore } from "../utils";
+import {
+ allowBrowserintegrationOverride,
+ isAppImage,
+ isDev,
+ isFlatpak,
+ isMacAppStore,
+ isSnapStore,
+ isWindowsStore,
+} from "../utils";
import { ClipboardWriteMessage } from "./types/clipboard";
@@ -140,6 +148,7 @@ export default {
isFlatpak: isFlatpak(),
isSnapStore: isSnapStore(),
isAppImage: isAppImage(),
+ allowBrowserintegrationOverride: allowBrowserintegrationOverride(),
reloadProcess: () => ipcRenderer.send("reload-process"),
focusWindow: () => ipcRenderer.send("window-focus"),
hideWindow: () => ipcRenderer.send("window-hide"),
diff --git a/apps/desktop/src/utils.ts b/apps/desktop/src/utils.ts
index 98bdebb0cc3..88feadd6721 100644
--- a/apps/desktop/src/utils.ts
+++ b/apps/desktop/src/utils.ts
@@ -70,6 +70,16 @@ export function isWindowsPortable() {
return isWindows() && process.env.PORTABLE_EXECUTABLE_DIR != null;
}
+/**
+ * We block the browser integration on some unsupported platforms, which also
+ * blocks partially supported platforms (mac .dmg in dev builds) / prevents
+ * experimenting with the feature for QA. So this env var allows overriding
+ * the block.
+ */
+export function allowBrowserintegrationOverride() {
+ return process.env.ALLOW_BROWSER_INTEGRATION_OVERRIDE === "true";
+}
+
/**
* Sanitize user agent so external resources used by the app can't built data on our users.
*/
From ba4d7ea7994a219ad735d927869dfd953af0f97d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:57:58 +0100
Subject: [PATCH 02/14] [deps] Platform: Update electron-log to v5.2.4 (#12300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel García
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1abea1dbcfc..0387e8855b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,7 +134,7 @@
"css-loader": "7.1.2",
"electron": "32.1.1",
"electron-builder": "24.13.3",
- "electron-log": "5.2.2",
+ "electron-log": "5.2.4",
"electron-reload": "2.0.0-alpha.1",
"electron-store": "8.2.0",
"electron-updater": "6.3.9",
@@ -15783,9 +15783,9 @@
}
},
"node_modules/electron-log": {
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.2.2.tgz",
- "integrity": "sha512-fgvx6srjIHDowJD8WAAjoAXmiTyOz6JnGQoxOtk1mXw7o4S+HutuPHLCsk24xTXqWZgy4uO63NbedG+oEvldLw==",
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.2.4.tgz",
+ "integrity": "sha512-iX12WXc5XAaKeHg2QpiFjVwL+S1NVHPFd3V5RXtCmKhpAzXsVQnR3UEc0LovM6p6NkUQxDWnkdkaam9FNUVmCA==",
"dev": true,
"license": "MIT",
"engines": {
diff --git a/package.json b/package.json
index 68017a92362..0d4da63e704 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
"css-loader": "7.1.2",
"electron": "32.1.1",
"electron-builder": "24.13.3",
- "electron-log": "5.2.2",
+ "electron-log": "5.2.4",
"electron-reload": "2.0.0-alpha.1",
"electron-store": "8.2.0",
"electron-updater": "6.3.9",
From e8976556d8e70bdfbdaf70af3d41f1ddf7fd5f0c Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann
Date: Mon, 9 Dec 2024 06:40:58 -0800
Subject: [PATCH 03/14] Fix missing title for ssh key dialog (#12317)
---
.../vault-item-dialog/vault-item-dialog.component.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index 2f5b014fcb3..ecceaa6267a 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -428,6 +428,9 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
case CipherType.SecureNote:
this.title = this.i18nService.t(partOne, this.i18nService.t("note").toLowerCase());
break;
+ case CipherType.SshKey:
+ this.title = this.i18nService.t(partOne, this.i18nService.t("typeSshKey").toLowerCase());
+ break;
}
}
From 8c446b4720b94a6a103b9bef155f5370730dd7a5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:42:42 +0100
Subject: [PATCH 04/14] [deps] Platform: Update Rust crate anyhow to v1.0.94
(#12296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel García
---
apps/desktop/desktop_native/Cargo.lock | 6 +++---
apps/desktop/desktop_native/core/Cargo.toml | 2 +-
apps/desktop/desktop_native/napi/Cargo.toml | 2 +-
apps/desktop/desktop_native/objc/Cargo.toml | 2 +-
apps/desktop/desktop_native/proxy/Cargo.toml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 148e56fcb0d..1cf8b24c265 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
@@ -70,9 +70,9 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anyhow"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
[[package]]
name = "arboard"
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index 4ace1c13e08..adfdd818a17 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -21,7 +21,7 @@ sys = [
[dependencies]
aes = "=0.8.4"
-anyhow = "=1.0.93"
+anyhow = "=1.0.94"
arboard = { version = "=3.4.1", default-features = false, features = [
"wayland-data-control",
] }
diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml
index 6efd662b351..08664eb6a53 100644
--- a/apps/desktop/desktop_native/napi/Cargo.toml
+++ b/apps/desktop/desktop_native/napi/Cargo.toml
@@ -16,7 +16,7 @@ manual_test = []
[dependencies]
base64 = "=0.22.1"
hex = "=0.4.3"
-anyhow = "=1.0.93"
+anyhow = "=1.0.94"
desktop_core = { path = "../core" }
napi = { version = "=2.16.13", features = ["async"] }
napi-derive = "=2.16.13"
diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml
index 4b883ce6fa7..cfcc92bef7a 100644
--- a/apps/desktop/desktop_native/objc/Cargo.toml
+++ b/apps/desktop/desktop_native/objc/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
default = []
[dependencies]
-anyhow = "=1.0.93"
+anyhow = "=1.0.94"
thiserror = "=1.0.69"
tokio = "1.39.1"
diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml
index 0511f583c17..06e587b442d 100644
--- a/apps/desktop/desktop_native/proxy/Cargo.toml
+++ b/apps/desktop/desktop_native/proxy/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.0.0"
publish = false
[dependencies]
-anyhow = "=1.0.93"
+anyhow = "=1.0.94"
desktop_core = { path = "../core", default-features = false }
futures = "=0.3.31"
log = "=0.4.22"
From b5ce2167eb8f5520d2b02b5e8c6b259403251af3 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:04:16 -0600
Subject: [PATCH 05/14] update styles of the password history to use bitLink &
button (#12246)
---
.../item-history/item-history-v2.component.html | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
index 35b0428d125..a207b8fa1ca 100644
--- a/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
+++ b/libs/vault/src/cipher-view/item-history/item-history-v2.component.html
@@ -25,13 +25,14 @@
{{ "datePasswordUpdated" | i18n }}:
{{ cipher.passwordRevisionDisplayDate | date: "medium" }}
-
{{ "passwordHistory" | i18n }}
-
+
From d24f092d35626ff86b24f4a2015e6e8d038f57a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:18:50 -0500
Subject: [PATCH 06/14] [deps] Autofill: Update tldts to v6.1.66 (#12293)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
apps/cli/package.json | 2 +-
package-lock.json | 18 +++++++++---------
package.json | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 16ad1c85191..a0ab4c3f74d 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -80,7 +80,7 @@
"papaparse": "5.4.1",
"proper-lockfile": "4.1.2",
"rxjs": "7.8.1",
- "tldts": "6.1.64",
+ "tldts": "6.1.66",
"zxcvbn": "4.4.2"
}
}
diff --git a/package-lock.json b/package-lock.json
index 0387e8855b0..b9949ba06f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,7 @@
"qrious": "4.0.2",
"rxjs": "7.8.1",
"tabbable": "6.2.0",
- "tldts": "6.1.64",
+ "tldts": "6.1.66",
"utf-8-validate": "6.0.5",
"zone.js": "0.14.10",
"zxcvbn": "4.4.2"
@@ -220,7 +220,7 @@
"papaparse": "5.4.1",
"proper-lockfile": "4.1.2",
"rxjs": "7.8.1",
- "tldts": "6.1.64",
+ "tldts": "6.1.66",
"zxcvbn": "4.4.2"
},
"bin": {
@@ -31137,21 +31137,21 @@
}
},
"node_modules/tldts": {
- "version": "6.1.64",
- "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.64.tgz",
- "integrity": "sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==",
+ "version": "6.1.66",
+ "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.66.tgz",
+ "integrity": "sha512-l3ciXsYFel/jSRfESbyKYud1nOw7WfhrBEF9I3UiarYk/qEaOOwu3qXNECHw4fHGHGTEOuhf/VdKgoDX5M/dhQ==",
"license": "MIT",
"dependencies": {
- "tldts-core": "^6.1.64"
+ "tldts-core": "^6.1.66"
},
"bin": {
"tldts": "bin/cli.js"
}
},
"node_modules/tldts-core": {
- "version": "6.1.64",
- "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.64.tgz",
- "integrity": "sha512-uqnl8vGV16KsyflHOzqrYjjArjfXaU6rMPXYy2/ZWoRKCkXtghgB4VwTDXUG+t0OTGeSewNAG31/x1gCTfLt+Q==",
+ "version": "6.1.66",
+ "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.66.tgz",
+ "integrity": "sha512-s07jJruSwndD2X8bVjwioPfqpIc1pDTzszPe9pL1Skbh4bjytL85KNQ3tolqLbCvpQHawIsGfFi9dgerWjqW4g==",
"license": "MIT"
},
"node_modules/tmp": {
diff --git a/package.json b/package.json
index 0d4da63e704..21676535ef7 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
"qrious": "4.0.2",
"rxjs": "7.8.1",
"tabbable": "6.2.0",
- "tldts": "6.1.64",
+ "tldts": "6.1.66",
"utf-8-validate": "6.0.5",
"zone.js": "0.14.10",
"zxcvbn": "4.4.2"
From 30e3002b78b15761c7a98e8ace230bedefab1d5b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:21:49 -0500
Subject: [PATCH 07/14] [deps] Autofill: Update prettier to v3.4.2 (#12303)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b9949ba06f5..7117e4490ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -159,7 +159,7 @@
"node-ipc": "9.2.1",
"postcss": "8.4.49",
"postcss-loader": "8.1.1",
- "prettier": "3.3.3",
+ "prettier": "3.4.2",
"prettier-plugin-tailwindcss": "0.6.9",
"process": "0.11.10",
"remark-gfm": "4.0.0",
@@ -27530,9 +27530,9 @@
}
},
"node_modules/prettier": {
- "version": "3.3.3",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
- "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+ "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
"dev": true,
"license": "MIT",
"bin": {
diff --git a/package.json b/package.json
index 21676535ef7..756caba984f 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
"node-ipc": "9.2.1",
"postcss": "8.4.49",
"postcss-loader": "8.1.1",
- "prettier": "3.3.3",
+ "prettier": "3.4.2",
"prettier-plugin-tailwindcss": "0.6.9",
"process": "0.11.10",
"remark-gfm": "4.0.0",
From b34472260110b98f040928c5fff5299004f76538 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 10:22:22 -0500
Subject: [PATCH 08/14] [deps] Platform: Update @types/node to v22.10.1
(#12305)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.../package-lock.json | 16 ++++++++--------
.../native-messaging-test-runner/package.json | 2 +-
package-lock.json | 17 ++++++++++++-----
package.json | 2 +-
4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json
index 8dd8204b69e..469f8bd1da1 100644
--- a/apps/desktop/native-messaging-test-runner/package-lock.json
+++ b/apps/desktop/native-messaging-test-runner/package-lock.json
@@ -18,7 +18,7 @@
"yargs": "17.7.2"
},
"devDependencies": {
- "@types/node": "22.9.3",
+ "@types/node": "22.10.1",
"@types/node-ipc": "9.2.3",
"typescript": "4.7.4"
}
@@ -106,12 +106,12 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "22.9.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz",
- "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==",
+ "version": "22.10.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz",
+ "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==",
"license": "MIT",
"dependencies": {
- "undici-types": "~6.19.8"
+ "undici-types": "~6.20.0"
}
},
"node_modules/@types/node-ipc": {
@@ -415,9 +415,9 @@
}
},
"node_modules/undici-types": {
- "version": "6.19.8",
- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
- "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+ "version": "6.20.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+ "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
"license": "MIT"
},
"node_modules/uuid": {
diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json
index d2da248522e..e32b9e8e987 100644
--- a/apps/desktop/native-messaging-test-runner/package.json
+++ b/apps/desktop/native-messaging-test-runner/package.json
@@ -23,7 +23,7 @@
"yargs": "17.7.2"
},
"devDependencies": {
- "@types/node": "22.9.3",
+ "@types/node": "22.10.1",
"@types/node-ipc": "9.2.3",
"typescript": "4.7.4"
},
diff --git a/package-lock.json b/package-lock.json
index 7117e4490ec..a49b47a97c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,7 +111,7 @@
"@types/koa-json": "2.0.23",
"@types/lowdb": "1.0.15",
"@types/lunr": "2.3.7",
- "@types/node": "22.9.3",
+ "@types/node": "22.10.1",
"@types/node-fetch": "2.6.4",
"@types/node-forge": "1.3.11",
"@types/node-ipc": "9.2.3",
@@ -10026,13 +10026,13 @@
"license": "MIT"
},
"node_modules/@types/node": {
- "version": "22.9.3",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz",
- "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==",
+ "version": "22.10.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz",
+ "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==",
"dev": true,
"license": "MIT",
"dependencies": {
- "undici-types": "~6.19.8"
+ "undici-types": "~6.20.0"
}
},
"node_modules/@types/node-fetch": {
@@ -10081,6 +10081,13 @@
"@types/node": "*"
}
},
+ "node_modules/@types/node/node_modules/undici-types": {
+ "version": "6.20.0",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+ "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@types/papaparse": {
"version": "5.3.15",
"resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.15.tgz",
diff --git a/package.json b/package.json
index 756caba984f..545ff6806d4 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
"@types/koa-json": "2.0.23",
"@types/lowdb": "1.0.15",
"@types/lunr": "2.3.7",
- "@types/node": "22.9.3",
+ "@types/node": "22.10.1",
"@types/node-fetch": "2.6.4",
"@types/node-forge": "1.3.11",
"@types/node-ipc": "9.2.3",
From f7b81231bccc1803ed7c1eda8dc3d6291f6f8eb2 Mon Sep 17 00:00:00 2001
From: "Mr. Beedell, Roke Julian Lockhart"
Date: Mon, 9 Dec 2024 16:41:13 +0000
Subject: [PATCH 09/14] Remove `[CLI]()` from `README.md`. (#12189)
Per https://github.com/bitwarden/clients/issues/12188#issue-2706366498.
Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
---
apps/cli/README.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/apps/cli/README.md b/apps/cli/README.md
index e00b9a345d2..d39c0e39c8f 100644
--- a/apps/cli/README.md
+++ b/apps/cli/README.md
@@ -7,8 +7,6 @@
The Bitwarden CLI is a powerful, full-featured command-line interface (CLI) tool to access and manage a Bitwarden vault. The CLI is written with TypeScript and Node.js and can be run on Windows, macOS, and Linux distributions.
-
-
## Developer Documentation
Please refer to the [CLI section](https://contributing.bitwarden.com/getting-started/clients/cli/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
From 0906c503e1f35d264d5169df178dd5a46a39a9b7 Mon Sep 17 00:00:00 2001
From: Victoria League
Date: Mon, 9 Dec 2024 14:10:14 -0500
Subject: [PATCH 10/14] [CL-522] Reduce font size for checkbox and radio labels
(#12251)
---
libs/components/src/checkbox/checkbox.component.ts | 9 ++++-----
.../src/form-control/form-control.component.html | 2 +-
libs/components/src/form-control/form-control.module.ts | 3 ++-
libs/components/src/form/form.stories.ts | 7 ++++++-
.../src/radio-button/radio-group.component.html | 2 +-
.../components/src/radio-button/radio-input.component.ts | 5 ++---
6 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index ef57d3d5cd3..7c634b360ce 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -22,10 +22,9 @@ export class CheckboxComponent implements BitFormControlAbstraction {
"tw-border",
"tw-border-solid",
"tw-border-secondary-500",
- "tw-h-5",
- "tw-w-5",
+ "tw-h-[1.12rem]",
+ "tw-w-[1.12rem]",
"tw-mr-1.5",
- "tw-bottom-[-1px]", // Fix checkbox looking off-center
"tw-flex-none", // Flexbox fix for bit-form-control
"before:tw-content-['']",
@@ -83,11 +82,11 @@ export class CheckboxComponent implements BitFormControlAbstraction {
@HostBinding("style.--mask-image")
protected maskImage =
- `url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E')`;
+ `url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E')`;
@HostBinding("style.--indeterminate-mask-image")
protected indeterminateImage =
- `url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 13 13"%3E%3Cpath stroke="%23fff" stroke-width="2" d="M2.5 6.5h8"/%3E%3C/svg%3E%0A')`;
+ `url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 13 13"%3E%3Cpath stroke="%23fff" stroke-width="2" d="M2.5 6.5h8"/%3E%3C/svg%3E%0A')`;
@HostBinding()
@Input()
diff --git a/libs/components/src/form-control/form-control.component.html b/libs/components/src/form-control/form-control.component.html
index c2270ab79a6..aed8f7e3b24 100644
--- a/libs/components/src/form-control/form-control.component.html
+++ b/libs/components/src/form-control/form-control.component.html
@@ -7,7 +7,7 @@
class="tw-inline-flex tw-flex-col"
[ngClass]="formControl.disabled ? 'tw-text-muted' : 'tw-text-main'"
>
-
+
({{ "required" | i18n }})
diff --git a/libs/components/src/form-control/form-control.module.ts b/libs/components/src/form-control/form-control.module.ts
index 7582893ee3a..f6969a97e9c 100644
--- a/libs/components/src/form-control/form-control.module.ts
+++ b/libs/components/src/form-control/form-control.module.ts
@@ -1,13 +1,14 @@
import { NgModule } from "@angular/core";
import { SharedModule } from "../shared";
+import { TypographyModule } from "../typography";
import { FormControlComponent } from "./form-control.component";
import { BitHintComponent } from "./hint.component";
import { BitLabel } from "./label.component";
@NgModule({
- imports: [SharedModule, BitLabel],
+ imports: [SharedModule, BitLabel, TypographyModule],
declarations: [FormControlComponent, BitHintComponent],
exports: [FormControlComponent, BitLabel, BitHintComponent],
})
diff --git a/libs/components/src/form/form.stories.ts b/libs/components/src/form/form.stories.ts
index d5184947cc9..23b2cc8cea2 100644
--- a/libs/components/src/form/form.stories.ts
+++ b/libs/components/src/form/form.stories.ts
@@ -51,6 +51,10 @@ export default {
inputEmail: "Input is not an email-address.",
inputMinValue: (min) => `Input value must be at least ${min}.`,
inputMaxValue: (max) => `Input value must not exceed ${max}.`,
+ multiSelectPlaceholder: "-- Type to Filter --",
+ multiSelectLoading: "Retrieving options...",
+ multiSelectNotFound: "No items found",
+ multiSelectClearAll: "Clear all",
});
},
},
@@ -70,6 +74,7 @@ const exampleFormObj = fb.group({
name: ["", [Validators.required]],
email: ["", [Validators.required, Validators.email, forbiddenNameValidator(/bit/i)]],
country: [undefined as string | undefined, [Validators.required]],
+ groups: [],
terms: [false, [Validators.requiredTrue]],
updates: ["yes"],
age: [null, [Validators.min(0), Validators.max(150)]],
@@ -115,7 +120,7 @@ export const FullExample: Story = {
Groups