diff options
author | 2023-01-18 08:43:58 -0500 | |
---|---|---|
committer | 2023-01-18 08:43:58 -0500 | |
commit | 7d72aeeae8c867af2ae6c018611e39c184f50619 (patch) | |
tree | 93015c571dc820db3e37e8eba93455014a048d7e /examples/blog/src | |
parent | 006405d33c2b8eb1307cb84161659428e43efa51 (diff) | |
download | astro-7d72aeeae8c867af2ae6c018611e39c184f50619.tar.gz astro-7d72aeeae8c867af2ae6c018611e39c184f50619.tar.zst astro-7d72aeeae8c867af2ae6c018611e39c184f50619.zip |
Migrate blog and docs starters to content collections (#5858)
* docs: update README for `content/`
* chore: update env
* feat: update blog to use content collections
* chore: remove with-content starter
* fix: single quotes -> double
* feat: update docs starter to content collections
* refactor: config -> consts
* chore: import type
* edit: Astro will -> Use
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* chore: remove unused null check
* nit: spacing
* nit: `as Props` 1
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
* nit: `as Props` 2
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
* chore: consistent CONSTS usage
* chore: `type` imports at top
* chore: consistent quote usage on YAML
* chore: remove `as Props` from docs
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
Diffstat (limited to '')
-rw-r--r-- | examples/blog/src/components/Header.astro | 2 | ||||
-rw-r--r-- | examples/blog/src/config.ts | 5 | ||||
-rw-r--r-- | examples/blog/src/consts.ts (renamed from examples/with-content/src/consts.ts) | 0 | ||||
-rw-r--r-- | examples/blog/src/content/blog/first-post.md (renamed from examples/blog/src/pages/blog/first-post.md) | 3 | ||||
-rw-r--r-- | examples/blog/src/content/blog/markdown-style-guide.md (renamed from examples/with-content/src/content/blog/markdown-style-guide.md) | 8 | ||||
-rw-r--r-- | examples/blog/src/content/blog/second-post.md (renamed from examples/blog/src/pages/blog/second-post.md) | 3 | ||||
-rw-r--r-- | examples/blog/src/content/blog/third-post.md (renamed from examples/blog/src/pages/blog/third-post.md) | 3 | ||||
-rw-r--r-- | examples/blog/src/content/blog/using-mdx.mdx (renamed from examples/with-content/src/content/blog/using-mdx.mdx) | 0 | ||||
-rw-r--r-- | examples/blog/src/content/config.ts (renamed from examples/with-content/src/content/config.ts) | 5 | ||||
-rw-r--r-- | examples/blog/src/env.d.ts | 1 | ||||
-rw-r--r-- | examples/blog/src/layouts/BlogPost.astro | 15 | ||||
-rw-r--r-- | examples/blog/src/pages/about.md | 2 | ||||
-rw-r--r-- | examples/blog/src/pages/blog.astro | 59 | ||||
-rw-r--r-- | examples/blog/src/pages/blog/[...slug].astro (renamed from examples/with-content/src/pages/blog/[...slug].astro) | 0 | ||||
-rw-r--r-- | examples/blog/src/pages/blog/index.astro (renamed from examples/with-content/src/pages/blog/index.astro) | 2 | ||||
-rw-r--r-- | examples/blog/src/pages/blog/markdown-style-guide.md | 103 | ||||
-rw-r--r-- | examples/blog/src/pages/blog/using-mdx.mdx | 32 | ||||
-rw-r--r-- | examples/blog/src/pages/index.astro | 2 | ||||
-rw-r--r-- | examples/blog/src/pages/rss.xml.js | 16 |
19 files changed, 30 insertions, 231 deletions
diff --git a/examples/blog/src/components/Header.astro b/examples/blog/src/components/Header.astro index 75577e6bc..4d3da1fcf 100644 --- a/examples/blog/src/components/Header.astro +++ b/examples/blog/src/components/Header.astro @@ -1,6 +1,6 @@ --- import HeaderLink from './HeaderLink.astro'; -import { SITE_TITLE } from '../config'; +import { SITE_TITLE } from '../consts'; --- <header> diff --git a/examples/blog/src/config.ts b/examples/blog/src/config.ts deleted file mode 100644 index 1d5dbf632..000000000 --- a/examples/blog/src/config.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Place any global data in this file. -// You can import this data from anywhere in your site by using the `import` keyword. - -export const SITE_TITLE = 'My personal website.'; -export const SITE_DESCRIPTION = 'Welcome to my website!'; diff --git a/examples/with-content/src/consts.ts b/examples/blog/src/consts.ts index 1d5dbf632..1d5dbf632 100644 --- a/examples/with-content/src/consts.ts +++ b/examples/blog/src/consts.ts diff --git a/examples/blog/src/pages/blog/first-post.md b/examples/blog/src/content/blog/first-post.md index f98986a08..33b844032 100644 --- a/examples/blog/src/pages/blog/first-post.md +++ b/examples/blog/src/content/blog/first-post.md @@ -1,5 +1,4 @@ --- -layout: "../../layouts/BlogPost.astro" title: "First post" description: "Lorem ipsum dolor sit amet" pubDate: "Jul 08 2022" @@ -14,4 +13,4 @@ Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam s Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. -Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.
\ No newline at end of file +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/examples/with-content/src/content/blog/markdown-style-guide.md b/examples/blog/src/content/blog/markdown-style-guide.md index bb7bb2daa..242e86278 100644 --- a/examples/with-content/src/content/blog/markdown-style-guide.md +++ b/examples/blog/src/content/blog/markdown-style-guide.md @@ -1,8 +1,8 @@ --- -title: 'Markdown Style Guide' -description: 'Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro.' -pubDate: 'Jul 01 2022' -heroImage: '/placeholder-hero.jpg' +title: "Markdown Style Guide" +description: "Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro." +pubDate: "Jul 01 2022" +heroImage: "/placeholder-hero.jpg" --- Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro. diff --git a/examples/blog/src/pages/blog/second-post.md b/examples/blog/src/content/blog/second-post.md index 6b4f2d242..1bd5ee465 100644 --- a/examples/blog/src/pages/blog/second-post.md +++ b/examples/blog/src/content/blog/second-post.md @@ -1,5 +1,4 @@ --- -layout: "../../layouts/BlogPost.astro" title: "Second post" description: "Lorem ipsum dolor sit amet" pubDate: "Jul 22 2022" @@ -14,4 +13,4 @@ Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam s Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. -Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.
\ No newline at end of file +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/examples/blog/src/pages/blog/third-post.md b/examples/blog/src/content/blog/third-post.md index cba1991c5..d7f1f24b0 100644 --- a/examples/blog/src/pages/blog/third-post.md +++ b/examples/blog/src/content/blog/third-post.md @@ -1,5 +1,4 @@ --- -layout: "../../layouts/BlogPost.astro" title: "Third post" description: "Lorem ipsum dolor sit amet" pubDate: "Jul 15 2022" @@ -14,4 +13,4 @@ Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam s Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. -Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.
\ No newline at end of file +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/examples/with-content/src/content/blog/using-mdx.mdx b/examples/blog/src/content/blog/using-mdx.mdx index 036209d3b..036209d3b 100644 --- a/examples/with-content/src/content/blog/using-mdx.mdx +++ b/examples/blog/src/content/blog/using-mdx.mdx diff --git a/examples/with-content/src/content/config.ts b/examples/blog/src/content/config.ts index 30cbbf293..b4e86c9f7 100644 --- a/examples/with-content/src/content/config.ts +++ b/examples/blog/src/content/config.ts @@ -6,7 +6,10 @@ const blog = defineCollection({ title: z.string(), description: z.string(), // Transform string to Date object - pubDate: z.string().transform((str) => new Date(str)), + pubDate: z + .string() + .or(z.date()) + .transform((val) => new Date(val)), updatedDate: z .string() .optional() diff --git a/examples/blog/src/env.d.ts b/examples/blog/src/env.d.ts index f964fe0cf..acef35f17 100644 --- a/examples/blog/src/env.d.ts +++ b/examples/blog/src/env.d.ts @@ -1 +1,2 @@ +/// <reference path="../.astro/types.d.ts" /> /// <reference types="astro/client" /> diff --git a/examples/blog/src/layouts/BlogPost.astro b/examples/blog/src/layouts/BlogPost.astro index 4baf8e972..04a94ac48 100644 --- a/examples/blog/src/layouts/BlogPost.astro +++ b/examples/blog/src/layouts/BlogPost.astro @@ -1,21 +1,12 @@ --- +import type { CollectionEntry } from 'astro:content'; import BaseHead from '../components/BaseHead.astro'; import Header from '../components/Header.astro'; import Footer from '../components/Footer.astro'; -export interface Props { - content: { - title: string; - description: string; - pubDate?: string; - updatedDate?: string; - heroImage?: string; - }; -} +type Props = CollectionEntry<'blog'>['data']; -const { - content: { title, description, pubDate, updatedDate, heroImage }, -} = Astro.props; +const { title, description, pubDate, updatedDate, heroImage } = Astro.props; --- <html lang="en"> diff --git a/examples/blog/src/pages/about.md b/examples/blog/src/pages/about.md index 2aeb6562e..6a6dd0167 100644 --- a/examples/blog/src/pages/about.md +++ b/examples/blog/src/pages/about.md @@ -14,4 +14,4 @@ Mollis nunc sed id semper risus in. Convallis a cras semper auctor neque. Diam s Mattis ullamcorper velit sed ullamcorper morbi tincidunt. Tortor posuere ac ut consequat semper viverra. Tellus mauris a diam maecenas sed enim ut sem viverra. Venenatis urna cursus eget nunc scelerisque viverra mauris in. Arcu ac tortor dignissim convallis aenean et tortor at. Curabitur gravida arcu ac tortor dignissim convallis aenean et tortor. Egestas tellus rutrum tellus pellentesque eu. Fusce ut placerat orci nulla pellentesque dignissim enim sit amet. Ut enim blandit volutpat maecenas volutpat blandit aliquam etiam. Id donec ultrices tincidunt arcu. Id cursus metus aliquam eleifend mi. -Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna.
\ No newline at end of file +Tempus quam pellentesque nec nam aliquam sem. Risus at ultrices mi tempus imperdiet. Id porta nibh venenatis cras sed felis eget velit. Ipsum a arcu cursus vitae. Facilisis magna etiam tempor orci eu lobortis elementum. Tincidunt dui ut ornare lectus sit. Quisque non tellus orci ac. Blandit libero volutpat sed cras. Nec tincidunt praesent semper feugiat nibh sed pulvinar proin gravida. Egestas integer eget aliquet nibh praesent tristique magna. diff --git a/examples/blog/src/pages/blog.astro b/examples/blog/src/pages/blog.astro deleted file mode 100644 index cedf505b0..000000000 --- a/examples/blog/src/pages/blog.astro +++ /dev/null @@ -1,59 +0,0 @@ ---- -import BaseHead from '../components/BaseHead.astro'; -import Header from '../components/Header.astro'; -import Footer from '../components/Footer.astro'; -import { SITE_TITLE, SITE_DESCRIPTION } from '../config'; - -// Use Astro.glob() to fetch all posts, and then sort them by date. -const posts = (await Astro.glob('./blog/*.{md,mdx}')).sort( - (a, b) => new Date(b.frontmatter.pubDate).valueOf() - new Date(a.frontmatter.pubDate).valueOf() -); ---- - -<!DOCTYPE html> -<html lang="en"> - <head> - <BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} /> - <style> - ul { - list-style-type: none; - padding: unset; - } - ul li { - display: flex; - } - ul li time { - flex: 0 0 130px; - font-style: italic; - color: #595959; - } - ul li a:visited { - color: #8e32dc; - } - </style> - </head> - <body> - <Header /> - <main> - <section> - <ul> - { - posts.map((post) => ( - <li> - <time datetime={post.frontmatter.pubDate}> - {new Date(post.frontmatter.pubDate).toLocaleDateString('en-us', { - year: 'numeric', - month: 'short', - day: 'numeric', - })} - </time> - <a href={post.url}>{post.frontmatter.title}</a> - </li> - )) - } - </ul> - </section> - </main> - <Footer /> - </body> -</html> diff --git a/examples/with-content/src/pages/blog/[...slug].astro b/examples/blog/src/pages/blog/[...slug].astro index 0d656a153..0d656a153 100644 --- a/examples/with-content/src/pages/blog/[...slug].astro +++ b/examples/blog/src/pages/blog/[...slug].astro diff --git a/examples/with-content/src/pages/blog/index.astro b/examples/blog/src/pages/blog/index.astro index c46f23dea..f85894b6d 100644 --- a/examples/with-content/src/pages/blog/index.astro +++ b/examples/blog/src/pages/blog/index.astro @@ -47,7 +47,7 @@ const posts = (await getCollection('blog')).sort( day: 'numeric', })} </time> - <a href={'/blog/' + post.slug}>{post.data.title}</a> + <a href={`/blog/${post.slug}/`}>{post.data.title}</a> </li> )) } diff --git a/examples/blog/src/pages/blog/markdown-style-guide.md b/examples/blog/src/pages/blog/markdown-style-guide.md deleted file mode 100644 index e5e000de9..000000000 --- a/examples/blog/src/pages/blog/markdown-style-guide.md +++ /dev/null @@ -1,103 +0,0 @@ ---- -layout: "../../layouts/BlogPost.astro" -title: "Markdown Style Guide" -description: "Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro." -pubDate: "Jul 01 2022" -heroImage: "/placeholder-hero.jpg" ---- - -Here is a sample of some basic Markdown syntax that can be used when writing Markdown content in Astro. - -## Headings - -The following HTML `<h1>`—`<h6>` elements represent six levels of section headings. `<h1>` is the highest section level while `<h6>` is the lowest. - -# H1 -## H2 -### H3 -#### H4 -##### H5 -###### H6 - -## Paragraph - -Xerum, quo qui aut unt expliquam qui dolut labo. Aque venitatiusda cum, voluptionse latur sitiae dolessi aut parist aut dollo enim qui voluptate ma dolestendit peritin re plis aut quas inctum laceat est volestemque commosa as cus endigna tectur, offic to cor sequas etum rerum idem sintibus eiur? Quianimin porecus evelectur, cum que nis nust voloribus ratem aut omnimi, sitatur? Quiatem. Nam, omnis sum am facea corem alique molestrunt et eos evelece arcillit ut aut eos eos nus, sin conecerem erum fuga. Ri oditatquam, ad quibus unda veliamenimin cusam et facea ipsamus es exerum sitate dolores editium rerore eost, temped molorro ratiae volorro te reribus dolorer sperchicium faceata tiustia prat. - -Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sapicia is sinveli squiatum, core et que aut hariosam ex eat. - -## Images - - - -## Blockquotes - -The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations. - -#### Blockquote without attribution - -> Tiam, ad mint andaepu dandae nostion secatur sequo quae. -> **Note** that you can use *Markdown syntax* within a blockquote. - -#### Blockquote with attribution - -> Don't communicate by sharing memory, share memory by communicating.<br> -> — <cite>Rob Pike[^1]</cite> - -[^1]: The above quote is excerpted from Rob Pike's [talk](https://www.youtube.com/watch?v=PAAkCSZUG1c) during Gopherfest, November 18, 2015. - -## Tables - -| Italics | Bold | Code | -| -------- | -------- | ------ | -| *italics* | **bold** | `code` | - -## Code Blocks - -```html -<!doctype html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>Example HTML5 Document</title> -</head> -<body> - <p>Test</p> -</body> -</html> -``` - -## List Types - -#### Ordered List - -1. First item -2. Second item -3. Third item - -#### Unordered List - -* List item -* Another item -* And another item - -#### Nested list - -* Fruit - * Apple - * Orange - * Banana -* Dairy - * Milk - * Cheese - -## Other Elements — abbr, sub, sup, kbd, mark - -<abbr title="Graphics Interchange Format">GIF</abbr> is a bitmap image format. - -H<sub>2</sub>O - -X<sup>n</sup> + Y<sup>n</sup> = Z<sup>n</sup> - -Press <kbd><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>Delete</kbd></kbd> to end the session. - -Most <mark>salamanders</mark> are nocturnal, and hunt for insects, worms, and other small creatures. diff --git a/examples/blog/src/pages/blog/using-mdx.mdx b/examples/blog/src/pages/blog/using-mdx.mdx deleted file mode 100644 index 628cc7e02..000000000 --- a/examples/blog/src/pages/blog/using-mdx.mdx +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: '../../layouts/BlogPost.astro' -title: 'Using MDX' -description: 'Lorem ipsum dolor sit amet' -pubDate: 'Jul 02 2022' -heroImage: '/placeholder-hero.jpg' ---- - -This theme comes with the [@astrojs/mdx](https://docs.astro.build/en/guides/integrations-guide/mdx/) integration installed and configured in your `astro.config.mjs` config file. If you prefer not to use MDX, you can disable support by removing the integration from your config file. - -## Why MDX? - -MDX is a special flavor of Markdown that supports embedded JavaScript & JSX syntax. This unlocks the ability to [mix JavaScript and UI Components into your Markdown content](https://docs.astro.build/en/guides/markdown-content/#mdx-features) for things like interactive charts or alerts. - -If you have existing content authored in MDX, this integration will hopefully make migrating to Astro a breeze. - -## Example - -Here is how you import and use a UI component inside of MDX. -When you open this page in the browser, you should see the clickable button below. - -import HeaderLink from '../../components/HeaderLink.astro'; - -<HeaderLink href="#" onclick="alert('clicked!')"> - Embedded component in MDX -</HeaderLink> - -## More Links - -- [MDX Syntax Documentation](https://mdxjs.com/docs/what-is-mdx) -- [Astro Usage Documentation](https://docs.astro.build/en/guides/markdown-content/#markdown-and-mdx-pages) -- **Note:** [Client Directives](https://docs.astro.build/en/reference/directives-reference/#client-directives) are still required to create interactive components. Otherwise, all components in your MDX will render as static HTML (no JavaScript) by default. diff --git a/examples/blog/src/pages/index.astro b/examples/blog/src/pages/index.astro index aaa9a1f07..26f070da5 100644 --- a/examples/blog/src/pages/index.astro +++ b/examples/blog/src/pages/index.astro @@ -2,7 +2,7 @@ import BaseHead from '../components/BaseHead.astro'; import Header from '../components/Header.astro'; import Footer from '../components/Footer.astro'; -import { SITE_TITLE, SITE_DESCRIPTION } from '../config'; +import { SITE_TITLE, SITE_DESCRIPTION } from '../consts'; --- <!DOCTYPE html> diff --git a/examples/blog/src/pages/rss.xml.js b/examples/blog/src/pages/rss.xml.js index 4e6ed73c4..3997cc45e 100644 --- a/examples/blog/src/pages/rss.xml.js +++ b/examples/blog/src/pages/rss.xml.js @@ -1,10 +1,16 @@ import rss from '@astrojs/rss'; -import { SITE_TITLE, SITE_DESCRIPTION } from '../config'; +import { getCollection } from 'astro:content'; +import { SITE_TITLE, SITE_DESCRIPTION } from '../consts'; -export const get = () => - rss({ +export async function get(context) { + const posts = await getCollection('blog'); + return rss({ title: SITE_TITLE, description: SITE_DESCRIPTION, - site: import.meta.env.SITE, - items: import.meta.glob('./blog/**/*.{md,mdx}'), + site: context.site.href, + items: posts.map((post) => ({ + ...post.data, + link: `/blog/${post.slug}/`, + })), }); +} |