fix merge

.astro/settings.json

@@ -1,5 +1,5 @@
 {
 	"_variables": {
-		"lastUpdateCheck": 1734053848141
+		"lastUpdateCheck": 1734054296752
 	}
 }

package.json

@@ -12,31 +12,32 @@
     "lint": "eslint --ext .js --ext .ts --ext .astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "2.1.0",
-    "@astrojs/netlify": "5.0.0",
-    "@astrojs/rss": "4.0.4",
-    "astro": "^3.0.0",
-    "astro-icon": "^1.1.0",
-    "astro-pagefind": "^1.5.0",
-    "date-fns": "^3.3.1",
-    "date-fns-tz": "^1.3.7",
-    "markdown-it": "^13.0.1",
-    "pagefind": "^1.1.0",
-    "sanitize-html": "^2.9.0",
-    "sharp": "^0.33.2"
+    "@astrojs/mdx": "4.0.2",
+    "@astrojs/netlify": "6.0.0",
+    "@astrojs/rss": "4.0.10",
+    "@types/markdown-it": "^14.1.2",
+    "astro": "5.0.4",
+    "astro-icon": "^1.1.4",
+    "astro-pagefind": "^1.7.0",
+    "date-fns": "^3.6.0",
+    "date-fns-tz": "^1.3.8",
+    "markdown-it": "^13.0.2",
+    "pagefind": "^1.2.0",
+    "sanitize-html": "^2.13.1",
+    "sharp": "^0.33.5"
   },
   "devDependencies": {
     "bun-types": "latest",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-plugin-astro": "^0.31.4",
-    "eslint-plugin-prettier": "^5.1.3",
-    "inquirer": "^9.2.15",
-    "prettier": "^2.8.1",
-    "prettier-plugin-astro": "^0.7.0",
-    "typescript-eslint": "^7.1.1"
+    "eslint-plugin-prettier": "^5.2.1",
+    "inquirer": "^9.3.7",
+    "prettier": "^2.8.8",
+    "prettier-plugin-astro": "^0.7.2",
+    "typescript-eslint": "^7.18.0"
   },
   "module": "index.ts",
   "peerDependencies": {
-    "typescript": "^5.0.0"
+    "typescript": "^5.7.2"
   }
 }

src/pages/rss.xml.js

@@ -1,10 +1,9 @@
 import rss from '@astrojs/rss';
 import { getCollection } from 'astro:content';
-import sanitizeHtml from 'sanitize-html';
 import MarkdownIt from 'markdown-it';
 const parser = new MarkdownIt({ html: true });
 
-export async function get(context) {
+export async function GET(context) {
 	const blog = await getCollection('blog');
 	return rss({
 		title: 'ghall.blog',
@@ -19,7 +18,7 @@ export async function get(context) {
 				pubDate: post.data.pubDate,
 				link: `/posts/${post.slug}`,
 				categories: post.data.tags,
-				content: sanitizeHtml(parser.render(post.body)),
+				content: parser.render(post.body),
 			})),
 	});
 }

src/pages/uses.md

@@ -1,25 +0,0 @@
----
-layout: ../layouts/Layout.astro
-title: Uses
----
-
-_Last updated: June 24, 2024_
-
-## Laptop (MacOS)
-
-- Web: [Arc]()
-- Writing: [BBEdit]()
-- Coding: [Nova]()
-
-## Mobile (iOS/iPadOS)
-
-- Web: [Arc Search]()
-- Podcasts: [Overcast]()
-
-## Cross-Platform
-
-- Calendar: [Fantastical]()
-- Notes: [Bear]()
-- RSS/Read It Later: [Reeder]()
-- Bookmarks: [Anybox]()
-- Mastodon: [Ivory]()