Skip to content

Commit

Permalink
Upgrade prettier and fix just format-js (#32592)
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 5659c0518a01198863269fbc4a6144a737f4a056
  • Loading branch information
thomasballinger authored and Convex, Inc. committed Dec 22, 2024
1 parent 7a0e764 commit 0efc57f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion npm-packages/convex/src/cli/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion npm-packages/convex/src/cli/lib/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ export async function loadPackageJson(
});
}
const packages = {
...(includePeerDeps ? obj.peerDependencies ?? {} : {}),
...(includePeerDeps ? (obj.peerDependencies ?? {}) : {}),
...(obj.dependencies ?? {}),
...(obj.devDependencies ?? {}),
};
Expand Down
14 changes: 7 additions & 7 deletions scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 0efc57f

Please sign in to comment.