From eef3dcd1f8181e7730aa94870c26ae23ff1c9e1a Mon Sep 17 00:00:00 2001 From: KoCoder Date: Mon, 2 Sep 2024 20:22:58 +0200 Subject: [PATCH] Install Prettier --- .prettierignore | 6 ++++++ .prettierrc | 1 + .vscode/settings.json | 5 +++++ README.md | 1 - app.config.ts | 4 ++-- app/client.tsx | 10 +++++----- app/routeTree.gen.ts | 26 +++++++++++++------------- app/router.tsx | 12 ++++++------ app/routes/__root.tsx | 22 +++++++++++----------- app/routes/index.tsx | 14 ++++++-------- app/ssr.tsx | 23 +++++++++++------------ package-lock.json | 1 + package.json | 1 + tsconfig.json | 15 +++++++-------- 14 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 .vscode/settings.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..01198ad --- /dev/null +++ b/.prettierignore @@ -0,0 +1,6 @@ +# Ignore artifcats: +build +coverage + +.vinxi +node_modules \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cc2eabd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnPaste": true, + "editor.formatOnSave": true +} diff --git a/README.md b/README.md index 07e06a0..e994f51 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ # szuntis-frontend - diff --git a/app.config.ts b/app.config.ts index 9015d47..e00f8db 100644 --- a/app.config.ts +++ b/app.config.ts @@ -1,3 +1,3 @@ -import { defineConfig } from '@tanstack/start/config' +import { defineConfig } from "@tanstack/start/config"; -export default defineConfig({}) \ No newline at end of file +export default defineConfig({}); diff --git a/app/client.tsx b/app/client.tsx index f16ba73..4519427 100644 --- a/app/client.tsx +++ b/app/client.tsx @@ -1,7 +1,7 @@ -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/start' -import { createRouter } from './router' +import { hydrateRoot } from "react-dom/client"; +import { StartClient } from "@tanstack/start"; +import { createRouter } from "./router"; -const router = createRouter() +const router = createRouter(); -hydrateRoot(document.getElementById('root')!, ) +hydrateRoot(document.getElementById("root")!, ); diff --git a/app/routeTree.gen.ts b/app/routeTree.gen.ts index 5ecc21f..c88597e 100644 --- a/app/routeTree.gen.ts +++ b/app/routeTree.gen.ts @@ -10,33 +10,33 @@ // Import Routes -import { Route as rootRoute } from './routes/__root' -import { Route as IndexImport } from './routes/index' +import { Route as rootRoute } from "./routes/__root"; +import { Route as IndexImport } from "./routes/index"; // Create/Update Routes const IndexRoute = IndexImport.update({ - path: '/', + path: "/", getParentRoute: () => rootRoute, -} as any) +} as any); // Populate the FileRoutesByPath interface -declare module '@tanstack/react-router' { +declare module "@tanstack/react-router" { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexImport - parentRoute: typeof rootRoute - } + "/": { + id: "/"; + path: "/"; + fullPath: "/"; + preLoaderRoute: typeof IndexImport; + parentRoute: typeof rootRoute; + }; } } // Create and export the route tree -export const routeTree = rootRoute.addChildren({ IndexRoute }) +export const routeTree = rootRoute.addChildren({ IndexRoute }); /* prettier-ignore-end */ diff --git a/app/router.tsx b/app/router.tsx index d0e2297..2f107a4 100644 --- a/app/router.tsx +++ b/app/router.tsx @@ -1,16 +1,16 @@ -import { createRouter as createTanStackRouter } from '@tanstack/react-router' -import { routeTree } from './routeTree.gen' +import { createRouter as createTanStackRouter } from "@tanstack/react-router"; +import { routeTree } from "./routeTree.gen"; export function createRouter() { const router = createTanStackRouter({ routeTree, - }) + }); - return router + return router; } -declare module '@tanstack/react-router' { +declare module "@tanstack/react-router" { interface Register { - router: ReturnType + router: ReturnType; } } diff --git a/app/routes/__root.tsx b/app/routes/__root.tsx index 60e5955..4668766 100644 --- a/app/routes/__root.tsx +++ b/app/routes/__root.tsx @@ -1,30 +1,30 @@ -import { createRootRoute } from '@tanstack/react-router' -import { Outlet, ScrollRestoration } from '@tanstack/react-router' -import { Body, Head, Html, Meta, Scripts } from '@tanstack/start' -import * as React from 'react' +import { createRootRoute } from "@tanstack/react-router"; +import { Outlet, ScrollRestoration } from "@tanstack/react-router"; +import { Body, Head, Html, Meta, Scripts } from "@tanstack/start"; +import * as React from "react"; export const Route = createRootRoute({ meta: () => [ { - charSet: 'utf-8', + charSet: "utf-8", }, { - name: 'viewport', - content: 'width=device-width, initial-scale=1', + name: "viewport", + content: "width=device-width, initial-scale=1", }, { - title: 'TanStack Start Starter', + title: "TanStack Start Starter", }, ], component: RootComponent, -}) +}); function RootComponent() { return ( - ) + ); } function RootDocument({ children }: { children: React.ReactNode }) { @@ -39,5 +39,5 @@ function RootDocument({ children }: { children: React.ReactNode }) { - ) + ); } diff --git a/app/routes/index.tsx b/app/routes/index.tsx index da85019..80b6ea3 100644 --- a/app/routes/index.tsx +++ b/app/routes/index.tsx @@ -1,14 +1,12 @@ -import { createFileRoute, useRouter } from '@tanstack/react-router' +import { createFileRoute, useRouter } from "@tanstack/react-router"; -export const Route = createFileRoute('/')({ +export const Route = createFileRoute("/")({ component: Home, -}) +}); function Home() { - const router = useRouter() - const state = Route.useLoaderData() + const router = useRouter(); + const state = Route.useLoaderData(); - return ( -

Hello World();

- ) + return

Hello World();

; } diff --git a/app/ssr.tsx b/app/ssr.tsx index 3c89881..f0f9660 100644 --- a/app/ssr.tsx +++ b/app/ssr.tsx @@ -1,13 +1,12 @@ import { - createStartHandler, - defaultStreamHandler, - } from '@tanstack/start/server' - import { getRouterManifest } from '@tanstack/start/router-manifest' - - import { createRouter } from './router' - - export default createStartHandler({ - createRouter, - getRouterManifest, - })(defaultStreamHandler) - \ No newline at end of file + createStartHandler, + defaultStreamHandler, +} from "@tanstack/start/server"; +import { getRouterManifest } from "@tanstack/start/router-manifest"; + +import { createRouter } from "./router"; + +export default createStartHandler({ + createRouter, + getRouterManifest, +})(defaultStreamHandler); diff --git a/package-lock.json b/package-lock.json index 32b7293..a3da4fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "devDependencies": { "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", + "prettier": "3.3.3", "typescript": "^5.5.4" } }, diff --git a/package.json b/package.json index 9acaeab..6897599 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "devDependencies": { "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", + "prettier": "3.3.3", "typescript": "^5.5.4" } } diff --git a/tsconfig.json b/tsconfig.json index f40bd25..8811a7f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,9 @@ { - "compilerOptions": { - "jsx": "react-jsx", - "moduleResolution": "Bundler", - "module": "Preserve", - "target": "ES2022", - "skipLibCheck": true, - }, + "compilerOptions": { + "jsx": "react-jsx", + "moduleResolution": "Bundler", + "module": "Preserve", + "target": "ES2022", + "skipLibCheck": true } - \ No newline at end of file +}