From 330a3c3cf54258516f063d5fe6cb63eed6a5bf76 Mon Sep 17 00:00:00 2001 From: Kai Hao Date: Fri, 4 Aug 2023 18:26:38 +0800 Subject: [PATCH] Try force-dynamic --- src/app/posts/[slug]/opengraph-image.tsx | 1 - src/app/posts/[slug]/page.tsx | 5 +---- src/app/rss.xml/route.ts | 12 ++++++------ src/siteMetadata.ts | 3 ++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/app/posts/[slug]/opengraph-image.tsx b/src/app/posts/[slug]/opengraph-image.tsx index d09727e..39df507 100644 --- a/src/app/posts/[slug]/opengraph-image.tsx +++ b/src/app/posts/[slug]/opengraph-image.tsx @@ -14,7 +14,6 @@ async function getPostTitle(slug: string) { } export const runtime = 'edge'; -export const revalidate = false; // On-demand static generation export const size = { width: 1200, diff --git a/src/app/posts/[slug]/page.tsx b/src/app/posts/[slug]/page.tsx index 23e42b2..d2f1837 100644 --- a/src/app/posts/[slug]/page.tsx +++ b/src/app/posts/[slug]/page.tsx @@ -18,10 +18,7 @@ export async function generateMetadata({ title: frontmatter.title, description: excerpt, openGraph: { - title: { - default: siteMetadata.title, - template: `%s | ${siteMetadata.title}`, - }, + title: frontmatter.title, description: excerpt, url: `${siteMetadata.origin}/posts/${slug}`, siteName: siteMetadata.title, diff --git a/src/app/rss.xml/route.ts b/src/app/rss.xml/route.ts index 57d5892..2abb80f 100644 --- a/src/app/rss.xml/route.ts +++ b/src/app/rss.xml/route.ts @@ -2,7 +2,8 @@ import RSS from 'rss'; import { getPosts } from '@/internals/posts'; import siteMetadata from '@/siteMetadata'; -export const revalidate = false; // Cache forever like a static file +export const dynamic = 'force-dynamic'; +// export const revalidate = 0; // Cache forever like a static file export async function GET() { const feed = new RSS({ @@ -16,11 +17,10 @@ export async function GET() { for (const post of posts) { const postUrl = new URL(`/posts/${post.slug}`, siteMetadata.origin).href; - const html = await fetch(postUrl, { redirect: 'follow' }).then((res) => - res.text(), - ); - const contentHtml = - html.match(/]*?)>([\s\S]+?)<\/main>/)?.[1] || ''; + const html = await fetch(postUrl, { + next: { tags: ['rss'] }, + }).then((response) => response.text()); + const contentHtml = html.match(/]*?)>([\s\S]+?)<\/main>/)?.[1]; const image = html.match( //, )?.[1]; diff --git a/src/siteMetadata.ts b/src/siteMetadata.ts index 33656ac..3656aff 100644 --- a/src/siteMetadata.ts +++ b/src/siteMetadata.ts @@ -5,7 +5,8 @@ export default { repo: 'https://github.com/kevin940726/kaihao.dev', origin: process.env.HOST || - (process.env.VERCEL_ENV !== 'production' && + (process.env.VERCEL_ENV && + process.env.VERCEL_ENV !== 'production' && `https://${process.env.VERCEL_URL}`) || 'https://kaihao.dev', siteUrl: 'https://kaihao.dev',