Cookie Policy
Last updated: 19 April 2023
diff --git a/apps/landing/src/pages/privacy-policy.tsx b/apps/landing/src/pages/privacy-policy.tsx
index b175d54f1e6..0c5128fb568 100644
--- a/apps/landing/src/pages/privacy-policy.tsx
+++ b/apps/landing/src/pages/privacy-policy.tsx
@@ -7,7 +7,7 @@ const PrivacyPolicy = () => {
return (
-
+
Privacy Policy
Last updated: 1 August 2023
diff --git a/apps/landing/src/pages/terms-of-use.tsx b/apps/landing/src/pages/terms-of-use.tsx
index 2de4d7b0ee0..970870e7fc7 100644
--- a/apps/landing/src/pages/terms-of-use.tsx
+++ b/apps/landing/src/pages/terms-of-use.tsx
@@ -7,7 +7,7 @@ const PrivacyPolicy = () => {
return (
-
+
Terms of Use
Last updated: 4 July 2023
diff --git a/apps/landing/src/style.css b/apps/landing/src/style.css
index 7f5036d7928..7dc5cf884b8 100644
--- a/apps/landing/src/style.css
+++ b/apps/landing/src/style.css
@@ -8,7 +8,9 @@
}
body {
@apply text-foreground overflow-y-auto bg-gray-200/50;
- font-feature-settings: "rlig" 1, "calt" 1;
+ font-feature-settings:
+ "rlig" 1,
+ "calt" 1;
}
html {
@apply h-full font-sans text-base;
diff --git a/apps/landing/tsconfig.json b/apps/landing/tsconfig.json
index e259cb9d55f..00fe2e1a734 100644
--- a/apps/landing/tsconfig.json
+++ b/apps/landing/tsconfig.json
@@ -4,10 +4,10 @@
"baseUrl": ".",
"paths": {
"@/*": ["src/*"],
- "~/*": ["public/*"]
+ "~/*": ["public/*"],
},
- "checkJs": false
+ "checkJs": false,
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/apps/web/src/app/[locale]/(admin)/layout.tsx b/apps/web/src/app/[locale]/(admin)/layout.tsx
index ba5f94bd1a7..ecf190aa7de 100644
--- a/apps/web/src/app/[locale]/(admin)/layout.tsx
+++ b/apps/web/src/app/[locale]/(admin)/layout.tsx
@@ -29,18 +29,18 @@ const Auth = ({ children }: { children: React.ReactNode }) => {
function MobileNavigation() {
return (
-
+
-
+
-
+
@@ -59,7 +59,7 @@ export default async function Layout({
@@ -67,7 +67,7 @@ export default async function Layout({
-
diff --git a/apps/web/src/app/[locale]/(admin)/menu-item.tsx b/apps/web/src/app/[locale]/(admin)/menu-item.tsx
index 9235b17ad90..6fc4ac9c12c 100644
--- a/apps/web/src/app/[locale]/(admin)/menu-item.tsx
+++ b/apps/web/src/app/[locale]/(admin)/menu-item.tsx
@@ -23,8 +23,8 @@ export function MenuItem({
className={cn(
isCurrent
? "bg-gray-200 text-indigo-600"
- : "text-gray-700 hover:text-primary",
- "group flex items-center gap-x-3 rounded-md py-2 px-3 text-sm leading-6 font-semibold",
+ : "hover:text-primary text-gray-700",
+ "group flex items-center gap-x-3 rounded-md px-3 py-2 text-sm font-semibold leading-6",
)}
>
-
+
diff --git a/apps/web/src/app/[locale]/(admin)/polls/layout.tsx b/apps/web/src/app/[locale]/(admin)/polls/layout.tsx
index 234a9dfa465..680e08485d1 100644
--- a/apps/web/src/app/[locale]/(admin)/polls/layout.tsx
+++ b/apps/web/src/app/[locale]/(admin)/polls/layout.tsx
@@ -22,13 +22,13 @@ export default async function Layout({
return (
-
+
-
+
diff --git a/apps/web/src/app/[locale]/(admin)/polls/loading.tsx b/apps/web/src/app/[locale]/(admin)/polls/loading.tsx
index 84244ac05f9..0f0d31d890d 100644
--- a/apps/web/src/app/[locale]/(admin)/polls/loading.tsx
+++ b/apps/web/src/app/[locale]/(admin)/polls/loading.tsx
@@ -2,19 +2,19 @@ import { Skeleton } from "@/components/skeleton";
function Row() {
return (
-
+
);
diff --git a/apps/web/src/app/[locale]/(admin)/polls/polls-folders.tsx b/apps/web/src/app/[locale]/(admin)/polls/polls-folders.tsx
index c616de3e156..ed5053c89f0 100644
--- a/apps/web/src/app/[locale]/(admin)/polls/polls-folders.tsx
+++ b/apps/web/src/app/[locale]/(admin)/polls/polls-folders.tsx
@@ -27,7 +27,7 @@ function PollFolder({
className={cn(
isActive
? "bg-gray-100"
- : "shadow-sm text-muted-foreground hover:bg-gray-100 active:bg-gray-200",
+ : "text-muted-foreground shadow-sm hover:bg-gray-100 active:bg-gray-200",
)}
>
{children}
diff --git a/apps/web/src/app/[locale]/(admin)/polls/polls-list.tsx b/apps/web/src/app/[locale]/(admin)/polls/polls-list.tsx
index b8c0daa8f02..c2d99f44a70 100644
--- a/apps/web/src/app/[locale]/(admin)/polls/polls-list.tsx
+++ b/apps/web/src/app/[locale]/(admin)/polls/polls-list.tsx
@@ -20,7 +20,7 @@ import Loader from "./loading";
const EmptyState = () => {
return (
-
+
@@ -84,14 +84,14 @@ export function PollsList() {
cell: ({ row }) => {
return (
-
-
+
+
{row.original.title}
-
+
{row.original.event ? (
-
+
{row.original.event.duration === 0
? adjustTimeZone(
row.original.event.start,
@@ -134,7 +134,7 @@ export function PollsList() {
cell: ({ row }) => {
const { createdAt } = row.original;
return (
-
+
{
return (
-
+
{row.original.participants.length}
diff --git a/apps/web/src/app/[locale]/(admin)/settings/menu-item.tsx b/apps/web/src/app/[locale]/(admin)/settings/menu-item.tsx
index 2ac696e7b9b..a2e3c08d16c 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/menu-item.tsx
+++ b/apps/web/src/app/[locale]/(admin)/settings/menu-item.tsx
@@ -20,7 +20,7 @@ export function MenuItem(props: { href: string; children: React.ReactNode }) {
return (
-
+
{menuItems.map((item, i) => (
@@ -90,7 +90,7 @@ export function SettingsMenu() {
{menuItems.map((item, i) => (
-
+
{item.title}
diff --git a/apps/web/src/app/[locale]/(admin)/sidebar.tsx b/apps/web/src/app/[locale]/(admin)/sidebar.tsx
index f1c82c4b4a0..2794eb6436e 100644
--- a/apps/web/src/app/[locale]/(admin)/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(admin)/sidebar.tsx
@@ -41,7 +41,7 @@ function NavItem({
current
? "bg-gray-200 text-gray-800"
: "text-gray-700 hover:bg-gray-200 active:bg-gray-300",
- "group flex items-center gap-x-3 rounded-md py-2 px-3 text-sm leading-6 font-semibold",
+ "group flex items-center gap-x-3 rounded-md px-3 py-2 text-sm font-semibold leading-6",
)}
>
-
+
@@ -102,16 +102,16 @@ export function Sidebar() {
-
-
-
+
+
+
-
+
-
+
{user.name}
{user.email}
-
+
diff --git a/apps/web/src/app/[locale]/(auth)/login/loading.tsx b/apps/web/src/app/[locale]/(auth)/login/loading.tsx
index f96791430cb..c83e66c9cab 100644
--- a/apps/web/src/app/[locale]/(auth)/login/loading.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/loading.tsx
@@ -2,7 +2,7 @@ import { Spinner } from "@/components/spinner";
export default function Loading() {
return (
-
+
);
diff --git a/apps/web/src/app/[locale]/(auth)/login/login-form.tsx b/apps/web/src/app/[locale]/(auth)/login/login-form.tsx
index b239031e684..b17de8ba976 100644
--- a/apps/web/src/app/[locale]/(auth)/login/login-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/login-form.tsx
@@ -129,12 +129,12 @@ export function LoginForm({ oidcConfig }: { oidcConfig?: { name: string } }) {
{hasAlternativeLoginMethods ? (
<>
-
+
-
+
diff --git a/apps/web/src/app/[locale]/(auth)/login/page.tsx b/apps/web/src/app/[locale]/(auth)/login/page.tsx
index 84874ee1af2..128abbbbdde 100644
--- a/apps/web/src/app/[locale]/(auth)/login/page.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/page.tsx
@@ -20,7 +20,7 @@ export default async function LoginPage({ params }: { params: Params }) {
oidcConfig={isOIDCEnabled ? { name: oidcName } : undefined}
/>
-
+
-
+
{
className={poll.userId !== user.id ? "hidden" : ""}
>
-
+
@@ -92,8 +92,8 @@ export function InvitePage() {
-
-
+
+
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/loading.tsx b/apps/web/src/app/[locale]/invite/[urlId]/loading.tsx
index bd4ea3dd0e2..9b0ec733f56 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/loading.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/loading.tsx
@@ -4,8 +4,8 @@ import { Skeleton } from "@/components/skeleton";
export default function Loading() {
return (
-
-
+
+
);
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/nav.tsx b/apps/web/src/app/[locale]/invite/[urlId]/nav.tsx
index fa19af8cd22..7f4c8e7c1fc 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/nav.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/nav.tsx
@@ -23,7 +23,7 @@ export const Nav = () => {
className={poll.userId !== user.id ? "hidden" : ""}
>
-
+
diff --git a/apps/web/src/app/[locale]/menu/back-button.tsx b/apps/web/src/app/[locale]/menu/back-button.tsx
index b6f91669a99..046fbdf4b40 100644
--- a/apps/web/src/app/[locale]/menu/back-button.tsx
+++ b/apps/web/src/app/[locale]/menu/back-button.tsx
@@ -13,7 +13,7 @@ export function BackButton() {
router.back();
}}
>
-
+
);
}
diff --git a/apps/web/src/app/[locale]/menu/page.tsx b/apps/web/src/app/[locale]/menu/page.tsx
index a537bf5fa9c..570f9261c79 100644
--- a/apps/web/src/app/[locale]/menu/page.tsx
+++ b/apps/web/src/app/[locale]/menu/page.tsx
@@ -9,7 +9,7 @@ export default function Page() {
{
defaults="<0>Create an account0> or <1>login1> to claim this poll."
components={[
,
- ,
+ ,
]}
/>
diff --git a/apps/web/src/app/[locale]/poll/[urlId]/page.tsx b/apps/web/src/app/[locale]/poll/[urlId]/page.tsx
index 3e95058dc9e..a6404bebda1 100644
--- a/apps/web/src/app/[locale]/poll/[urlId]/page.tsx
+++ b/apps/web/src/app/[locale]/poll/[urlId]/page.tsx
@@ -6,7 +6,7 @@ import { GuestPollAlert } from "./guest-poll-alert";
export default async function Page() {
return (
-
+
diff --git a/apps/web/src/app/[locale]/poll/[urlId]/skeleton.tsx b/apps/web/src/app/[locale]/poll/[urlId]/skeleton.tsx
index bd31d4518ee..d2ad545cdfb 100644
--- a/apps/web/src/app/[locale]/poll/[urlId]/skeleton.tsx
+++ b/apps/web/src/app/[locale]/poll/[urlId]/skeleton.tsx
@@ -5,8 +5,8 @@ export default function Loading() {
return (
-
-
+
+
);
diff --git a/apps/web/src/app/components/logo-link.tsx b/apps/web/src/app/components/logo-link.tsx
index bbf374a5efa..cfe3bfaf8f7 100644
--- a/apps/web/src/app/components/logo-link.tsx
+++ b/apps/web/src/app/components/logo-link.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
export function LogoLink() {
return (
+
{children}
);
@@ -34,9 +34,9 @@ export function PageHeader({
return (
{children}
;
+ return {children}
;
}
diff --git a/apps/web/src/components/auth/auth-forms.tsx b/apps/web/src/components/auth/auth-forms.tsx
index 2a3f2983569..16b396db348 100644
--- a/apps/web/src/components/auth/auth-forms.tsx
+++ b/apps/web/src/components/auth/auth-forms.tsx
@@ -44,7 +44,7 @@ export const VerifyCode: React.FunctionComponent<{
})}
>
- {t("verifyYourEmail")}
+ {t("verifyYourEmail")}
{t("stepSummary", {
current: 2,
diff --git a/apps/web/src/components/auth/auth-layout.tsx b/apps/web/src/components/auth/auth-layout.tsx
index 17c9d44e8b6..6922ab45edd 100644
--- a/apps/web/src/components/auth/auth-layout.tsx
+++ b/apps/web/src/components/auth/auth-layout.tsx
@@ -15,7 +15,7 @@ export const AuthCard = ({ children }: { children?: React.ReactNode }) => {
export const AuthFooter = ({ children }: { children?: React.ReactNode }) => {
return (
-
+
{children}
);
diff --git a/apps/web/src/components/card.tsx b/apps/web/src/components/card.tsx
index f4c95d5e3cb..54fa930572b 100644
--- a/apps/web/src/components/card.tsx
+++ b/apps/web/src/components/card.tsx
@@ -11,7 +11,7 @@ export const Card = (
className={cn(
"max-w-full overflow-hidden bg-white shadow-sm",
props.fullWidthOnMobile
- ? "sm:rounded-md sm:border-y sm:border-x"
+ ? "sm:rounded-md sm:border-x sm:border-y"
: "rounded-md border shadow-sm",
props.className,
)}
diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsx
index 7bc8a38700d..724adcd046a 100644
--- a/apps/web/src/components/event-card.tsx
+++ b/apps/web/src/components/event-card.tsx
@@ -41,10 +41,10 @@ export const EventCard = () => {
return (
-
+
{poll.event ? (
@@ -56,7 +56,7 @@ export const EventCard = () => {
) : null}
{preventWidows(poll.title)}
@@ -105,7 +105,7 @@ export const EventCard = () => {
{poll.description ? (
-
+
{poll.description}
@@ -113,12 +113,12 @@ export const EventCard = () => {
) : null}
{poll.location ? (
-
+
{poll.location}
) : null}
-
+
diff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/components/invite-dialog.tsx
index 712160ecb2d..2ffb703d331 100644
--- a/apps/web/src/components/invite-dialog.tsx
+++ b/apps/web/src/components/invite-dialog.tsx
@@ -29,7 +29,7 @@ export function CopyInviteLinkButton() {
return (
{
copyToClipboard(poll.inviteLink);
setDidCopy(true);
@@ -41,7 +41,7 @@ export function CopyInviteLinkButton() {
{didCopy ? (
) : (
- {`${window.location.hostname}/invite/${poll.id}`}
+ {`${window.location.hostname}/invite/${poll.id}`}
)}
);
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index 850dde21ae3..6f1336eb0ba 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -167,9 +167,9 @@ const Layout = ({ children }: React.PropsWithChildren) => {
return (
-
-
-
+
+
+
{pathname === pollLink ? (
diff --git a/apps/web/src/components/page-dialog.tsx b/apps/web/src/components/page-dialog.tsx
index 91bd8370c03..ae9af799bda 100644
--- a/apps/web/src/components/page-dialog.tsx
+++ b/apps/web/src/components/page-dialog.tsx
@@ -37,7 +37,7 @@ export const PageDialogTitle = (props: React.PropsWithChildren) => {
export const PageDialogDescription = (props: React.PropsWithChildren) => {
return (
-
+
{props.children}
);
diff --git a/apps/web/src/components/pay-wall.tsx b/apps/web/src/components/pay-wall.tsx
index 444d4dc94ba..a97e54ff857 100644
--- a/apps/web/src/components/pay-wall.tsx
+++ b/apps/web/src/components/pay-wall.tsx
@@ -45,7 +45,7 @@ const Teaser = () => {
-
+
diff --git a/apps/web/src/components/poll-status.tsx b/apps/web/src/components/poll-status.tsx
index 8ea1dd74408..a11779163e6 100644
--- a/apps/web/src/components/poll-status.tsx
+++ b/apps/web/src/components/poll-status.tsx
@@ -16,7 +16,7 @@ const LabelWithIcon = ({
}) => {
return (
-
+
{children}
);
@@ -55,11 +55,11 @@ export const PollStatusBadge = ({ status }: { status: PollStatus }) => {
return (
{
const { poll } = usePoll();
const { t } = useTranslation();
return (
-
+
{
export const SettingsHeader = ({ children }: React.PropsWithChildren) => {
return (
-
+
{children}
);
@@ -24,7 +24,7 @@ export const SettingsSection = (props: {
children: React.ReactNode;
}) => {
return (
-
+
{props.title}
{props.description}
diff --git a/apps/web/src/components/table.tsx b/apps/web/src/components/table.tsx
index 5051cd29cc3..c86ab3fcf5b 100644
--- a/apps/web/src/components/table.tsx
+++ b/apps/web/src/components/table.tsx
@@ -49,7 +49,7 @@ export const Table = <
-
+
(
ref={ref}
type="text"
className={clsx(
- "appearance-none text-sm rounded border text-gray-800 placeholder:text-gray-500",
+ "appearance-none rounded border text-sm text-gray-800 placeholder:text-gray-500",
className,
{
"px-2.5 py-2": size === "md",
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index d5b33d5d9dc..f7b3a6d3e5d 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -46,10 +46,10 @@ export const UserDropdown = ({ className }: { className?: string }) => {
>
-
+
{user.name}
-
+
@@ -67,7 +67,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
-
+
@@ -77,7 +77,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="/settings/profile"
className="flex items-center gap-x-2"
>
-
+
@@ -87,7 +87,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="/settings/preferences"
className="flex items-center gap-x-2"
>
-
+
@@ -97,7 +97,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="/settings/billing"
className="flex items-center gap-x-2"
>
-
+
@@ -109,7 +109,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="https://support.rallly.co"
className="flex items-center gap-x-2"
>
-
+
@@ -120,7 +120,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="https://support.rallly.co/self-hosting/pricing"
className="flex items-center gap-x-2"
>
-
+
@@ -132,7 +132,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
href="https://feedback.rallly.co"
className="flex items-center gap-x-2"
>
-
+
@@ -141,24 +141,24 @@ export const UserDropdown = ({ className }: { className?: string }) => {
-
+
-
+
{/* Don't use signOut() from next-auth. It doesn't work in vercel-production env. I don't know why. */}
-
+
@@ -167,7 +167,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {
{/* Don't use signOut() from next-auth. It doesn't work in vercel-production env. I don't know why. */}
-
+
diff --git a/apps/web/src/components/user.tsx b/apps/web/src/components/user.tsx
index 1fbd4c770fa..ea0a6140c3e 100644
--- a/apps/web/src/components/user.tsx
+++ b/apps/web/src/components/user.tsx
@@ -44,8 +44,8 @@ export const UserAvatar = ({
!name
? "bg-gray-200"
: colors?.requiresDarkText
- ? "text-gray-800"
- : "text-white",
+ ? "text-gray-800"
+ : "text-white",
className,
)}
style={{
diff --git a/apps/web/src/style.css b/apps/web/src/style.css
index 02ac3cb9760..4f541fdeefa 100644
--- a/apps/web/src/style.css
+++ b/apps/web/src/style.css
@@ -8,7 +8,9 @@
}
body {
@apply text-foreground bg-gray-100;
- font-feature-settings: "rlig" 1, "calt" 1;
+ font-feature-settings:
+ "rlig" 1,
+ "calt" 1;
}
html {
@apply h-full font-sans text-base text-gray-700;
@@ -26,7 +28,7 @@
input,
select,
textarea {
- @apply rounded outline-none focus-visible:ring-1 focus:ring-gray-300;
+ @apply rounded outline-none focus:ring-gray-300 focus-visible:ring-1;
}
#floating-ui-root {
@@ -36,7 +38,7 @@
@layer components {
.text-link {
- @apply hover:text-gray-800 rounded-md outline-none underline focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-1;
+ @apply rounded-md underline outline-none hover:text-gray-800 focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-1;
}
.formField {
@apply mb-4;
diff --git a/apps/web/src/utils/auth.ts b/apps/web/src/utils/auth.ts
index 54ba095d29a..bbe75383882 100644
--- a/apps/web/src/utils/auth.ts
+++ b/apps/web/src/utils/auth.ts
@@ -222,7 +222,7 @@ const getAuthOptions = (...args: GetServerSessionParams) =>
return session;
},
},
- } satisfies NextAuthOptions);
+ }) satisfies NextAuthOptions;
type GetServerSessionParams =
| [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index e6e8bccd14d..29aee703b16 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -4,16 +4,16 @@
"baseUrl": ".",
"paths": {
"@/*": ["src/*"],
- "~/*": ["public/*"]
+ "~/*": ["public/*"],
},
- "strictNullChecks": true
+ "strictNullChecks": true,
},
"include": [
"**/*.ts",
"**/*.tsx",
"**/*.js",
".next/types/**/*.ts",
- "src/app/[locale]/p/[participantUrlId]/page.tsx"
+ "src/app/[locale]/p/[participantUrlId]/page.tsx",
],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/package.json b/package.json
index 56bf5f7c8ed..f472c904748 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"lint": "turbo lint",
"i18n:scan": "turbo i18n:scan",
"lint:tsc": "turbo lint:tsc",
+ "prettier": "prettier --write .",
"release": "./scripts/create-release.sh"
},
"prisma": {
@@ -44,7 +45,8 @@
"devDependencies": {
"dotenv-cli": "^7.1.0",
"npm-run-all": "^4.1.5",
- "prettier": "^2.8.4",
+ "prettier": "^3.2.4",
+ "prettier-plugin-tailwindcss": "^0.5.11",
"turbo": "^1.10.7"
},
"engines": {
diff --git a/packages/backend/tsconfig.json b/packages/backend/tsconfig.json
index 15de53b31e8..5264aff19b5 100644
--- a/packages/backend/tsconfig.json
+++ b/packages/backend/tsconfig.json
@@ -1,5 +1,5 @@
{
"extends": "@rallly/tsconfig/react.json",
"include": ["**/*.ts", "**/*.tsx", "**/*.js"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/packages/database/tsconfig.json b/packages/database/tsconfig.json
index 42e5369c0ef..18a4f135121 100644
--- a/packages/database/tsconfig.json
+++ b/packages/database/tsconfig.json
@@ -1,5 +1,5 @@
{
"extends": "@rallly/tsconfig/next.json",
"include": ["**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/packages/emails/tsconfig.json b/packages/emails/tsconfig.json
index d2fbc2731b5..7f8833f6b33 100644
--- a/packages/emails/tsconfig.json
+++ b/packages/emails/tsconfig.json
@@ -1,5 +1,5 @@
{
"extends": "@rallly/tsconfig/react.json",
"include": ["**/*.ts", "**/*.tsx", "**/*.js"],
- "exclude": ["node_modules", ".react-email"]
+ "exclude": ["node_modules", ".react-email"],
}
diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json
index 42e5369c0ef..18a4f135121 100644
--- a/packages/icons/tsconfig.json
+++ b/packages/icons/tsconfig.json
@@ -1,5 +1,5 @@
{
"extends": "@rallly/tsconfig/next.json",
"include": ["**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/packages/languages/tsconfig.json b/packages/languages/tsconfig.json
index 6eede5d1091..551af516638 100644
--- a/packages/languages/tsconfig.json
+++ b/packages/languages/tsconfig.json
@@ -1,5 +1,5 @@
{
"extends": "@rallly/tsconfig/base.json",
"include": ["**/*.ts"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/packages/ui/alert.tsx b/packages/ui/alert.tsx
index 981b0578ef8..77bffd5d65e 100644
--- a/packages/ui/alert.tsx
+++ b/packages/ui/alert.tsx
@@ -33,7 +33,7 @@ const Alert = React.forwardRef<
{...props}
>
{Icon ? (
-
+
) : null}
{children}
@@ -63,7 +63,7 @@ const AlertDescription = React.forwardRef<
diff --git a/packages/ui/toast.tsx b/packages/ui/toast.tsx
index 9993959e85c..0624a988913 100644
--- a/packages/ui/toast.tsx
+++ b/packages/ui/toast.tsx
@@ -60,7 +60,7 @@ const ToastAction = React.forwardRef<
(({ className, ...props }, ref) => (
));
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index 28ad7958cb2..f6eec80a088 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -3,9 +3,9 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
- "@/*": ["./*"]
- }
+ "@/*": ["./*"],
+ },
},
"include": ["**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules"],
}
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
index e3a00416e98..3584963a30b 100644
--- a/packages/utils/tsconfig.json
+++ b/packages/utils/tsconfig.json
@@ -1,4 +1,4 @@
{
"extends": "@rallly/tsconfig/react.json",
- "include": ["**/*.ts", "**/*.tsx"]
+ "include": ["**/*.ts", "**/*.tsx"],
}
diff --git a/yarn.lock b/yarn.lock
index 5959f475dd6..7bb52318a90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9321,10 +9321,15 @@ prelude-ls@^1.2.1:
resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-prettier@^2.8.4:
- version "2.8.4"
- resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"
- integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
+prettier-plugin-tailwindcss@^0.5.11:
+ version "0.5.11"
+ resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.11.tgz#1aa9308c3285b3cb7942aaeaec8d0e0775ac54d0"
+ integrity sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==
+
+prettier@^3.2.4:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283"
+ integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==
pretty-bytes@^5.6.0:
version "5.6.0"