small simplifications

diff --git a/bun.lock b/bun.lock
index 64a5fea038aacfd56928d96682b484326baf1a9d..61a6ba193340e138df3669f2515f81bc05b2bcfd 100644 (file)
--- a/bun.lock
+++ b/bun.lock
@@ -229,21 +229,21 @@
 
     "@oslojs/encoding": ["@oslojs/encoding@1.1.0", "", {}, "sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ=="],
 
-    "@pagefind/component-ui": ["@pagefind/component-ui@1.5.0", "", { "dependencies": { "adequate-little-templates": "^1.0.2", "bcp-47": "^2.1.0" } }, "sha512-lOyk1+7x5Ds0TkAXXR0o6XYITtzmx9QjtrhiPNxI7zuwmO6tr0fqaxTengz3LtvvhHoXawW/h8BEHaTaQMTegQ=="],
+    "@pagefind/component-ui": ["@pagefind/component-ui@1.5.2", "", { "dependencies": { "adequate-little-templates": "^1.0.2", "bcp-47": "^2.1.0" } }, "sha512-t8/aE0tan4JiKa6cyhhSt/5qrEVwAK/qlYBHFpnRoq+qaFFVrhmXFFMY+r6n4GJtVIFCN2A5nUpeLN68cYjEjw=="],
 
-    "@pagefind/darwin-arm64": ["@pagefind/darwin-arm64@1.5.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-OXQVlxALU9+Lz/LxkAa+RvaxY1cnRKUDCuwl9o8PY5Lg/znP573y4WIbVOOIz8Bv7uj7r00TGy7pD+NSLMJGBw=="],
+    "@pagefind/darwin-arm64": ["@pagefind/darwin-arm64@1.5.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-MXpI+7HsAdPkvJ0gk9xj9g541BCqBZOBbdwj9g6lB5LCj6kSV6nqDSjzcAJwvOsfu0fjwvC8hQU+ecfhp+MpiQ=="],
 
-    "@pagefind/darwin-x64": ["@pagefind/darwin-x64@1.5.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-+LK1Xq5n/B0hHc08DW61SnfIlfLKyXZ1oKcbfZ1MimE7Rn0Q6R0VI/TlC04f/JDPm+67zAOwPGizzvefOi5vqQ=="],
+    "@pagefind/darwin-x64": ["@pagefind/darwin-x64@1.5.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-IojxFWMEJe0RQ7PQ3KXQsPIImNsbpPYpoZ+QUDrL8fAl/O27IX+LVLs74/UzEZy5uA2LD8Nz1AiwKr72vrkZQw=="],
 
-    "@pagefind/freebsd-x64": ["@pagefind/freebsd-x64@1.5.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-kicDfUF9gn/z06NimTwNlZXF8z3pLsN3BIPPt6N8unuh0n55fr64tVs2p3a5RKYmQkJGjPfOE/C9GI5YTEpURg=="],
+    "@pagefind/freebsd-x64": ["@pagefind/freebsd-x64@1.5.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-7EVzo9+0w+2cbe671BtMj10UlNo83I+HrLVLfRxO731svHRJKUfJ/mo05gU14pe9PCfpKNQT8FS3Xc/oDN6pOA=="],
 
-    "@pagefind/linux-arm64": ["@pagefind/linux-arm64@1.5.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-e5rDB3wPm89bcSLiatKBDTrVTbsMQrrtkXRaAoUJYU0C1suXVvEzZfjmMvrUDvYhZBx/Ls8hGuGxlqSJBz3gDg=="],
+    "@pagefind/linux-arm64": ["@pagefind/linux-arm64@1.5.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-Ovt9+K35sqzn8H3ZMXGwls4TD/wMJuvRtShHIsmUQREmaxjrDEX7gHckRCrwYJ4XE1H1p6HkLz3wukrAnsfXQw=="],
 
-    "@pagefind/linux-x64": ["@pagefind/linux-x64@1.5.0", "", { "os": "linux", "cpu": "x64" }, "sha512-vh52DcBiF/mRMmq+Rwt3M3RgEWgl00jFk/M5NWhLEHJFq4+papQXwbyKbi7cNlxaeYrKx6wOfW3fm9cftfc/Kg=="],
+    "@pagefind/linux-x64": ["@pagefind/linux-x64@1.5.2", "", { "os": "linux", "cpu": "x64" }, "sha512-V+tFqHKXhQKq/WqPBD67AFy7scn1/aZID00ws4fSDd+1daSi5UHR9VVlRrOUYKxn3VuFQYRD7lYXdZK1WED1YA=="],
 
