Attempt astro 6

Author: RobbieTheWagner

astro.config.mjs

@@ -30,20 +30,26 @@ export default defineConfig({
     inlineStylesheets: 'always'
   },
   experimental: {
-    clientPrerender: true,
-    fonts: [
-      {
-        provider: fontProviders.google({
-          experimental: { variableAxis: { Inter: { opsz: ['14..32'] } } }
-        }),
-        name: 'Inter',
-        cssVariable: '--astro-font-inter',
-        weights: ['300 900'],
-        styles: ['normal'],
-        subsets: ['latin']
-      }
-    ]
+    clientPrerender: true
   },
+  fonts: [
+    {
+      provider: fontProviders.google(),
+      name: 'Inter',
+      cssVariable: '--astro-font-inter',
+      formats: ['woff2'],
+      styles: ['normal'],
+      subsets: ['latin'],
+      weights: ['300 900'],
+      options: {
+        experimental: {
+          variableAxis: {
+            opsz: ['14..32']
+          }
+        }
+      }
+    }
+  ],
   image: {
     remotePatterns: [
       {

package.json

@@ -23,13 +23,13 @@
     "test:unit": "vitest"
   },
   "dependencies": {
-    "@astrojs/preact": "^4.1.3",
-    "@astrojs/vercel": "^9.0.4",
+    "@astrojs/preact": "^5.0.0",
+    "@astrojs/vercel": "^10.0.0",
     "@libsql/client": "^0.17.2",
     "@preact/signals": "^2.8.2",
     "@vercel/analytics": "^1.6.1",
     "@vercel/speed-insights": "^1.3.1",
-    "astro": "5.17.2",
+    "astro": "6.0.3",
     "astro-seo-schema": "^5.2.0",
     "atropos": "^2.0.2",
     "drizzle-orm": "^0.45.1",
@@ -39,8 +39,8 @@
     "valibot": "^1.2.0"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.6",
-    "@astrojs/sitemap": "^3.7.0",
+    "@astrojs/check": "^0.9.7",
+    "@astrojs/sitemap": "^3.7.1",
     "@eslint/js": "^9.39.4",
     "@playwright/test": "^1.58.2",
     "@tailwindcss/forms": "^0.5.11",

pnpm-lock.yaml

@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const transcripts = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/transcripts' }),
+});
+
+export const collections = {
+  transcripts
+};

src/content.config.ts

@@ -1,5 +0,0 @@
-import { defineCollection } from 'astro:content';
-const transcripts = defineCollection({});
-export const collections = {
-  transcripts
-};

src/content/config.ts

@@ -1,12 +1,21 @@
+export async function resolveRedirects(url: string): Promise<string> {
+  const response = await fetch(url, { method: 'GET', redirect: 'manual' });
+  if (response.status >= 300 && response.status < 400) {
+    return response.headers.get('location') ?? url;
+  }
+  return url;
+}
+
 export async function optimizeImage(
   image?: string,
   options?: { height?: number; width?: number }
 ) {
   if (image) {
     try {
+      const resolvedImage = await resolveRedirects(image);
       const { getImage } = await import('astro:assets');
       const optimizedImage = await getImage({
-        src: image,
+        src: resolvedImage,
         format: 'avif',
         height: options?.height ?? 160,
         width: options?.width ?? 160,

src/lib/optimize-episode-image.ts

@@ -2,7 +2,7 @@ import { htmlToText } from 'html-to-text';
 import parseFeed from 'rss-to-json';
 import { array, number, object, optional, parse, string } from 'valibot';
 
-import { optimizeImage } from './optimize-episode-image';
+import { optimizeImage, resolveRedirects } from './optimize-episode-image';
 import { dasherize } from '../utils/dasherize';
 import { truncate } from '../utils/truncate';
 import starpodConfig from '../../starpod.config';
@@ -108,7 +108,9 @@ export async function getAllEpisodes() {
             content: episodeContent,
             description: truncate(htmlToText(description), 260),
             duration: itunes_duration,
-            episodeImage: itunes_image?.href,
+            episodeImage: itunes_image?.href
+              ? await resolveRedirects(itunes_image.href)
+              : undefined,
             episodeNumber,
             episodeSlug,
             episodeThumbnail: await optimizeImage(itunes_image?.href),

src/lib/rss.ts

@@ -1,5 +1,5 @@
 ---
-import { getEntry } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import { eq } from 'drizzle-orm';
 
 import { createDb } from '../../db';
@@ -49,7 +49,7 @@ let Transcript;
 if (episode.episodeNumber && episode.episodeNumber !== 'Bonus') {
   Transcript = await getEntry('transcripts', episode.episodeNumber);
   if (Transcript) {
-    const { Content } = await Transcript.render();
+    const { Content } = await render(Transcript);
     Transcript = Content;
   }
 }