refactor!: use default prettier config except for 4-space tabs

mathletedev · mathletedev · commit 0d2d8ec9d2a5 · 2024-09-08T14:24:56.000-07:00
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -1,11 +1,5 @@
 tabWidth: 4
-trailingComma: none
-arrowParens: avoid
 plugins:
     - prettier-plugin-astro
     - prettier-plugin-tailwindcss
     - "@ianvs/prettier-plugin-sort-imports"
-overrides:
-    - files: "package.json"
-      options:
-          tabWidth: 2
diff --git a/astro.config.js b/astro.config.js
@@ -13,17 +13,17 @@ export default defineConfig({
         tailwind({
             config: {
                 path: "tailwind.config.js",
-                applyBaseStyles: false
-            }
+                applyBaseStyles: false,
+            },
         }),
         prefetch(),
         sitemap(),
-        mdx()
+        mdx(),
     ],
     markdown: {
         remarkPlugins: [remarkReadingTime],
         shikiConfig: {
-            theme: "catppuccin-mocha"
-        }
-    }
+            theme: "catppuccin-mocha",
+        },
+    },
 });
diff --git a/package.json b/package.json
@@ -1,34 +1,34 @@
 {
-  "private": true,
-  "scripts": {
-    "dev": "astro dev",
-    "build": "astro build",
-    "preview": "astro preview",
-    "astro": "astro"
-  },
-  "dependencies": {
-    "@astrojs/mdx": "^3.1.3",
-    "@astrojs/prefetch": "^0.2.1",
-    "@astrojs/tailwind": "^3.1.1",
-    "@catppuccin/palette": "^1.2.0",
-    "chart.js": "^4.2.1",
-    "mdast-util-to-string": "^4.0.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-typist-component": "1.0.5",
-    "reading-time": "^1.5.0"
-  },
-  "devDependencies": {
-    "@astrojs/react": "^2.1.0",
-    "@astrojs/sitemap": "^1.2.1",
-    "@catppuccin/tailwindcss": "^0.1.1",
-    "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@types/react": "^18.0.28",
-    "astro": "latest",
-    "prettier": "^3.2.5",
-    "prettier-plugin-astro": "0.13.0",
-    "prettier-plugin-tailwindcss": "^0.6.5",
-    "tailwindcss": "^3.2.7",
-    "typescript": "^5.0.2"
-  }
+    "private": true,
+    "scripts": {
+        "dev": "astro dev",
+        "build": "astro build",
+        "preview": "astro preview",
+        "astro": "astro"
+    },
+    "dependencies": {
+        "@astrojs/mdx": "^3.1.3",
+        "@astrojs/prefetch": "^0.2.1",
+        "@astrojs/tailwind": "^3.1.1",
+        "@catppuccin/palette": "^1.2.0",
+        "chart.js": "^4.2.1",
+        "mdast-util-to-string": "^4.0.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "react-typist-component": "1.0.5",
+        "reading-time": "^1.5.0"
+    },
+    "devDependencies": {
+        "@astrojs/react": "^2.1.0",
+        "@astrojs/sitemap": "^1.2.1",
+        "@catppuccin/tailwindcss": "^0.1.1",
+        "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
+        "@types/react": "^18.0.28",
+        "astro": "latest",
+        "prettier": "^3.2.5",
+        "prettier-plugin-astro": "0.13.0",
+        "prettier-plugin-tailwindcss": "^0.6.5",
+        "tailwindcss": "^3.2.7",
+        "typescript": "^5.0.2"
+    }
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -3,6 +3,6 @@ module.exports = {
         "postcss-import": {},
         "tailwindcss/nesting": {},
         tailwindcss: {},
-        autoprefixer: {}
-    }
+        autoprefixer: {},
+    },
 };
