Merge branch 'main' into km/pm-14445

apps/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2024.10.0",
+  "version": "2024.11.0",
   "keywords": [
     "bitwarden",
     "password",
@@ -58,7 +58,7 @@
   "dependencies": {
     "@koa/multer": "3.0.2",
     "@koa/router": "13.1.0",
-    "argon2": "0.40.1",
+    "argon2": "0.41.1",
     "big-integer": "1.6.52",
     "browser-hrtime": "1.1.8",
     "chalk": "4.1.2",
@@ -80,7 +80,7 @@
     "papaparse": "5.4.1",
     "proper-lockfile": "4.1.2",
     "rxjs": "7.8.1",
-    "tldts": "6.1.56",
+    "tldts": "6.1.58",
     "zxcvbn": "4.4.2"
   }
 }

apps/cli/src/tools/export.command.ts

@@ -38,7 +38,7 @@ export class ExportCommand {
     // format is 'undefined' => Defaults to 'csv'
     // Any other case => returns the options.format
     const format =
-      password && options.format == "json" ? "encrypted_json" : (options.format ?? "csv");
+      password && options.format == "json" ? "encrypted_json" : options.format ?? "csv";
 
     if (!this.isSupportedExportFormat(format)) {
       return Response.badRequest(