chore: cleanup

_redirects

@@ -61,11 +61,4 @@
 
 # general
 /articles/ /posts/ 301
-/recent/movies /watching/recent/movies 301
-/recent/shows /watching/recent/shows 301
-/coffee https://www.buymeacoffee.com/cory 301
-/tags /search 301
-/reading /books
-/stats /search 301
-/tags/* /search 301
-/music/genre/* /music/genres/:splat 301
+/tags /search 301

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.0.2",
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.5.0",
@@ -1086,9 +1086,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001664",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+      "version": "1.0.30001666",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001666.tgz",
+      "integrity": "sha512-gD14ICmoV5ZZM1OdzPWmpx+q4GyefaK06zi8hmfHV5xe4/2nOQX3+Dw5o+fSqOws2xVwL9j+anOPFwHzdEdV4g==",
       "dev": true,
       "funding": [
         {
@@ -1760,9 +1760,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.30",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz",
-      "integrity": "sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA==",
+      "version": "1.5.31",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.31.tgz",
+      "integrity": "sha512-QcDoBbQeYt0+3CWcK/rEbuHvwpbT/8SV9T3OSgs6cX1FlcUAkgrkqbg9zLnDrMM/rLamzQwal4LYFCiWk861Tg==",
       "dev": true,
       "license": "ISC"
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {

src/assets/styles/base/index.css

@@ -307,6 +307,7 @@ th {
   & h1 {
     margin: 0;
     padding: 0;
+    white-space: nowrap;
   }
 }
 

src/includes/base.liquid

@@ -108,7 +108,8 @@
     <link rel="alternate" href="https://coryd.dev/feeds/album-releases" title="Album releases / {{ globals.site_name }}" type="application/rss+xml">
     <link rel="alternate" href="https://coryd.dev/feeds/all" title="All activity / {{ globals.site_name }}" type="application/rss+xml">
     <script defer src="/assets/scripts/index.js?v={% appVersion %}"></script>
-    <script defer src="/js/script.js" data-website-id="f405b664-258b-4d77-bd42-94ccf6b294f5"></script>
+    <script defer data-domain="coryd.dev" src="/js/script.js"></script>
+    <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
     <script type="application/ld+json">
       {
         "@context": "https://schema.org",

src/pages/dynamic/blogroll.html

@@ -5,7 +5,7 @@ permalink: /blogroll.html
 description: These are awesome blogs that I enjoy and you may enjoy too.
 ---
 <h2>{{ title }}</h2>
-<p>You can <a href="/blogroll.opml" data-umami-event="Blogroll OPML download">Download OPML</a>
+<p>You can <a href="/blogroll.opml" class="plausible-event-name=Blogroll+OPML+download">Download OPML</a>
   download an OPML file</a> containing all of these feeds and import them into your RSS reader.</p>
 <table>
   <tr>

workers/analytics/index.js

@@ -1,40 +1,39 @@
-addEventListener('fetch', event => {
-  event.respondWith(handleRequest(event.request))
+const scriptName = '/js/script.js'
+const endpoint = '/api/event'
+
+addEventListener("fetch", (event) => {
+  event.passThroughOnException()
+  event.respondWith(handleRequest(event))
 })
 
-async function handleRequest(request) {
-  const url = new URL(request.url)
+async function handleRequest(event) {
+  const url = new URL(event.request.url)
+  const pathname = url.pathname
 
-  if (url.pathname === '/js/script.js') {
-    const targetUrl = 'https://stats.coryd.dev/script.js'
-    const response = await fetch(targetUrl, {
-      method: request.method,
-      headers: request.headers
-    })
-    const newHeaders = new Headers(response.headers)
-    newHeaders.set('Cache-Control', 'max-age=15552000')
+  if (pathname === scriptName) {
+    return getScript(event)
+  } else if (pathname === endpoint) {
+    return postData(event)
+  }
+  return new Response(null, { status: 404 })
+}
 
-    return new Response(response.body, {
-      status: response.status,
-      statusText: response.statusText,
-      headers: newHeaders
-    })
+async function getScript(event) {
+  const cache = caches.default
+  let response = await cache.match(event.request)
+
+  if (!response) {
+    const scriptUrl =
+      'https://plausible.io/js/plausible.outbound-links.tagged-events.js'
+    response = await fetch(scriptUrl)
+    if (response.ok) event.waitUntil(cache.put(event.request, response.clone()))
   }
 
-  if (url.pathname === '/js/api/send') {
-    const targetUrl = 'https://stats.coryd.dev/api/send'
-    const response = await fetch(targetUrl, {
-      method: request.method,
-      headers: request.headers,
-      body: request.body
-    })
+  return response
+}
 
-    return new Response(response.body, {
-      status: response.status,
-      statusText: response.statusText,
-      headers: response.headers
-    })
-  }
-
-  return fetch(request)
+async function postData(event) {
+  const request = new Request(event.request)
+  request.headers.delete('cookie')
+  return await fetch('https://plausible.io/api/event', request)
 }

workers/analytics/wrangler.template.toml

@@ -1,5 +1,5 @@
 name = "analytics-worker"
-main = "./index.js"
+main = "./index.js"  # Add this line to specify the entry point
 compatibility_date = "2023-01-01"
 
 account_id = "${CF_ACCOUNT_ID}"
@@ -8,6 +8,6 @@ workers_dev = true
 [env.production]
 name = "analytics-worker-production"
 routes = [
-  { pattern = "coryd.dev/js/script.js", zone_id = "${CF_ZONE_ID}" },
-  { pattern = "coryd.dev/js/api/send", zone_id = "${CF_ZONE_ID}" }
+  { pattern = "coryd.dev/js/*", zone_id = "${CF_ZONE_ID}" },
+  { pattern = "coryd.dev/api/event", zone_id = "${CF_ZONE_ID}" }
 ]