diff --git a/src/components/TypistLoop.tsx b/src/components/TypistLoop.tsx
@@ -7,14 +7,14 @@ export interface Props {
 
 const shuffle = (array: string[]) =>
     array
-        .map(value => ({ value, sort: Math.random() }))
+        .map((value) => ({ value, sort: Math.random() }))
         .sort((a, b) => a.sort - b.sort)
         .map(({ value }) => value);
 
-const TypistLoop: FC<Props> = ({ texts }) => (
+const TypistLoop: FC = ({ texts }) => (
     <div className="h-24">
         <Typist typingDelay={100} loop>
-            {shuffle(texts).map(text => (
+            {shuffle(texts).map((text) => (
                 <div key={text}>
                     <Typist.Delay ms={1000} />
                     <p className="text-center text-2xl md:text-4xl italic opacity-80 select-none rainbow-text neon">
diff --git a/src/lib/chart.ts b/src/lib/chart.ts
@@ -18,7 +18,7 @@ export const CHART_COLOURS = [
     "rgb(249, 226, 175, 0.5)",
     "rgb(166, 227, 161, 0.5)",
     "rgb(137, 180, 250, 0.5)",
-    "rgb(180, 190, 254, 0.5)"
+    "rgb(180, 190, 254, 0.5)",
 ];
 
 export const createChart = (target: HTMLCanvasElement, data: Record) =>
@@ -33,19 +33,19 @@ export const createChart = (target: HTMLCanvasElement, data: Record) =>
                         display: true,
                         font: {
                             family: "PT Sans",
-                            size: 18
-                        }
-                    }
-                }
-            }
+                            size: 18,
+                        },
+                    },
+                },
+            },
         },
         data: {
             labels: Object.keys(data),
             datasets: [
                 {
                     data: Object.values(data),
-                    backgroundColor: CHART_COLOURS
-                }
-            ]
-        }
+                    backgroundColor: CHART_COLOURS,
+                },
+            ],
+        },
     });
diff --git a/src/lib/fade.ts b/src/lib/fade.ts
@@ -10,6 +10,6 @@ for (let i = 0; i < container.children.length; i++) {
             child.style.pointerEvents = "unset";
             child.style.opacity = "1";
         },
-        i * 200 + 500
+        i * 200 + 500,
     );
 }
diff --git a/src/lib/matrix.ts b/src/lib/matrix.ts
@@ -21,7 +21,7 @@ const MESSAGES = [
     "THEMATRIX",
     "3.1415926535",
     "6.2831853071",
-    "2.7182818284"
+    "2.7182818284",
 ];
 
 const canvas = document.querySelector("canvas")!;
@@ -45,7 +45,7 @@ let frame = 0;
 
 let mouse = { x: -1000, y: -1000, acc: 0 };
 
