mirror of
https://github.com/bitwarden/browser
synced 2025-12-06 00:13:28 +00:00
[PM-17232] Move all desktop native dependencies to workspace Cargo.toml (#13750)
* Moved all desktop native dependencies to workspace * Excluded workspace Cargo.toml from code ownership * Added all Cargo dependencies to Renovate config * Fixed from test warnings. * Updates to lockfile
This commit is contained in:
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@@ -8,6 +8,8 @@
|
|||||||
apps/desktop/desktop_native @bitwarden/team-platform-dev
|
apps/desktop/desktop_native @bitwarden/team-platform-dev
|
||||||
apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-dev
|
apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-dev
|
||||||
apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-dev
|
apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-dev
|
||||||
|
## No ownership for Cargo.toml to allow dependency updates
|
||||||
|
apps/desktop/desktop_native/Cargo.toml
|
||||||
|
|
||||||
## Auth team files ##
|
## Auth team files ##
|
||||||
apps/browser/src/auth @bitwarden/team-auth-dev
|
apps/browser/src/auth @bitwarden/team-auth-dev
|
||||||
|
|||||||
54
.github/renovate.json5
vendored
54
.github/renovate.json5
vendored
@@ -168,15 +168,20 @@
|
|||||||
matchPackageNames: [
|
matchPackageNames: [
|
||||||
"@emotion/css",
|
"@emotion/css",
|
||||||
"@webcomponents/custom-elements",
|
"@webcomponents/custom-elements",
|
||||||
|
"bitwarden-russh",
|
||||||
"bytes",
|
"bytes",
|
||||||
"concurrently",
|
"concurrently",
|
||||||
"cross-env",
|
"cross-env",
|
||||||
"del",
|
"del",
|
||||||
|
"ed25519",
|
||||||
"lit",
|
"lit",
|
||||||
"patch-package",
|
"patch-package",
|
||||||
|
"pkcs8",
|
||||||
"prettier",
|
"prettier",
|
||||||
"prettier-plugin-tailwindcss",
|
"prettier-plugin-tailwindcss",
|
||||||
"rimraf",
|
"rimraf",
|
||||||
|
"ssh-encoding",
|
||||||
|
"ssh-key",
|
||||||
"@storybook/web-components-webpack5",
|
"@storybook/web-components-webpack5",
|
||||||
"tabbable",
|
"tabbable",
|
||||||
"tldts",
|
"tldts",
|
||||||
@@ -210,31 +215,68 @@
|
|||||||
"@types/node-forge",
|
"@types/node-forge",
|
||||||
"@types/node-ipc",
|
"@types/node-ipc",
|
||||||
"@yao-pkg/pkg",
|
"@yao-pkg/pkg",
|
||||||
|
"anyhow",
|
||||||
|
"arboard",
|
||||||
"babel-loader",
|
"babel-loader",
|
||||||
|
"base64",
|
||||||
|
"bindgen",
|
||||||
"browserslist",
|
"browserslist",
|
||||||
|
"byteorder",
|
||||||
|
"bytes",
|
||||||
|
"core-foundation",
|
||||||
"copy-webpack-plugin",
|
"copy-webpack-plugin",
|
||||||
|
"dirs",
|
||||||
"electron",
|
"electron",
|
||||||
"electron-builder",
|
"electron-builder",
|
||||||
"electron-log",
|
"electron-log",
|
||||||
"electron-reload",
|
"electron-reload",
|
||||||
"electron-store",
|
"electron-store",
|
||||||
"electron-updater",
|
"electron-updater",
|
||||||
|
"embed_plist",
|
||||||
|
"futures",
|
||||||
|
"hex",
|
||||||
|
"homedir",
|
||||||
"html-webpack-injector",
|
"html-webpack-injector",
|
||||||
"html-webpack-plugin",
|
"html-webpack-plugin",
|
||||||
|
"interprocess",
|
||||||
"json5",
|
"json5",
|
||||||
|
"keytar",
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
"lowdb",
|
"lowdb",
|
||||||
|
"napi",
|
||||||
|
"napi-build",
|
||||||
|
"napi-derive",
|
||||||
"node-forge",
|
"node-forge",
|
||||||
"node-ipc",
|
"node-ipc",
|
||||||
|
"oo7",
|
||||||
|
"oslog",
|
||||||
|
"pin-project",
|
||||||
"pkg",
|
"pkg",
|
||||||
|
"rand",
|
||||||
"rxjs",
|
"rxjs",
|
||||||
|
"scopeguard",
|
||||||
|
"security-framework",
|
||||||
|
"security-framework-sys",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"simplelog",
|
||||||
|
"sysinfo",
|
||||||
"tsconfig-paths-webpack-plugin",
|
"tsconfig-paths-webpack-plugin",
|
||||||
"type-fest",
|
"type-fest",
|
||||||
|
"typenum",
|
||||||
"typescript",
|
"typescript",
|
||||||
"typescript-strict-plugin",
|
"typescript-strict-plugin",
|
||||||
|
"uniffi",
|
||||||
"webpack",
|
"webpack",
|
||||||
"webpack-cli",
|
"webpack-cli",
|
||||||
"webpack-dev-server",
|
"webpack-dev-server",
|
||||||
"webpack-node-externals",
|
"webpack-node-externals",
|
||||||
|
"widestring",
|
||||||
|
"windows",
|
||||||
|
"windows-registry",
|
||||||
|
"zbus",
|
||||||
|
"zbus_polkit",
|
||||||
],
|
],
|
||||||
description: "Platform owned dependencies",
|
description: "Platform owned dependencies",
|
||||||
commitMessagePrefix: "[deps] Platform:",
|
commitMessagePrefix: "[deps] Platform:",
|
||||||
@@ -352,7 +394,17 @@
|
|||||||
reviewers: ["team:team-vault-dev"],
|
reviewers: ["team:team-vault-dev"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
matchPackageNames: ["@types/argon2-browser", "argon2", "argon2-browser", "big-integer"],
|
matchPackageNames: [
|
||||||
|
"@types/argon2-browser",
|
||||||
|
"aes",
|
||||||
|
"argon2",
|
||||||
|
"argon2-browser",
|
||||||
|
"big-integer",
|
||||||
|
"cbc",
|
||||||
|
"rsa",
|
||||||
|
"russh-cryptovec",
|
||||||
|
"sha2",
|
||||||
|
],
|
||||||
description: "Key Management owned dependencies",
|
description: "Key Management owned dependencies",
|
||||||
commitMessagePrefix: "[deps] KM:",
|
commitMessagePrefix: "[deps] KM:",
|
||||||
reviewers: ["team:team-key-management-dev"],
|
reviewers: ["team:team-key-management-dev"],
|
||||||
|
|||||||
@@ -9,11 +9,55 @@ edition = "2021"
|
|||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
aes = "=0.8.4"
|
||||||
anyhow = "=1.0.94"
|
anyhow = "=1.0.94"
|
||||||
|
arboard = { version = "=3.4.1", default-features = false }
|
||||||
|
argon2 = "=0.5.3"
|
||||||
|
base64 = "=0.22.1"
|
||||||
|
bindgen = "0.71.1"
|
||||||
|
bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "3d48f140fd506412d186203238993163a8c4e536" }
|
||||||
|
byteorder = "=1.5.0"
|
||||||
|
bytes = "1.9.0"
|
||||||
|
cbc = "=0.1.2"
|
||||||
|
core-foundation = "=0.10.0"
|
||||||
|
dirs = "=6.0.0"
|
||||||
|
ed25519 = "=2.2.3"
|
||||||
|
embed_plist = "=1.2.2"
|
||||||
|
futures = "=0.3.31"
|
||||||
|
hex = "=0.4.3"
|
||||||
|
homedir = "=0.3.4"
|
||||||
|
interprocess = "=2.2.1"
|
||||||
|
keytar = "=0.1.6"
|
||||||
|
libc = "=0.2.169"
|
||||||
log = "=0.4.25"
|
log = "=0.4.25"
|
||||||
|
napi = "=2.16.15"
|
||||||
|
napi-build = "=2.1.4"
|
||||||
|
napi-derive = "=2.16.13"
|
||||||
|
oo7 = "=0.3.3"
|
||||||
|
oslog = "=0.2.0"
|
||||||
|
pin-project = "=1.1.8"
|
||||||
|
pkcs8 = "=0.10.2"
|
||||||
|
rand = "=0.8.5"
|
||||||
|
rsa = "=0.9.6"
|
||||||
|
russh-cryptovec = "=0.7.3"
|
||||||
|
scopeguard = "=1.2.0"
|
||||||
|
security-framework = "=3.1.0"
|
||||||
|
security-framework-sys = "=2.13.0"
|
||||||
serde = "=1.0.209"
|
serde = "=1.0.209"
|
||||||
serde_json = "=1.0.127"
|
serde_json = "=1.0.127"
|
||||||
tokio = "=1.43.0"
|
sha2 = "=0.10.8"
|
||||||
tokio-util = "=0.7.13"
|
simplelog = "=0.12.2"
|
||||||
tokio-stream = "=0.1.15"
|
ssh-encoding = "=0.2.0"
|
||||||
|
ssh-key = {version = "=0.6.7", default-features = false }
|
||||||
|
sysinfo = "0.33.1"
|
||||||
thiserror = "=1.0.69"
|
thiserror = "=1.0.69"
|
||||||
|
tokio = "=1.43.0"
|
||||||
|
tokio-stream = "=0.1.15"
|
||||||
|
tokio-util = "=0.7.13"
|
||||||
|
typenum = "=1.17.0"
|
||||||
|
uniffi = "=0.28.3"
|
||||||
|
widestring = "=1.1.0"
|
||||||
|
windows = "=0.58.0"
|
||||||
|
windows-registry = "=0.4.0"
|
||||||
|
zbus = "=4.4.0"
|
||||||
|
zbus_polkit = "=4.0.0"
|
||||||
|
|||||||
@@ -18,47 +18,47 @@ default = [
|
|||||||
manual_test = []
|
manual_test = []
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
aes = "=0.8.4"
|
aes = { workspace = true }
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
arboard = { version = "=3.4.1", default-features = false, features = [
|
arboard = { workspace = true, features = [
|
||||||
"wayland-data-control",
|
"wayland-data-control",
|
||||||
] }
|
] }
|
||||||
argon2 = { version = "=0.5.3", features = ["zeroize"] }
|
argon2 = { workspace = true, features = ["zeroize"] }
|
||||||
base64 = "=0.22.1"
|
base64 = { workspace = true }
|
||||||
byteorder = "=1.5.0"
|
byteorder = { workspace = true }
|
||||||
cbc = { version = "=0.1.2", features = ["alloc"] }
|
cbc = { workspace = true, features = ["alloc"] }
|
||||||
homedir = "=0.3.4"
|
homedir = { workspace = true }
|
||||||
pin-project = "=1.1.8"
|
pin-project = { workspace = true }
|
||||||
dirs = "=6.0.0"
|
dirs = { workspace = true }
|
||||||
futures = "=0.3.31"
|
futures = { workspace = true }
|
||||||
interprocess = { version = "=2.2.1", features = ["tokio"] }
|
interprocess = { workspace = true, features = ["tokio"] }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
rand = "=0.8.5"
|
rand = { workspace = true }
|
||||||
russh-cryptovec = "=0.7.3"
|
russh-cryptovec = { workspace = true }
|
||||||
scopeguard = "=1.2.0"
|
scopeguard = { workspace = true }
|
||||||
sha2 = "=0.10.8"
|
sha2 = { workspace = true }
|
||||||
ssh-encoding = "=0.2.0"
|
ssh-encoding = { workspace = true }
|
||||||
ssh-key = { version = "=0.6.7", default-features = false, features = [
|
ssh-key = { workspace = true, features = [
|
||||||
"encryption",
|
"encryption",
|
||||||
"ed25519",
|
"ed25519",
|
||||||
"rsa",
|
"rsa",
|
||||||
"getrandom",
|
"getrandom",
|
||||||
] }
|
] }
|
||||||
bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "3d48f140fd506412d186203238993163a8c4e536" }
|
bitwarden-russh = { workspace = true }
|
||||||
tokio = { workspace = true, features = ["io-util", "sync", "macros", "net"] }
|
tokio = { workspace = true, features = ["io-util", "sync", "macros", "net"] }
|
||||||
tokio-stream = { workspace = true, features = ["net"] }
|
tokio-stream = { workspace = true, features = ["net"] }
|
||||||
tokio-util = { workspace = true, features = ["codec"] }
|
tokio-util = { workspace = true, features = ["codec"] }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
typenum = "=1.17.0"
|
typenum = { workspace = true }
|
||||||
pkcs8 = { version = "=0.10.2", features = ["alloc", "encryption", "pem"] }
|
pkcs8 = { workspace = true, features = ["alloc", "encryption", "pem"] }
|
||||||
rsa = "=0.9.6"
|
rsa = { workspace = true }
|
||||||
ed25519 = { version = "=2.2.3", features = ["pkcs8"] }
|
ed25519 = { workspace = true, features = ["pkcs8"] }
|
||||||
bytes = "1.9.0"
|
bytes = { workspace = true }
|
||||||
sysinfo = { version = "0.33.1", features = ["windows"] }
|
sysinfo = { workspace = true, features = ["windows"] }
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
widestring = { version = "=1.1.0", optional = true }
|
widestring = { workspace = true, optional = true }
|
||||||
windows = { version = "=0.58.0", features = [
|
windows = { workspace = true, features = [
|
||||||
"Foundation",
|
"Foundation",
|
||||||
"Security_Credentials_UI",
|
"Security_Credentials_UI",
|
||||||
"Security_Cryptography",
|
"Security_Cryptography",
|
||||||
@@ -72,17 +72,17 @@ windows = { version = "=0.58.0", features = [
|
|||||||
], optional = true }
|
], optional = true }
|
||||||
|
|
||||||
[target.'cfg(windows)'.dev-dependencies]
|
[target.'cfg(windows)'.dev-dependencies]
|
||||||
keytar = "=0.1.6"
|
keytar = { workspace = true }
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
core-foundation = { version = "=0.10.0", optional = true }
|
core-foundation = { workspace = true, optional = true }
|
||||||
security-framework = { version = "=3.1.0", optional = true }
|
security-framework = { workspace = true, optional = true }
|
||||||
security-framework-sys = { version = "=2.13.0", optional = true }
|
security-framework-sys = { workspace = true, optional = true }
|
||||||
desktop_objc = { path = "../objc" }
|
desktop_objc = { path = "../objc" }
|
||||||
|
|
||||||
[target.'cfg(target_os = "linux")'.dependencies]
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
oo7 = "=0.3.3"
|
oo7 = { workspace = true }
|
||||||
libc = "=0.2.169"
|
libc = { workspace = true }
|
||||||
|
|
||||||
zbus = { version = "=4.4.0", optional = true }
|
zbus = { workspace = true, optional = true }
|
||||||
zbus_polkit = { version = "=4.0.0", optional = true }
|
zbus_polkit = { workspace = true, optional = true }
|
||||||
|
|||||||
@@ -15,16 +15,16 @@ bench = false
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
desktop_core = { path = "../core" }
|
desktop_core = { path = "../core" }
|
||||||
futures = "=0.3.31"
|
futures = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tokio = { workspace = true, features = ["sync"] }
|
tokio = { workspace = true, features = ["sync"] }
|
||||||
tokio-util = { workspace = true }
|
tokio-util = { workspace = true }
|
||||||
uniffi = { version = "=0.28.3", features = ["cli"] }
|
uniffi = { workspace = true, features = ["cli"] }
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
oslog = "=0.2.0"
|
oslog = { workspace = true }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
uniffi = { version = "=0.28.3", features = ["build"] }
|
uniffi = { workspace = true, features = ["build"] }
|
||||||
|
|||||||
@@ -14,12 +14,12 @@ default = []
|
|||||||
manual_test = []
|
manual_test = []
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
base64 = "=0.22.1"
|
base64 = { workspace = true }
|
||||||
hex = "=0.4.3"
|
hex = { workspace = true }
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
desktop_core = { path = "../core" }
|
desktop_core = { path = "../core" }
|
||||||
napi = { version = "=2.16.15", features = ["async"] }
|
napi = { workspace = true, features = ["async"] }
|
||||||
napi-derive = "=2.16.13"
|
napi-derive = { workspace = true }
|
||||||
serde = { workspace = true, features = ["derive"] }
|
serde = { workspace = true, features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
@@ -27,7 +27,7 @@ tokio-util = { workspace = true }
|
|||||||
tokio-stream = { workspace = true }
|
tokio-stream = { workspace = true }
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
windows-registry = "=0.4.0"
|
windows-registry = { workspace = true }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
napi-build = "=2.1.4"
|
napi-build = { workspace = true }
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ publish = { workspace = true }
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
desktop_core = { path = "../core" }
|
desktop_core = { path = "../core" }
|
||||||
futures = "=0.3.31"
|
futures = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
simplelog = "=0.12.2"
|
simplelog = { workspace = true }
|
||||||
tokio = { workspace = true, features = ["io-std", "io-util", "macros", "rt"] }
|
tokio = { workspace = true, features = ["io-std", "io-util", "macros", "rt"] }
|
||||||
tokio-util = { workspace = true, features = ["codec"] }
|
tokio-util = { workspace = true, features = ["codec"] }
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
embed_plist = "=1.2.2"
|
embed_plist = { workspace = true }
|
||||||
|
|||||||
@@ -6,4 +6,5 @@ version = { workspace = true }
|
|||||||
publish = { workspace = true }
|
publish = { workspace = true }
|
||||||
|
|
||||||
[target.'cfg(target_os = "windows")'.build-dependencies]
|
[target.'cfg(target_os = "windows")'.build-dependencies]
|
||||||
bindgen = "0.71.1"
|
bindgen = { workspace = true }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user