Merge branch 'master' of github.com:bitwarden/sdk into feature/wasm

# Conflicts:
#	crates/bitwarden/Cargo.toml

.github/renovate.json

@@ -2,44 +2,26 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
-    "schedule:weekends",
     ":combinePatchMinorReleases",
     ":dependencyDashboard",
     ":maintainLockFilesWeekly",
     ":prConcurrentLimit10",
     ":rebaseStalePrs",
-    ":separateMajorReleases"
+    ":separateMajorReleases",
+    "group:monorepos",
+    "schedule:weekends"
   ],
   "separateMajorMinor": true,
   "enabledManagers": ["cargo", "github-actions", "npm", "nuget"],
+  "commitMessagePrefix": "[deps]:",
+  "commitMessageTopic": "{{depName}}",
   "packageRules": [
-    {
-      "groupName": "npm minor",
-      "matchManagers": ["npm"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
-    {
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["patch"],
-      "enabled": false
-    },
-    {
-      "matchManagers": ["cargo"],
-      "matchUpdateTypes": ["minor"],
-      "matchCurrentVersion": ">=1.0.0",
-      "enabled": false
-    },
     {
       "matchManagers": ["cargo"],
       "matchPackagePatterns": ["pyo3*"],
       "matchUpdateTypes": ["minor", "patch"],
       "groupName": "pyo3 non-major"
     },
-    {
-      "groupName": "nuget minor",
-      "matchManagers": ["nuget"],
-      "matchUpdateTypes": ["minor", "patch"]
-    },
     {
       "groupName": "gh minor",
       "matchManagers": ["github-actions"],

crates/bitwarden-c/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 rust-version = "1.57"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 crate-type = ["lib", "staticlib", "cdylib"]
 bench = false

crates/bitwarden-json/Cargo.toml

@@ -18,9 +18,9 @@ internal = ["bitwarden/internal"] # Internal testing methods
 secrets = ["bitwarden/secrets"]   # Secrets manager API
 
 [dependencies]
+log = ">=0.4.18, <0.5"
 schemars = ">=0.8.12, <0.9"
 serde = { version = ">=1.0, <2.0", features = ["derive"] }
 serde_json = ">=1.0.96, <2.0"
-log = ">=0.4.18, <0.5"
 
 bitwarden = { path = "../bitwarden" }

crates/bitwarden-napi/Cargo.toml

@@ -16,10 +16,10 @@ rust-version = "1.57"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-napi = {version="2", features=["async"]}
-napi-derive = "2"
+env_logger = "0.10.0"
 log = "0.4.18"
-env_logger="0.10.0"
+napi = { version = "2", features = ["async"] }
+napi-derive = "2"
 
 bitwarden-json = { path = "../bitwarden-json", version = "0.3.0", features = ["secrets"] }
 

crates/bitwarden-py/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 rust-version = "1.57"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 name = "bitwarden_py"
 crate-type = ["cdylib"]

crates/bitwarden-uniffi/Cargo.toml

@@ -18,8 +18,8 @@ chrono = { version = ">=0.4.26, <0.5", features = [
     "std",
 ], default-features = false }
 env_logger = "0.10.0"
-uniffi = "=0.25.1"
 schemars = { version = ">=0.8, <0.9", optional = true }
+uniffi = "=0.25.1"
 
 bitwarden = { path = "../bitwarden", features = ["mobile", "internal"] }
 

crates/bitwarden-wasm/Cargo.toml

@@ -4,18 +4,17 @@ version = "0.1.0"
 edition = "2021"
 rust-version = "1.57"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-js-sys = "0.3.63"
-serde = {version = "1.0.163", features = ["derive"] }
-wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
-wasm-bindgen-futures = "0.4.36"
 console_error_panic_hook = "0.1.7"
 console_log = { version = "1.0.0", features = ["color"] }
+js-sys = "0.3.63"
 log = "0.4.18"
+serde = { version = "1.0.163", features = ["derive"] }
+wasm-bindgen = { version = "=0.2.87", features = ["serde-serialize"] }
+wasm-bindgen-futures = "0.4.36"
 
 bitwarden-json = { path = "../bitwarden-json", features = ["secrets"] }
 

crates/bitwarden/Cargo.toml

@@ -54,13 +54,11 @@ thiserror = ">=1.0.40, <2.0"
 subtle = ">=2.5.0, <3.0"
 uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
 uniffi = { version = "=0.25.1", optional = true }
-
+bitwarden-api-api = { path = "../bitwarden-api-api", version = "=0.2.2" }
+bitwarden-api-identity = { path = "../bitwarden-api-identity", version = "=0.2.2" }
 # We don't use this directly (it's used by rand), but we need it here to enable WASM support
 getrandom = { version = ">=0.2.9", features = ["js"] }
 
-bitwarden-api-identity = { path = "../bitwarden-api-identity", version = "=0.2.2" }
-bitwarden-api-api = { path = "../bitwarden-api-api", version = "=0.2.2" }
-
 [dev-dependencies]
 rand_chacha = "0.3.1"
 tokio = { version = "1.28.2", features = ["rt", "macros"] }

crates/bw/Cargo.toml

@@ -12,15 +12,13 @@ Bitwarden Password Manager CLI
 """
 keywords = ["bitwarden", "password-manager", "cli"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 clap = { version = "4.3.0", features = ["derive", "env"] }
-tokio = { version = "1.28.2", features = ["rt-multi-thread", "macros"] }
-log = "0.4.18"
-env_logger = "0.10.0"
 color-eyre = "0.6"
+env_logger = "0.10.0"
 inquire = "0.6.2"
+log = "0.4.18"
+tokio = { version = "1.28.2", features = ["rt-multi-thread", "macros"] }
 
 bitwarden = { path = "../bitwarden", version = "0.3.1", features = [
     "internal",

crates/bws/Cargo.toml

@@ -12,8 +12,6 @@ Bitwarden Secrets Manager CLI
 """
 keywords = ["bitwarden", "secrets-manager", "cli"]
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 bat = { version = "0.24.0", features = [
     "regex-onig",
@@ -29,6 +27,10 @@ comfy-table = "^7.0.1"
 directories = "5.0.1"
 env_logger = "0.10.0"
 log = "0.4.18"
+regex = { version = "1.10.2", features = [
+    "std",
+    "perf",
+], default-features = false }
 serde = "^1.0.163"
 serde_json = "^1.0.96"
 serde_yaml = "0.9"
@@ -37,7 +39,6 @@ thiserror = "1.0.40"
 tokio = { version = "1.28.2", features = ["rt-multi-thread", "macros"] }
 toml = "0.8.0"
 uuid = { version = "^1.3.3", features = ["serde"] }
-regex = { version = "1.10.2", features=["std", "perf"], default-features=false }
 
 bitwarden = { path = "../bitwarden", version = "0.3.1", features = ["secrets"] }
 

crates/sdk-schemas/Cargo.toml

@@ -12,10 +12,10 @@ internal = [
 ]
 
 [dependencies]
-schemars = { version = "0.8.12", features = ["preserve_order"] }
-serde_json = "1.0.96"
 anyhow = "1.0.71"
 itertools = "0.12.0"
+schemars = { version = "0.8.12", features = ["preserve_order"] }
+serde_json = "1.0.96"
 
 bitwarden = { path = "../bitwarden" }
 bitwarden-json = { path = "../bitwarden-json" }