-document.onmousemove = e => {
+document.onmousemove = (e) => {
     mouse.x = e.clientX;
     mouse.y = e.clientY;
     mouse.acc += e.movementX * e.movementX + e.movementY * e.movementY;
@@ -73,12 +73,12 @@ class Stream {
         if (frame % this.speed === 0) {
             if (!this.message) {
                 this.chars.push(
-                    CHARSET[Math.floor(Math.random() * CHARSET.length)]
+                    CHARSET[Math.floor(Math.random() * CHARSET.length)],
                 );
             } else {
                 // custom message
                 this.chars.push(
-                    this.message[(frame / this.speed) % this.message.length]
+                    this.message[(frame / this.speed) % this.message.length],
                 );
             }
 
@@ -156,8 +156,8 @@ const tick = () => {
                 new Stream(
                     Math.floor((Math.random() * canvas.width) / CHAR_WIDTH) *
                         CHAR_WIDTH,
-                    message
-                )
+                    message,
+                ),
             );
         }
 
diff --git a/src/lib/scroll.ts b/src/lib/scroll.ts
@@ -8,7 +8,7 @@ export const setup = (text: string) => {
 
 let index = 0;
 
-document.onwheel = e => {
+document.onwheel = (e) => {
     let random = Math.floor(Math.random() * 7) + 1;
 
     if (e.deltaY < 0 && index > 0) {
diff --git a/src/lib/skills.ts b/src/lib/skills.ts
@@ -1,35 +1,34 @@
 import { CHART_COLOURS, createChart } from "./chart";
 
 const skills = document.getElementById("skills") as HTMLCanvasElement;
-const nav = document.getElementById("fade")!
-    .children as HTMLCollectionOf<HTMLElement>;
+const nav = document.getElementById("fade")!.children as HTMLCollectionOf;
 
 skills.width = skills.height = Math.min(500, window.innerWidth - 32);
 
-const CHARTS: Record<string, number>[] = [
+const CHARTS: Record[] = [
     {
         TypeScript: 10,
         Rust: 9,
         "C/C++": 8,
         Go: 7,
         Gleam: 6,
-        Python: 5
+        Python: 5,
     },
     {
         Astro: 10,
         Svelte: 9,
         Tailwind: 10,
         GraphQL: 9,
         tRPC: 8,
-        PostgreSQL: 9
+        PostgreSQL: 9,
     },
     {
         "GNU/Linux": 10,
         Nix: 9,
         Neovim: 10,
         Git: 9,
-        Jira: 7
-    }
+        Jira: 7,
+    },
 ];
 
 let chart = createChart(skills, CHARTS[0]);
@@ -44,8 +43,8 @@ for (let i = 0; i < nav.length; i++) {
         chart.data.datasets = [
             {
                 data: Object.values(CHARTS[i]),
-                backgroundColor: CHART_COLOURS
-            }
+                backgroundColor: CHART_COLOURS,
+            },
         ];
         chart.update();
 
diff --git a/src/pages/blog.astro b/src/pages/blog.astro
@@ -16,9 +16,9 @@ const posts = await Astro.glob<Frontmatter>("./blog/*.mdx");
             {
                 posts
                     .sort((a, b) =>
-                        a.frontmatter.date < b.frontmatter.date ? 1 : -1
+                        a.frontmatter.date < b.frontmatter.date ? 1 : -1,
                     )
-                    .map(post => (
+                    .map((post) => (
                         <a
                             class="mb-4 flex w-[80vw] rounded-lg border-2 border-base p-4 font-bold text-lavender transition-colors hover:border-lavender sm:text-xl md:w-[50vw] lg:text-2xl"
                             href={post.url}
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -31,7 +31,7 @@ import { COLOURS } from "../lib/colours";
                 "Teacher",
                 "Violinist",
                 "Tennis Player",
-                "NixOS User"
+                "NixOS User",
             ]}
         />
     </div>
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -4,13 +4,13 @@ module.exports = {
     theme: {
         extend: {
             fontFamily: {
-                sans: "Victor Mono"
-            }
-        }
+                sans: "Victor Mono",
+            },
+        },
     },
     plugins: [
         require("@catppuccin/tailwindcss")({
-            defaultFlavour: "mocha"
-        })
-    ]
+            defaultFlavour: "mocha",
+        }),
+    ],
 };

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ for (let i = 0; i < container.children.length; i++) {`
`10`	`10`	`child.style.pointerEvents = "unset";`
`11`	`11`	`child.style.opacity = "1";`
`12`	`12`	`},`
`13`		`- i * 200 + 500`
	`13`	`+ i * 200 + 500,`
`14`	`14`	`);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ const posts = await Astro.glob<Frontmatter>("./blog/*.mdx");`
`16`	`16`	`{`
`17`	`17`	`posts`
`18`	`18`	`.sort((a, b) =>`
`19`		`- a.frontmatter.date < b.frontmatter.date ? 1 : -1`
	`19`	`+ a.frontmatter.date < b.frontmatter.date ? 1 : -1,`
`20`	`20`	`)`
`21`		`- .map(post => (`
	`21`	`+ .map((post) => (`
`22`	`22`	`<a`
`23`	`23`	`class="mb-4 flex w-[80vw] rounded-lg border-2 border-base p-4 font-bold text-lavender transition-colors hover:border-lavender sm:text-xl md:w-[50vw] lg:text-2xl"`
`24`	`24`	`href={post.url}`