-    "@pagefind/windows-arm64": ["@pagefind/windows-arm64@1.5.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-kg+szZwffZdyWn6SL6RHjAYjhSvJ2bT4qkv3KepGsbmD9fuSHUSC+2kydDneDVUA9qEDRf9uSFoEAsXsp1/JKA=="],
+    "@pagefind/windows-arm64": ["@pagefind/windows-arm64@1.5.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-hN9Nh90fNW61nNRCW9ZyQrAj/mD0eRvmJ8NlTUzkbuW8kIzGJUi3cxjFkEcMZ5h/8FsKWD/VcouZl4yo1F7B6g=="],
 
-    "@pagefind/windows-x64": ["@pagefind/windows-x64@1.5.0", "", { "os": "win32", "cpu": "x64" }, "sha512-8eOCmB8lnpyvwz+HrcTXLuBxhj7UseAFh6KGEXRe8UCcAfVQih+qPy/4akJRezViI+ONijz9oi7HpMkw9rdtBg=="],
+    "@pagefind/windows-x64": ["@pagefind/windows-x64@1.5.2", "", { "os": "win32", "cpu": "x64" }, "sha512-Fa2Iyw7kaDRzGMfNYNUXNW2zbL5FQVDgSOcbDHdzBrDEdpqOqg8TcZ68F22ol6NJ9IGzvUdmeyZypLW5dyhqsg=="],
 
     "@pkgr/core": ["@pkgr/core@0.2.9", "", {}, "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA=="],
 
@@ -1013,7 +1013,7 @@
 
     "package-manager-detector": ["package-manager-detector@1.6.0", "", {}, "sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA=="],
 
-    "pagefind": ["pagefind@1.5.0", "", { "optionalDependencies": { "@pagefind/darwin-arm64": "1.5.0", "@pagefind/darwin-x64": "1.5.0", "@pagefind/freebsd-x64": "1.5.0", "@pagefind/linux-arm64": "1.5.0", "@pagefind/linux-x64": "1.5.0", "@pagefind/windows-arm64": "1.5.0", "@pagefind/windows-x64": "1.5.0" }, "bin": { "pagefind": "lib/runner/bin.cjs" } }, "sha512-7vQ2xh0ZmjPjsuWONR68nqzb+QNfpPh7pdT6n6YDAthWAQiUkSACVegSswY5zPNONGYFWebFVgdnS5/m/Qqn+w=="],
+    "pagefind": ["pagefind@1.5.2", "", { "optionalDependencies": { "@pagefind/darwin-arm64": "1.5.2", "@pagefind/darwin-x64": "1.5.2", "@pagefind/freebsd-x64": "1.5.2", "@pagefind/linux-arm64": "1.5.2", "@pagefind/linux-x64": "1.5.2", "@pagefind/windows-arm64": "1.5.2", "@pagefind/windows-x64": "1.5.2" }, "bin": { "pagefind": "lib/runner/bin.cjs" } }, "sha512-XTUaK0hXMCu2jszWE584JGQT7y284TmMV9l/HX3rnG5uo3rHI/uHU56XTyyyPFjeWEBxECbAi0CaFDJOONtG0Q=="],
 
     "pako": ["pako@0.2.9", "", {}, "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="],
 

diff --git a/package.json b/package.json
index 815106ed236d364357b6c7713c27c1d50f431ec7..86e26b3aead236878b6aec7e38fcc0b83534fc32 100644 (file)
--- a/package.json
+++ b/package.json
@@ -11,14 +11,13 @@
     "index": "bun x --bun pagefind",
     "lint": "bun x --bun eslint src/",
     "lint:fix": "bun x --bun eslint src/ --fix",
-    "format": "bun x --bun prettier --write .",
-    "format:check": "bun x --bun prettier --check .",
+    "format": "bun x --bun prettier --check .",
+    "format:fix": "bun x --bun prettier --write .",
     "typecheck": "bun x --bun astro check",
