Fix prettier tsconfig issue

sawden · Feb 10, 2024 · a460cf8 · a460cf8
1 parent 87064a5
commit a460cf8
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 44 deletions.
diff --git a/apps/backend/src/admin/tsconfig.json b/apps/backend/src/admin/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "@strapi/typescript-utils/tsconfigs/admin",
   "include": ["../plugins/**/admin/src/**/*", "./"],
-  "exclude": ["node_modules/", "build/", "dist/", "**/*.test.ts"]
+  "exclude": ["node_modules/", "build/", "dist/", "**/*.test.ts"],
 }
diff --git a/apps/backend/src/api/page/content-types/page/schema.json b/apps/backend/src/api/page/content-types/page/schema.json
@@ -40,10 +40,7 @@
         }
       },
       "type": "dynamiczone",
-      "components": [
-        "sections.link-cards",
-        "sections.rich-text"
-      ]
+      "components": ["sections.link-cards", "sections.rich-text"]
     },
     "seo": {
       "displayName": "Seo",

diff --git a/apps/backend/tsconfig.json b/apps/backend/tsconfig.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": ".",
-    "strictNullChecks": true
+    "strictNullChecks": true,
   },
   "include": ["./", "./**/*.ts", "./**/*.js", "src/**/*.json"],
   "exclude": [
@@ -14,6 +14,6 @@
     ".tmp/",
     "src/admin/",
     "**/*.test.*",
-    "src/plugins/**"
-  ]
+    "src/plugins/**",
+  ],
 }
diff --git a/apps/frontend/src/app/[locale]/[slug]/page.tsx b/apps/frontend/src/app/[locale]/[slug]/page.tsx
@@ -1,11 +1,11 @@
 import Image from "next/image";
 
+import { Hero } from "@/components/hero";
+import { sectionRenderer } from "@/components/section-renderer";
 import { fetchOneBySlug } from "@/lib/api";
 import type { APIUrlParams } from "@/lib/api/types";
 import { Callout } from "@turbostrapi/ui";
 import { notFound } from "next/navigation";
