diff --git a/astro.config.ts b/astro.config.ts index 7cafb10..87a8b01 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -8,10 +8,5 @@ import tailwind from "@astrojs/tailwind"; // https://astro.build/config export default defineConfig({ site: "https://example.com", - integrations: [ - mdx(), - sitemap(), - tailwind(), - react(), - ], + integrations: [mdx(), sitemap(), tailwind(), react()], }); diff --git a/biome.json b/biome.json index a49c951..c031d21 100644 --- a/biome.json +++ b/biome.json @@ -1,23 +1,23 @@ { - "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json", - "organizeImports": { - "enabled": true - }, - "linter": { - "enabled": true, - "rules": { - "recommended": true - } - }, - "formatter": { - "enabled": true - }, - "vcs": { - "enabled": true, - "clientKind": "git", - "useIgnoreFile": true - }, - "files": { - "ignore": [".vscode"] - } + "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json", + "organizeImports": { + "enabled": true + }, + "linter": { + "enabled": true, + "rules": { + "recommended": true + } + }, + "formatter": { + "enabled": true + }, + "vcs": { + "enabled": true, + "clientKind": "git", + "useIgnoreFile": true + }, + "files": { + "ignore": [".vscode"] + } } diff --git a/package.json b/package.json index 849591b..89ce4d2 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,32 @@ { - "name": "tuatmcc-com-mk3", - "type": "module", - "version": "0.0.1", - "scripts": { - "dev": "astro dev", - "start": "astro dev", - "build": "astro check && astro build", - "preview": "astro preview", - "astro": "astro" - }, - "dependencies": { - "@astrojs/check": "^0.9.2", - "@astrojs/mdx": "^3.1.3", - "@astrojs/react": "^3.6.2", - "@astrojs/rss": "^4.0.7", - "@astrojs/sitemap": "^3.1.6", - "@astrojs/tailwind": "^5.1.0", - "@biomejs/biome": "^1.8.3", - "@fontsource-variable/jetbrains-mono": "^5.0.21", - "@types/react": "^18.3.3", - "@types/react-dom": "^18.3.0", - "astro": "^4.13.1", - "pagefind": "^1.1.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "tailwindcss": "^3.4.7", - "typescript": "^5.5.4" - } + "name": "tuatmcc-com-mk3", + "type": "module", + "version": "0.0.1", + "scripts": { + "dev": "astro dev", + "start": "astro dev", + "build": "astro check && astro build", + "preview": "astro preview", + "astro": "astro", + "lint": "biome check .", + "fmt": "biome check . --write" + }, + "dependencies": { + "@astrojs/check": "^0.9.2", + "@astrojs/mdx": "^3.1.3", + "@astrojs/react": "^3.6.2", + "@astrojs/rss": "^4.0.7", + "@astrojs/sitemap": "^3.1.6", + "@astrojs/tailwind": "^5.1.0", + "@biomejs/biome": "^1.8.3", + "@fontsource-variable/jetbrains-mono": "^5.0.21", + "@types/react": "^18.3.3", + "@types/react-dom": "^18.3.0", + "astro": "^4.13.1", + "pagefind": "^1.1.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "tailwindcss": "^3.4.7", + "typescript": "^5.5.4" + } } diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 038db43..7e2d4ca 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -1,27 +1,27 @@ --- // Import the global.css file here so that it is included on // all pages through the use of the component. -import '../styles/global.css'; +import "../styles/global.css"; export interface Props { - title: string; - description?: string; - path: string; - pagefind: boolean; - og: { - enabled: boolean; - image?: URL; - width?: number; - height?: number; - type?: "article" | "website"; - } -}; + title: string; + description?: string; + path: string; + pagefind: boolean; + og: { + enabled: boolean; + image?: URL; + width?: number; + height?: number; + type?: "article" | "website"; + }; +} const canonicalURL = new URL(Astro.url.pathname, Astro.site); const { title, description, og } = Astro.props; -const image = og.image ?? new URL('/images/og-image.jpg', Astro.url); +const image = og.image ?? new URL("/images/og-image.jpg", Astro.url); --- diff --git a/src/components/Header.astro b/src/components/Header.astro index c9ab99f..3c7cbee 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,6 +1,6 @@ --- -import HeaderLink from './HeaderLink.astro'; -import { SITE_TITLE } from '../consts'; +import { SITE_TITLE } from "../consts"; +import HeaderLink from "./HeaderLink.astro"; ---
diff --git a/src/components/HeaderLink.astro b/src/components/HeaderLink.astro index 905d754..04c4282 100644 --- a/src/components/HeaderLink.astro +++ b/src/components/HeaderLink.astro @@ -1,7 +1,7 @@ --- -import type { HTMLAttributes } from 'astro/types'; +import type { HTMLAttributes } from "astro/types"; -type Props = HTMLAttributes<'a'>; +type Props = HTMLAttributes<"a">; const { href, class: className, ...props } = Astro.props; diff --git a/src/consts.ts b/src/consts.ts index e301675..ae77e1f 100644 --- a/src/consts.ts +++ b/src/consts.ts @@ -1,5 +1,5 @@ // Place any global data in this file. // You can import this data from anywhere in your site by using the `import` keyword. -export const SITE_TITLE = 'MCC'; -export const SITE_DESCRIPTION = 'Welcome to my website!'; +export const SITE_TITLE = "MCC"; +export const SITE_DESCRIPTION = "Welcome to my website!"; diff --git a/src/layouts/BlogPost.astro b/src/layouts/BlogPost.astro index 4ce058b..0071982 100644 --- a/src/layouts/BlogPost.astro +++ b/src/layouts/BlogPost.astro @@ -1,11 +1,11 @@ --- -import type { CollectionEntry } from 'astro:content'; -import BaseHead from '../components/BaseHead.astro'; -import Header from '../components/Header.astro'; -import Footer from '../components/Footer.astro'; -import FormattedDate from '../components/FormattedDate.astro'; +import type { CollectionEntry } from "astro:content"; +import BaseHead from "../components/BaseHead.astro"; +import Footer from "../components/Footer.astro"; +import FormattedDate from "../components/FormattedDate.astro"; +import Header from "../components/Header.astro"; -type Props = CollectionEntry<'blog'>['data']; +type Props = CollectionEntry<"blog">["data"]; const { title, description, date, lastmod, image } = Astro.props; --- diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 7d6e337..fd61a28 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -3,18 +3,18 @@ import "../styles/global.css"; import BaseHead from "../components/BaseHead.astro"; export interface Props { - title: string; - description?: string; - path: string; - pagefind: boolean; - og: { - enabled: boolean; - image?: URL; - width?: number; - height?: number; - type?: "article" | "website"; - } -}; + title: string; + description?: string; + path: string; + pagefind: boolean; + og: { + enabled: boolean; + image?: URL; + width?: number; + height?: number; + type?: "article" | "website"; + }; +} // const site = Astro.site ?? ""; --- diff --git a/src/pages/about.astro b/src/pages/about.astro index 30f6a0d..4929a2f 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -1,5 +1,5 @@ --- -import Layout from '../layouts/Layout.astro'; +import Layout from "../layouts/Layout.astro"; --- ({ params: { slug: post.slug }, props: post, })); } -type Props = CollectionEntry<'blog'>; +type Props = CollectionEntry<"blog">; const post = Astro.props; const { Content } = await post.render(); diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro index a3f02b6..7a4a75f 100644 --- a/src/pages/blog/index.astro +++ b/src/pages/blog/index.astro @@ -1,13 +1,13 @@ --- -import BaseHead from '../../components/BaseHead.astro'; -import Header from '../../components/Header.astro'; -import Footer from '../../components/Footer.astro'; -import { SITE_TITLE, SITE_DESCRIPTION } from '../../consts'; -import { getCollection } from 'astro:content'; -import FormattedDate from '../../components/FormattedDate.astro'; +import { getCollection } from "astro:content"; +import BaseHead from "../../components/BaseHead.astro"; +import Footer from "../../components/Footer.astro"; +import FormattedDate from "../../components/FormattedDate.astro"; +import Header from "../../components/Header.astro"; +import { SITE_DESCRIPTION, SITE_TITLE } from "../../consts"; -const posts = (await getCollection('blog')).sort( - (a, b) => a.data.date.valueOf() - b.data.date.valueOf() +const posts = (await getCollection("blog")).sort( + (a, b) => a.data.date.valueOf() - b.data.date.valueOf(), ); --- diff --git a/src/pages/index.astro b/src/pages/index.astro index 20235d7..366f373 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import Navigation from "../components/Navigation/Navigation" -import Layout from "../layouts/Layout.astro" +import Navigation from "../components/Navigation/Navigation"; +import Layout from "../layouts/Layout.astro"; --- diff --git a/tailwind.config.mjs b/tailwind.config.mjs index c325ef8..8ddb352 100644 --- a/tailwind.config.mjs +++ b/tailwind.config.mjs @@ -1,12 +1,12 @@ /** @type {import('tailwindcss').Config} */ export default { - content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"], - theme: { - extend: {}, - fontFamily: { - sans: ["Hiragino Kaku Gothic ProN", "sans-serif"], - orbitron: ["Orbitron", "sans-serif"], - }, - }, - plugins: [], + content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"], + theme: { + extend: {}, + fontFamily: { + sans: ["Hiragino Kaku Gothic ProN", "sans-serif"], + orbitron: ["Orbitron", "sans-serif"], + }, + }, + plugins: [], }; diff --git a/tsconfig.json b/tsconfig.json index 34c5f4b..91a7dfe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "astro/tsconfigs/strict", - "compilerOptions": { - "strictNullChecks": true, - "paths": { - "@/": ["./src/"] - } - } + "extends": "astro/tsconfigs/strict", + "compilerOptions": { + "strictNullChecks": true, + "paths": { + "@/": ["./src/"] + } + } }