Update prettier and fix formatting

2025-07-26 12:47:55 +02:00 · 2024-11-09 15:34:19 +00:00 · 2024-11-09 15:34:19 +00:00 · c00e575a61
commit c00e575a61
parent 19b7e1ec04
29 changed files with 47 additions and 44 deletions
--- a/apps/landing/src/app/[locale]/blog/layout.tsx
+++ b/apps/landing/src/app/[locale]/blog/layout.tsx
@ -12,7 +12,7 @@ export default function BlogLayout({
        <div className="mx-auto max-w-2xl space-y-12">
          {children}
          <div className="overflow-hidden rounded-md border bg-gray-200/50 backdrop-blur-sm">
-            <div className="flex flex-col gap-x-4 gap-y-2 p-6  pb-0 sm:flex-row">
+            <div className="flex flex-col gap-x-4 gap-y-2 p-6 pb-0 sm:flex-row">
              <div>
                <NewspaperIcon className="size-6" />
              </div>
--- a/apps/landing/src/app/[locale]/footer.tsx
+++ b/apps/landing/src/app/[locale]/footer.tsx
@ -63,7 +63,7 @@ export const Footer: React.FunctionComponent = () => {
  return (
    <div className="mx-auto space-y-8">
      <div className="space-y-16 lg:flex lg:space-x-8 lg:space-y-0">
-        <div className=" lg:w-2/6">
+        <div className="lg:w-2/6">
          <Image
            src="/logo-grayscale.svg"
            width={140}
--- a/apps/landing/src/app/[locale]/nav-link.tsx
+++ b/apps/landing/src/app/[locale]/nav-link.tsx
@ -14,7 +14,7 @@ export const NavLink = ({
    <Link
      className={cn(
        "inline-flex items-center gap-x-2.5 rounded text-sm font-medium",
-        isActive ? "" : "hover:text-primary text-muted-foreground ",
+        isActive ? "" : "hover:text-primary text-muted-foreground",
        className,
      )}
      {...props}
--- a/apps/landing/src/app/[locale]/pricing/page.tsx
+++ b/apps/landing/src/app/[locale]/pricing/page.tsx
@ -126,7 +126,7 @@ export default async function Page({ params }: { params: { locale: string } }) {
  const { t } = await getTranslation(params.locale, ["common", "pricing"]);
  return (
    <article className="mx-auto max-w-3xl space-y-6">
-      <header className="space-y-2 sm:p-6 sm:text-center ">
+      <header className="space-y-2 sm:p-6 sm:text-center">
        <h1 className="text-2xl font-bold tracking-tight sm:text-4xl">
          <Trans
            t={t}
--- a/apps/landing/src/components/error-page.tsx
+++ b/apps/landing/src/components/error-page.tsx
@ -25,7 +25,7 @@ const ErrorPage: React.FunctionComponent<ComponentProps> = ({
          {icon || (
            <FileSearchIcon className="mb-4 inline-block size-24 text-gray-400" />
          )}
-          <div className="text-primary-600 mb-2 text-3xl font-bold ">
+          <div className="text-primary-600 mb-2 text-3xl font-bold">
            {title}
          </div>
          <p className="text-gray-600">{description}</p>
--- a/apps/landing/src/components/home/bonus.tsx
+++ b/apps/landing/src/components/home/bonus.tsx
@ -13,7 +13,7 @@ import { BonusItem } from "@/components/home/bonus-item";
 export async function Bonus({ t }: { t: TFunction }) {
  const userCount = await prisma.user.count();
  return (
-    <div className="mx-auto flex flex-wrap justify-center  gap-2 whitespace-nowrap text-center sm:grid-cols-4 sm:gap-4 sm:gap-x-8">
+    <div className="mx-auto flex flex-wrap justify-center gap-2 whitespace-nowrap text-center sm:grid-cols-4 sm:gap-4 sm:gap-x-8">
      <BonusItem
        className="bg-indigo-600"
        icon={<Users2Icon className="size-4" />}
--- a/apps/landing/src/components/marketing.tsx
+++ b/apps/landing/src/components/marketing.tsx
@ -266,7 +266,7 @@ export const BigTestimonial = () => {
      initial={{ opacity: 0, y: 20 }}
      whileInView={{ opacity: 1, y: 0 }}
      viewport={{ once: true, amount: "all" }}
-      className="flex flex-col items-center gap-y-8 "
+      className="flex flex-col items-center gap-y-8"
    >
      <Image
        src="/static/images/stars-5.svg"
--- a/apps/landing/src/style.css
+++ b/apps/landing/src/style.css
@ -62,7 +62,7 @@
      @apply mb-6 leading-relaxed;
    }
    p:has(> img) {
-      @apply flex items-center justify-center overflow-hidden rounded-xl border bg-gray-50  p-2;
+      @apply flex items-center justify-center overflow-hidden rounded-xl border bg-gray-50 p-2;
    }
    img {
      @apply mx-auto rounded-lg border;
@ -126,7 +126,7 @@
  }

  .btn-default {
-    @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200  active:shadow-none;
+    @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200 active:shadow-none;
  }
  .btn-danger {
    text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
--- a/apps/web/src/app/[locale]/(admin)/menu-item.tsx
+++ b/apps/web/src/app/[locale]/(admin)/menu-item.tsx
@ -24,7 +24,7 @@ export function MenuItem({
        isCurrent
          ? "bg-gray-200 text-indigo-600"
          : "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",
+        "group flex items-center gap-x-3 rounded-md px-3 py-2 text-sm font-semibold leading-6",
      )}
    >
      <Icon
--- a/apps/web/src/app/[locale]/(admin)/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(admin)/sidebar.tsx
@ -63,7 +63,7 @@ export function Sidebar() {
  const { user } = useUser();
  const posthog = usePostHog();
  return (
-    <nav className="flex flex-1 flex-col ">
+    <nav className="flex flex-1 flex-col">
      <ul role="list" className="flex flex-1 flex-col gap-y-7">
        <li>
          <ul role="list" className="-mx-2 space-y-1">
--- a/apps/web/src/app/[locale]/not-found.tsx
+++ b/apps/web/src/app/[locale]/not-found.tsx
@ -14,7 +14,7 @@ export default async function Page() {
      <div className="space-y-8">
        <div className="space-y-4 text-center">
          <FileSearchIcon className="mb-4 inline-block size-24 text-gray-400" />
-          <div className="text-primary-600 mb-2 text-3xl font-bold ">
+          <div className="text-primary-600 mb-2 text-3xl font-bold">
            {t("errors_notFoundTitle")}
          </div>
          <p className="text-gray-600">{t("errors_notFoundDescription")}</p>
--- a/apps/web/src/components/cookie-consent.tsx
+++ b/apps/web/src/components/cookie-consent.tsx
@ -51,7 +51,7 @@ const CookieConsentPopover = () => {
                    Cookies.set("rallly_cookie_consent", "1", { expires: 365 });
                    setVisible(false);
                  }}
-                  className="bg-primary-600 hover:bg-primary-600/90 focus:ring-primary-200 active:bg-primary-600/90 grow rounded-md px-5 py-1  font-semibold text-white shadow-sm transition-all focus:ring-2"
+                  className="bg-primary-600 hover:bg-primary-600/90 focus:ring-primary-200 active:bg-primary-600/90 grow rounded-md px-5 py-1 font-semibold text-white shadow-sm transition-all focus:ring-2"
                >
                  OK
                </button>
--- a/apps/web/src/components/discussion/discussion.tsx
+++ b/apps/web/src/components/discussion/discussion.tsx
@ -229,7 +229,7 @@ function DiscussionInner() {
                          </Badge>
                        ) : null}
                      </Participant>
-                      <div className="flex items-center gap-2 text-sm ">
+                      <div className="flex items-center gap-2 text-sm">
                        <div className="text-gray-500">
                          {dayjs(comment.createdAt).fromNow()}
                        </div>
--- a/apps/web/src/components/error-page.tsx
+++ b/apps/web/src/components/error-page.tsx
@ -21,7 +21,7 @@ const ErrorPage: React.FunctionComponent<ComponentProps> = ({
      <div className="space-y-8">
        <div className="space-y-4 text-center">
          <Icon className="mb-4 inline-block size-24 text-gray-400" />
-          <div className="text-primary-600 mb-2 text-3xl font-bold ">
+          <div className="text-primary-600 mb-2 text-3xl font-bold">
            {title}
          </div>
          <p className="text-gray-600">{description}</p>
--- a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/week-calendar.tsx
@ -101,7 +101,7 @@ const WeekCalendar: React.FunctionComponent<DateTimePickerProps> = ({
              <div
                // onClick prop doesn't work properly. Seems like some other element is cancelling the event before it reaches this element
                onMouseUp={props.onClick}
-                className="text-primary-500 border-primary-300 hover:border-primary-400 hover:text-primary-600 group absolute ml-1 flex max-h-full flex-col  justify-between overflow-hidden rounded-lg border border-dashed bg-white/50 p-1 text-xs shadow-sm hover:cursor-pointer"
+                className="text-primary-500 border-primary-300 hover:border-primary-400 hover:text-primary-600 group absolute ml-1 flex max-h-full flex-col justify-between overflow-hidden rounded-lg border border-dashed bg-white/50 p-1 text-xs shadow-sm hover:cursor-pointer"
                style={{
                  top: `calc(${props.style?.top}% + 4px)`,
                  height: `calc(${props.style?.height}% - 8px)`,
@ -127,7 +127,7 @@ const WeekCalendar: React.FunctionComponent<DateTimePickerProps> = ({
            header: function Header({ date }: any) {
              return (
                <span className="w-full rounded-md text-center text-sm tracking-tight">
-                  <span className="mr-1.5  font-normal opacity-50">
+                  <span className="mr-1.5 font-normal opacity-50">
                    {dayjs(date).format("ddd")}
                  </span>
                  <span className="font-medium">
@ -143,7 +143,7 @@ const WeekCalendar: React.FunctionComponent<DateTimePickerProps> = ({
            children?: React.ReactNode;
          }) {
            return (
-              <div className="h-6  text-xs leading-none text-gray-500">
+              <div className="h-6 text-xs leading-none text-gray-500">
                {children}
              </div>
            );
--- a/apps/web/src/components/forms/poll-settings.tsx
+++ b/apps/web/src/components/forms/poll-settings.tsx
@ -54,7 +54,7 @@ const Setting = ({ children }: React.PropsWithChildren) => {
    <label
      className={cn(
        "cursor-pointer bg-white hover:bg-gray-50 active:bg-gray-100",
-        "flex select-none justify-between gap-x-4 gap-y-2.5 rounded-md border p-3 sm:flex-row ",
+        "flex select-none justify-between gap-x-4 gap-y-2.5 rounded-md border p-3 sm:flex-row",
      )}
    >
      {children}
--- a/apps/web/src/components/poll/desktop-poll.tsx
+++ b/apps/web/src/components/poll/desktop-poll.tsx
@ -291,7 +291,7 @@ const DesktopPoll: React.FunctionComponent = () => {
                    "scrollbar-thin hover:scrollbar-thumb-gray-400 scrollbar-thumb-gray-300 scrollbar-track-gray-100 relative z-10 flex-grow overflow-auto scroll-smooth",
                  )}
                >
-                  <table className="w-full table-auto border-separate border-spacing-0 bg-gray-50  ">
+                  <table className="w-full table-auto border-separate border-spacing-0 bg-gray-50">
                    <thead>
                      <PollHeader />
                    </thead>
--- a/apps/web/src/components/steps/steps.tsx
+++ b/apps/web/src/components/steps/steps.tsx
@ -28,7 +28,7 @@ const Steps: React.FunctionComponent<StepsProps> = ({
          return (
            <span
              key={i}
-              className={clsx("h-2  w-2 rounded-full transition-all", {
+              className={clsx("h-2 w-2 rounded-full transition-all", {
                "bg-primary-400": i <= current,
                "bg-gray-300": i > current,
                "ring-primary-200 animate-pulse ring-4": i === current,
--- a/apps/web/src/style.css
+++ b/apps/web/src/style.css
@ -42,7 +42,7 @@
  .input {
    @apply appearance-none border px-2 text-gray-800 placeholder:text-gray-500;
    @apply focus-visible:ring-offset-input-background focus-visible:ring-1 focus-visible:ring-offset-1;
-    @apply focus-visible:border-primary-400  focus-visible:ring-primary-100;
+    @apply focus-visible:border-primary-400 focus-visible:ring-primary-100;
  }
  input.input {
    @apply h-9;
@ -64,7 +64,7 @@
  }

  .btn-default {
-    @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200  active:shadow-none;
+    @apply btn bg-white/50 text-gray-700 hover:bg-gray-50 hover:shadow-sm active:bg-gray-200 active:shadow-none;
  }
  .btn-danger {
    text-shadow: rgb(0 0 0 / 20%) 0px 1px 1px;
--- a/package.json
+++ b/package.json
@ -44,8 +44,8 @@
    "framer-motion": "^10.16.4",
    "next": "^14.2.13",
    "npm-run-all": "^4.1.5",
-    "prettier": "^3.2.4",
-    "prettier-plugin-tailwindcss": "^0.5.11",
+    "prettier": "^3.3.3",
+    "prettier-plugin-tailwindcss": "^0.6.8",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
    "tailwindcss": "^3.4.4",
--- a/packages/billing/package.json
+++ b/packages/billing/package.json
@ -19,5 +19,8 @@
    "@rallly/ui": "*",
    "next": "*",
    "stripe": "^13.2.0"
+  },
+  "devDependencies": {
+    "@rallly/eslint-config": "*"
  }
 }
--- a/packages/billing/tsconfig.json
+++ b/packages/billing/tsconfig.json
@ -1,5 +1,5 @@
 {
  "extends": "@rallly/tsconfig/next.json",
  "include": ["**/*.ts", "**/*.tsx", "**/*.js"],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }
--- 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"]
 }
--- a/packages/emails/tsconfig.json
+++ b/packages/emails/tsconfig.json
@ -3,9 +3,9 @@
  "compilerOptions": {
    "strict": true,
    "strictNullChecks": true,
-    "resolveJsonModule": true,
+    "resolveJsonModule": true
  },
  "files": ["i18next.d.ts"],
  "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules", ".react-email"],
+  "exclude": ["node_modules", ".react-email"]
 }
--- a/packages/posthog/tsconfig.json
+++ b/packages/posthog/tsconfig.json
@ -1,5 +1,5 @@
 {
  "extends": "@rallly/tsconfig/next.json",
  "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }
--- a/packages/ui/src/textarea.tsx
+++ b/packages/ui/src/textarea.tsx
@ -11,7 +11,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
        className={cn(
          "border-input placeholder:text-muted-foreground flex min-h-[80px] rounded-md border bg-white px-2 py-2 text-sm disabled:cursor-not-allowed disabled:opacity-50",
          "focus-visible:ring-offset-input-background focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-offset-1",
-          "focus-visible:border-primary-400  focus-visible:ring-primary-100",
+          "focus-visible:border-primary-400 focus-visible:ring-primary-100",
          className,
        )}
        ref={ref}
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@ -5,9 +5,9 @@
    "paths": {
      "@/utils": ["src/lib/utils.ts"],
      "@/components/*": ["src/*"],
-      "@/ui/*": ["src/*"],
-    },
+      "@/ui/*": ["src/*"]
+    }
  },
  "include": ["**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }
--- a/packages/utils/tsconfig.json
+++ b/packages/utils/tsconfig.json
@ -1,7 +1,7 @@
 {
  "compilerOptions": {
-    "types": ["vitest/globals"],
+    "types": ["vitest/globals"]
  },
  "extends": "@rallly/tsconfig/base.json",
-  "include": ["**/*.ts", "**/*.tsx"],
+  "include": ["**/*.ts", "**/*.tsx"]
 }
--- a/yarn.lock
+++ b/yarn.lock
@ -12770,15 +12770,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-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-plugin-tailwindcss@^0.6.8:
+  version "0.6.8"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.8.tgz#8a178e1679e3f941cc9de396f109c6cffea676d8"
+  integrity sha512-dGu3kdm7SXPkiW4nzeWKCl3uoImdd5CTZEJGxyypEPL37Wj0HT2pLqjrvSei1nTeuQfO4PUfjeW5cTUNRLZ4sA==

-prettier@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283"
-  integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==
+prettier@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
+  integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==

 pretty-format@^3.8.0:
  version "3.8.0"