-import { sectionRenderer } from "@/components/section-renderer";
-import { Hero } from "@/components/hero";
 
 interface PageProps {
   params: {
@@ -49,7 +49,7 @@ export default async function Page({
         >
           apps/frontend
         </Callout>
-        <div className="fixed bottom-0 left-0 flex h-36 w-full items-end justify-center bg-gradient-to-t from-white via-white md:static md:h-auto md:w-auto md:bg-none dark:from-black dark:via-black">
+        <div className="fixed bottom-0 left-0 flex h-36 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black md:static md:h-auto md:w-auto md:bg-none">
           <a
             className="pointer-events-none flex place-items-center gap-2 p-8 md:pointer-events-auto md:p-0"
             href={`https://vercel.com?utm_source=turbostrapi-starter&utm_medium=basic&utm_campaign=turbostrapi-starter`}

diff --git a/apps/frontend/src/app/[locale]/page.tsx b/apps/frontend/src/app/[locale]/page.tsx
@@ -1,11 +1,11 @@
 import Image from "next/image";
 
+import { Hero } from "@/components/hero";
+import { sectionRenderer } from "@/components/section-renderer";
 import { fetchOneBySlug } from "@/lib/api";
 import type { APIUrlParams } from "@/lib/api/types";
 import { Callout } from "@turbostrapi/ui";
 import { notFound } from "next/navigation";
-import { sectionRenderer } from "@/components/section-renderer";
-import { Hero } from "@/components/hero";
 
 interface PageProps {
   params: {
@@ -50,7 +50,7 @@ export default async function Page({
         >
           apps/frontend
         </Callout>
-        <div className="fixed bottom-0 left-0 flex h-36 w-full items-end justify-center bg-gradient-to-t from-white via-white md:static md:h-auto md:w-auto md:bg-none dark:from-black dark:via-black">
+        <div className="fixed bottom-0 left-0 flex h-36 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black md:static md:h-auto md:w-auto md:bg-none">
           <a
             className="pointer-events-none flex place-items-center gap-2 p-8 md:pointer-events-auto md:p-0"
             href={`https://vercel.com?utm_source=turbostrapi-starter&utm_medium=basic&utm_campaign=turbostrapi-starter`}

diff --git a/apps/frontend/src/components/hero/index.tsx b/apps/frontend/src/components/hero/index.tsx
@@ -97,7 +97,7 @@ const Hero = React.forwardRef<HTMLDivElement, HeroProps>(
         </div>
         <div className="z-50 flex flex-col items-center justify-center px-6 text-center">
           <Image
-            className="w-[160px] fill-current md:w-[200px] dark:invert"
+            className="w-[160px] fill-current dark:invert md:w-[200px]"
             alt="Turborepo wordmark"
             width={200}
             height={20}

diff --git a/apps/frontend/src/components/section-renderer/sections/link-cards.tsx b/apps/frontend/src/components/section-renderer/sections/link-cards.tsx
@@ -4,36 +4,38 @@ import { cx } from "@turbostrapi/cva";
 import { Card } from "@turbostrapi/ui";
 import * as React from "react";
 
-export interface LinkCardsSectionProps extends React.HTMLAttributes<HTMLDivElement> {
+export interface LinkCardsSectionProps
+  extends React.HTMLAttributes<HTMLDivElement> {
   section: Attribute.GetDynamicZoneValue<
     Attribute.DynamicZone<["sections.link-cards"]>
   >[number];
   locale: string;
 }
 
-const LinkCardsSection = React.forwardRef<HTMLDivElement, LinkCardsSectionProps>(
-  ({ className, section, locale, ...props }, ref) => (
-    <div
-      className={cx(
-        "z-20 grid text-center md:grid-cols-2 md:text-left lg:w-full lg:max-w-5xl lg:grid-cols-4",
-        className,
-      )}
-      ref={ref}
-      {...props}
-    >
-      {section.cards?.map((card) => (
-        <Card
-          href={localizeHref(card.url, locale)}
-          key={card.id}
-          title={card.title}
-          target={card.target}
-        >
-          {card.description}
-        </Card>
-      ))}
-    </div>
-  ),
-);
+const LinkCardsSection = React.forwardRef<
+  HTMLDivElement,
+  LinkCardsSectionProps
+>(({ className, section, locale, ...props }, ref) => (
+  <div
+    className={cx(
+      "z-20 grid text-center md:grid-cols-2 md:text-left lg:w-full lg:max-w-5xl lg:grid-cols-4",
+      className,
+    )}
+    ref={ref}
+    {...props}
+  >
+    {section.cards?.map((card) => (
+      <Card
+        href={localizeHref(card.url, locale)}
+        key={card.id}
+        title={card.title}
+        target={card.target}
+      >
+        {card.description}
+      </Card>
+    ))}
+  </div>
+));
 
 LinkCardsSection.displayName = "Link Cards";
 

diff --git a/apps/frontend/src/components/section-renderer/sections/rich-text.tsx b/apps/frontend/src/components/section-renderer/sections/rich-text.tsx
@@ -4,7 +4,8 @@ import { BlocksRenderer } from "@strapi/blocks-react-renderer";
 import type { Attribute } from "@turbostrapi/backend";
 import * as React from "react";
 
-export interface RichTextSectionProps extends React.HTMLAttributes<HTMLDivElement> {
+export interface RichTextSectionProps
+  extends React.HTMLAttributes<HTMLDivElement> {
   section: Attribute.GetDynamicZoneValue<
     Attribute.DynamicZone<["sections.rich-text"]>
   >[number];

diff --git a/apps/frontend/tsconfig.json b/apps/frontend/tsconfig.json
@@ -4,15 +4,15 @@
     "plugins": [{ "name": "next" }],
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
-    }
+      "@/*": ["./src/*"],
+    },
   },
   "include": [
     ".",
     "next-env.d.ts",
     "**/*.ts",
     "**/*.tsx",
-    ".next/types/**/*.ts"
+    ".next/types/**/*.ts",
   ],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
 }
diff --git a/configs/prettier-config/base.cjs b/configs/prettier-config/base.cjs
@@ -1,3 +1,15 @@
 module.exports = {
   plugins: ["prettier-plugin-packagejson", "prettier-plugin-organize-imports"],
+  /**
+   * Fixes prettier formatting for tsconfig.json files with trailing commas.
+   * @todo Remove this fix after https://github.com/prettier/prettier/issues/15956 is resolved.
+   */
+  overrides: [
+    {
+      files: ["tsconfig.json"],
+      options: {
+        trailingComma: "none",
+      },
+    },
+  ],
 };