From ccc5ac6a1f1c73ef6d219477c0bd254f4ebb0e40 Mon Sep 17 00:00:00 2001
From: Joseph Garrone
Date: Mon, 20 May 2024 19:30:15 +0200
Subject: [PATCH] Update prettier configuration
---
package.json | 1 +
src/account/pages/Totp.tsx | 4 +---
src/login/Template.tsx | 2 +-
src/login/lib/useUserProfileForm.tsx | 4 ++--
src/login/pages/Login.tsx | 4 ++--
src/login/pages/LoginResetPassword.tsx | 4 ++--
src/login/pages/LoginUsername.tsx | 4 ++--
src/tools/AndByDiscriminatingKey.ts | 22 ++++++++++++----------
yarn.lock | 8 ++++----
9 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/package.json b/package.json
index 5bb7b502..5d58e1e3 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"recast": "^0.23.3",
+ "run-exclusive": "^2.2.19",
"scripting-tools": "^0.19.13",
"storybook-dark-mode": "^1.1.2",
"termost": "^0.12.0",
diff --git a/src/account/pages/Totp.tsx b/src/account/pages/Totp.tsx
index 22946b5e..208dcdc8 100644
--- a/src/account/pages/Totp.tsx
+++ b/src/account/pages/Totp.tsx
@@ -79,9 +79,7 @@ export default function Totp(props: PageProps{msg("totpStep1")}
- {totp.supportedApplications?.map(app => (
- - {msg(app as MessageKey)}
- ))}
+ {totp.supportedApplications?.map(app => - {msg(app as MessageKey)}
)}
diff --git a/src/login/Template.tsx b/src/login/Template.tsx
index 0913ff64..4d8ad7b8 100644
--- a/src/login/Template.tsx
+++ b/src/login/Template.tsx
@@ -101,7 +101,7 @@ export default function Template(props: TemplateProps) {
({
type: "text/javascript",
src: script
- } as const)
+ }) as const
)
]
});
diff --git a/src/login/lib/useUserProfileForm.tsx b/src/login/lib/useUserProfileForm.tsx
index abfc0952..0e07fabf 100644
--- a/src/login/lib/useUserProfileForm.tsx
+++ b/src/login/lib/useUserProfileForm.tsx
@@ -431,8 +431,8 @@ export function useUserProfileForm(params: ParamsOfUseUserProfileForm): ReturnTy
typeof hasLostFocusAtLeastOnceOrArr === "boolean"
? hasLostFocusAtLeastOnceOrArr
: error.fieldIndex !== undefined
- ? hasLostFocusAtLeastOnceOrArr[error.fieldIndex]
- : hasLostFocusAtLeastOnceOrArr[hasLostFocusAtLeastOnceOrArr.length - 1];
+ ? hasLostFocusAtLeastOnceOrArr[error.fieldIndex]
+ : hasLostFocusAtLeastOnceOrArr[hasLostFocusAtLeastOnceOrArr.length - 1];
switch (error.source.type) {
case "server":
diff --git a/src/login/pages/Login.tsx b/src/login/pages/Login.tsx
index 68d05913..d304a16f 100644
--- a/src/login/pages/Login.tsx
+++ b/src/login/pages/Login.tsx
@@ -96,8 +96,8 @@ export default function Login(props: PageProps
diff --git a/src/login/pages/LoginUsername.tsx b/src/login/pages/LoginUsername.tsx
index f42c7f61..37c0e33f 100644
--- a/src/login/pages/LoginUsername.tsx
+++ b/src/login/pages/LoginUsername.tsx
@@ -93,8 +93,8 @@ export default function LoginUsername(props: PageProps
,
U2 extends Record
- > = U1 extends Pick
- ? Tf2
- : U1Again[DiscriminatingKey] & U2[DiscriminatingKey] extends never
- ? U1 | U2
- : U1;
+ > =
+ U1 extends Pick
+ ? Tf2
+ : U1Again[DiscriminatingKey] & U2[DiscriminatingKey] extends never
+ ? U1 | U2
+ : U1;
export type Tf2<
DiscriminatingKey extends string,
SingletonU1 extends Record,
U2,
U1 extends Record
- > = U2 extends Pick
- ? U2 & SingletonU1
- : U2 extends Pick
- ? never
- : U2;
+ > =
+ U2 extends Pick
+ ? U2 & SingletonU1
+ : U2 extends Pick
+ ? never
+ : U2;
}
diff --git a/yarn.lock b/yarn.lock
index 96a377f2..742d1ceb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10328,10 +10328,10 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18"
integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==
-prettier@^2.3.0:
- version "2.8.7"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450"
- integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==
+prettier@^3.2.5:
+ version "3.2.5"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+ integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
pretty-error@^2.1.1:
version "2.1.2"