diff --git a/.gitignore b/.gitignore index 09d7f9a..acf6b4a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ node_modules # React Router .react-router/ -build/ +/build/ # misc diff --git a/.zed/settings.json b/.zed/settings.json index 45d6c30..e42156a 100644 --- a/.zed/settings.json +++ b/.zed/settings.json @@ -17,9 +17,6 @@ "languages": { "TSX": { "language_servers": ["stylelint-lsp", "..."] - }, - "JSON": { - "language_servers": ["biome", "..."] } } } diff --git a/packages/web/app/routes.ts b/packages/web/app/routes.ts index 38f1a4d..102b402 100644 --- a/packages/web/app/routes.ts +++ b/packages/web/app/routes.ts @@ -1,3 +1,3 @@ -import { index, type RouteConfig } from "@react-router/dev/routes"; +import { type RouteConfig, index } from "@react-router/dev/routes"; export default [index("routes/home.tsx")] satisfies RouteConfig; diff --git a/packages/web/app/routes/home.tsx b/packages/web/app/routes/home.tsx index cc4d73f..28efe48 100644 --- a/packages/web/app/routes/home.tsx +++ b/packages/web/app/routes/home.tsx @@ -1,5 +1,5 @@ -import { Welcome } from "../welcome/welcome"; import type { Route } from "./+types/home"; +import { Welcome } from "../welcome/welcome"; export function meta(_args: Route.MetaArgs) { return [ diff --git a/packages/web/app/welcome/welcome.module.css b/packages/web/app/welcome/welcome.module.css deleted file mode 100644 index 960d595..0000000 --- a/packages/web/app/welcome/welcome.module.css +++ /dev/null @@ -1,31 +0,0 @@ -.welcome { - margin: 0 auto; - display: flex; - flex-direction: column; - align-items: center; - - header { - display: flex; - flex-direction: column; - align-items: center; - width: 500px; - max-width: 100vw; - padding: 4px; - - img { - width: 100%; - } - } -} - -.links { - max-width: 300px; - width: 100%; - padding: 0 4px; - - nav { - border-radius: 48px; - border: 1px solid gray; - padding: 6px; - } -} diff --git a/packages/web/app/welcome/welcome.tsx b/packages/web/app/welcome/welcome.tsx index cfb28b0..f4c185f 100644 --- a/packages/web/app/welcome/welcome.tsx +++ b/packages/web/app/welcome/welcome.tsx @@ -1,43 +1,46 @@ import logoDark from "./logo-dark.svg"; import logoLight from "./logo-light.svg"; -import styles from "./welcome.module.css"; export function Welcome() { return ( -
-
- React Router - React Router -
-
- +
+
+
+
+ React Router + React Router +
+
+
+ +
); diff --git a/packages/web/package.json b/packages/web/package.json index 7b54c5e..5b68bc5 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -7,7 +7,7 @@ "build": "react-router build", "dev": "react-router dev", "start": "react-router-serve ./build/server/index.js", - "typecheck": "react-router typegen && tsc -p tsconfig.cssmodulehack.json", + "typecheck": "react-router typegen && tsc", "test": "vitest" }, "dependencies": { diff --git a/packages/web/tsconfig.cssmodulehack.json b/packages/web/tsconfig.cssmodulehack.json deleted file mode 100644 index c00a32a..0000000 --- a/packages/web/tsconfig.cssmodulehack.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "files": [], - "extends": "./tsconfig.json", - "compilerOptions": { - // the typescript-plugin-css-modules only works when typescript is used as a LSP and not when "tsc" is invoked. - // Therefore when tsc is invoked, we need to disable the noPropertyAccessFromIndexSignature option. - // This is good, because its more of a lint anyways - the heavy lifting is done by the - // noUncheckedIndexedAccess rule - "noPropertyAccessFromIndexSignature": false - } -} diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json index be26c19..6a2bd6d 100644 --- a/packages/web/tsconfig.json +++ b/packages/web/tsconfig.json @@ -2,8 +2,7 @@ "files": [], "extends": "../../tsconfig.base.json", "include": [ - "app/**/*", - "*.ts", + "**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*" @@ -12,9 +11,7 @@ "plugins": [ { "name": "typescript-plugin-css-modules", - "options": { - "classnameTransform": "camelCaseOnly" - } + "options": { "classnameTransform": "camelCase" } } ], "rootDirs": [".", "./.react-router/types"], diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts index 568cb33..3055fb4 100644 --- a/packages/web/vite.config.ts +++ b/packages/web/vite.config.ts @@ -8,9 +8,7 @@ export default defineConfig({ plugins: [ checker({ biome: { command: "check", dev: { command: "lint" } }, - typescript: { - tsconfigPath: "./tsconfig.cssmodulehack.json", - }, + typescript: true, stylelint: { lintCommand: "stylelint ./app/**/*.css" }, }), reactRouter(),