-    "test": "bun test --watch",
-    "test:run": "bun test"
+    "test": "bun test"
   },
   "simple-git-hooks": {
-    "pre-commit": "bun x lint-staged"
+    "pre-commit": "bun x --bun lint-staged"
   },
   "lint-staged": {
     "*.{ts,tsx,astro,js}": [
@@ -47,11 +46,11 @@
     "@astrojs/rss": "4.0.18",
     "@astrojs/sitemap": "3.7.2",
     "@iconify-json/mdi": "^1.2.3",
-    "@pagefind/component-ui": "^1.5.0",
+    "@pagefind/component-ui": "^1.5.2",
     "@vercel/og": "^0.8.6",
     "astro": "6.1.5",
     "astro-icon": "^1.1.5",
-    "pagefind": "^1.5.0"
+    "pagefind": "^1.5.2"
   },
   "devDependencies": {
     "@astrojs/check": "0.9.8",

diff --git a/src/components/head/base.astro b/src/components/head/base.astro
index 56735ce5709bd0b42f5f1b6971be0d35bbc99e59..86b92531d200d743c3d89a0d7d882934b7b52881 100644 (file)
--- a/src/components/head/base.astro
+++ b/src/components/head/base.astro
@@ -2,6 +2,7 @@
 import { Font, getImage } from 'astro:assets';
 import { siteAuthor, siteTitle, socials } from '@utils/globals';
 import FavIcon from '@assets/favicon.ico';
+import PostHog from '@components/head/posthog.astro';
 
 interface Props {
   title: string;
@@ -72,3 +73,4 @@ const { title, description } = Astro.props;
   title={siteTitle}
   href={new URL('feed.xml', Astro.site)}
 />
+<PostHog />

diff --git a/src/components/heading.astro b/src/components/heading.astro
deleted file mode 100644 (file)
index 8f2e1ab..0000000
--- a/src/components/heading.astro
+++ /dev/null
@@ -1,15 +0,0 @@
----
-import Navigation from '@components/navigation.astro';
----
-
-<h1 data-pagefind-ignore><a href="/">Cameron Otsuka</a></h1>
-<Navigation />
-
-<style>
-  h1 a {
-    color: var(--color-text);
-  }
-  h1 a:hover {
-    text-decoration: none;
-  }
-</style>

diff --git a/src/components/navigation.astro b/src/components/navigation.astro
index a126fb5d0dad0bd3b0f9c165b12c2c2e856e9c37..4a1b820d1b7bda1b34ec9d873e73238b3d41ced4 100644 (file)
--- a/src/components/navigation.astro
+++ b/src/components/navigation.astro
@@ -2,6 +2,7 @@
 import { menuItems } from '@utils/globals';
 ---
 
+<h1 data-pagefind-ignore><a href="/">Cameron Otsuka</a></h1>
 <nav>
   <menu class="inline-menu">
     {
@@ -15,6 +16,12 @@ import { menuItems } from '@utils/globals';
 </nav>
 
 <style>
+  h1 a {
+    color: var(--color-text);
+  }
+  h1 a:hover {
+    text-decoration: none;
+  }
   nav {
     font-family: var(--font-sans);
     margin-block-end: 1rem;

diff --git a/src/layouts/base.astro b/src/layouts/base.astro
index 9629c2bebae94659d5a1ac9338e7ecd3fecd3312..a650a43d81c3d60ba91e301beb732f443f12eae0 100644 (file)
--- a/src/layouts/base.astro
+++ b/src/layouts/base.astro
@@ -3,9 +3,8 @@ import '@styles/reset.css';
 import '@styles/style.css';
 import '@styles/prism-a11y-dark.css';
 import HeadBase from '@components/head/base.astro';
-import PostHog from '@components/head/posthog.astro';
 import HeadPage from '@components/head/page.astro';
-import Heading from '@components/heading.astro';
+import Navigation from '@components/navigation.astro';
 import Footer from '@components/footer.astro';
 
 interface Props {
@@ -20,13 +19,12 @@ const { title, description } = Astro.props;
 <html lang="en">
   <head>
     <HeadBase title={title} description={description} />
-    <PostHog />
     <slot name="post-head">
       <HeadPage />
     </slot>
   </head>
   <body>
-    <Heading />
+    <Navigation />
     <main>
       <slot />
     </main>