fix!: improve tailwind handling

dy0gu · Sep 14, 2024 · 442cafe · 442cafe
1 parent 65ede44
commit 442cafe
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 34 deletions.
diff --git a/biome.json b/biome.json
@@ -74,7 +74,7 @@
 			}
 		},
 		{
-			"include": ["src/app/routes/*.tsx"],
+			"include": ["src/routes/*.tsx"],
 			"linter": {
 				"rules": {
 					"style": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,15 +31,15 @@
 		"zod": "^3.23.8"
 	},
 	"devDependencies": {
-		"@playwright/test": "^1.47.1",
 		"@biomejs/biome": "~1.9.0",
+		"@playwright/test": "^1.47.1",
 		"@types/node": "^22.5.4",
 		"@types/react": "^18.3.5",
 		"@types/react-dom": "^18.3.0",
 		"autoprefixer": "^10.4.20",
 		"cross-env": "^7.0.3",
 		"lefthook": "^1.7.15",
-		"postcss": "^8.4.45",
+		"postcss": "^8.4.47",
 		"tailwindcss": "^3.4.11",
 		"typescript": "^5.6.2",
 		"vite": "^5.4.5",

diff --git a/src/data/attributes.ts b/src/data/attributes.ts
@@ -1,3 +1,5 @@
+import stylesheet from "~/styles/tailwind.css?url";
+
 // Reusable values throughout the app
 const info = {
 	name: "Dy0gu",
@@ -16,6 +18,7 @@ const rels = [
 	{ rel: "icon", href: "/favicon.svg", type: "image/svg+xml" },
 	{ rel: "sitemap", href: "/sitemap.xml" },
 	{ rel: "manifest", href: "/manifest.webmanifest" },
+	{ rel: "stylesheet", href: stylesheet },
 ];
 
 export { info, rels };
diff --git a/src/app/root.tsx → src/root.tsx b/src/app/root.tsx → src/root.tsx
@@ -7,12 +7,8 @@ import {
 	Scripts,
 	ScrollRestoration,
 } from "@remix-run/react";
-
-import { metadata } from "~/data/meta";
-
 import { rels } from "~/data/attributes";
-
-import "~/styles/globals.css";
+import { metadata } from "~/data/meta";
 
 export function loader() {
 	return json(metadata);
@@ -37,7 +33,10 @@ export default function Layout() {
 				<Meta />
 				<Links />
 			</head>
-			<body className="bg-black bg-gradient-to-tl from-black via-zinc-600/20 to-black">
+			<body
+				className="bg-black bg-gradient-to-tl from-black via-zinc-600/20 to-black
+			font-mono"
+			>
 				<Outlet />
 				<ScrollRestoration />
 				<Scripts />

diff --git a/src/app/routes/[manifest.webmanifest].tsx → src/routes/[manifest.webmanifest].tsx b/src/app/routes/[manifest.webmanifest].tsx → src/routes/[manifest.webmanifest].tsx
diff --git a/src/app/routes/[robots.txt].tsx → src/routes/[robots.txt].tsx b/src/app/routes/[robots.txt].tsx → src/routes/[robots.txt].tsx
diff --git a/src/app/routes/[sitemap.xml].tsx → src/routes/[sitemap.xml].tsx b/src/app/routes/[sitemap.xml].tsx → src/routes/[sitemap.xml].tsx
diff --git a/src/app/routes/_index.tsx → src/routes/_index.tsx b/src/app/routes/_index.tsx → src/routes/_index.tsx
diff --git a/src/styles/globals.css → src/styles/tailwind.css b/src/styles/globals.css → src/styles/tailwind.css
@@ -20,16 +20,4 @@
 		font-style: italic;
 		src: url("../assets/fonts/RobotoMono-Italic.ttf") format("truetype");
 	}
-
-	body {
-		font-family: "Roboto Mono", monospace;
-		overscroll-behavior-y: none;
-		margin: 0;
-	}
-
-	ul {
-		list-style-type: none;
-		padding: 0;
-		margin: 0;
-	}
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
+		"types": ["@remix-run/node", "vite/client"],
 		"paths": {
 			"~/*": ["./src/*"]
 		},

diff --git a/vite.config.ts b/vite.config.ts
@@ -7,7 +7,7 @@ import tsconfigPaths from "vite-tsconfig-paths";
 export default defineConfig({
 	plugins: [
 		remix({
-			appDirectory: "src/app",
+			appDirectory: "src",
 		}),
 		tsconfigPaths(),
 	],