From 0efc57f324a8364caf0229fd039fc14ae1d6d145 Mon Sep 17 00:00:00 2001
From: Tom Ballinger <tom@convex.dev>
Date: Sun, 22 Dec 2024 11:55:26 -0800
Subject: [PATCH] Upgrade prettier and fix just format-js (#32592)

GitOrigin-RevId: 5659c0518a01198863269fbc4a6144a737f4a056
---
 npm-packages/convex/src/cli/dev.ts             |  2 +-
 npm-packages/convex/src/cli/lib/utils/utils.ts |  2 +-
 scripts/package-lock.json                      | 14 +++++++-------
 scripts/package.json                           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/npm-packages/convex/src/cli/dev.ts b/npm-packages/convex/src/cli/dev.ts
index 18eea259..e00cf5ff 100644
--- a/npm-packages/convex/src/cli/dev.ts
+++ b/npm-packages/convex/src/cli/dev.ts
@@ -200,7 +200,7 @@ export const dev = new Command("dev")
       ? parseInt(cmdOptions.partitionId)
       : undefined;
     const configure =
-      cmdOptions.configure === true ? "ask" : cmdOptions.configure ?? null;
+      cmdOptions.configure === true ? "ask" : (cmdOptions.configure ?? null);
     const credentials = await deploymentCredentialsOrConfigure(
       ctx,
       configure,
diff --git a/npm-packages/convex/src/cli/lib/utils/utils.ts b/npm-packages/convex/src/cli/lib/utils/utils.ts
index 7e61df3b..1f7b6b6b 100644
--- a/npm-packages/convex/src/cli/lib/utils/utils.ts
+++ b/npm-packages/convex/src/cli/lib/utils/utils.ts
@@ -424,7 +424,7 @@ export async function loadPackageJson(
     });
   }
   const packages = {
-    ...(includePeerDeps ? obj.peerDependencies ?? {} : {}),
+    ...(includePeerDeps ? (obj.peerDependencies ?? {}) : {}),
     ...(obj.dependencies ?? {}),
     ...(obj.devDependencies ?? {}),
   };
diff --git a/scripts/package-lock.json b/scripts/package-lock.json
index 92c8f2c8..9419fd2f 100644
--- a/scripts/package-lock.json
+++ b/scripts/package-lock.json
@@ -17,7 +17,7 @@
         "eslint-plugin-react": "^7.30.0",
         "eslint-plugin-react-hooks": "^5.1.0-beta-26f2496093-20240514",
         "jest": "^29.0.0",
-        "prettier": "3.2.5"
+        "prettier": "3.4.2"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -10539,9 +10539,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -20878,9 +20878,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
+      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
       "dev": true
     },
     "pretty-format": {
diff --git a/scripts/package.json b/scripts/package.json
index 00034be1..3a21b892 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -16,7 +16,7 @@
     "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^5.1.0-beta-26f2496093-20240514",
     "jest": "^29.0.0",
-    "prettier": "3.2.5"
+    "prettier": "3.4.2"
   },
   "overrides": {
     "@microsoft/rush": {