Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add astro plugin * Add astro fixture and test * Narrow entry file pattern * Implement suggestions from review Co-Authored-By: Lars Kappert <lars@webpro.nl> * Remove unnecessary file references, fix astro:content Co-Authored-By: Lars Kappert <lars@webpro.nl> * Actually untrack unnecessary files * Ignore (only) the generated `.astro/types.d.ts` file * Add dummy astro package + binary * Wrap up astro plugin --------- Co-authored-by: Lars Kappert <lars@webpro.nl>
- Loading branch information
Showing
33 changed files
with
1,123 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,213 @@ | ||
declare module 'astro:content' { | ||
interface Render { | ||
'.mdx': Promise<{ | ||
Content: import('astro').MarkdownInstance<{}>['Content']; | ||
headings: import('astro').MarkdownHeading[]; | ||
remarkPluginFrontmatter: Record<string, any>; | ||
}>; | ||
} | ||
} | ||
|
||
declare module 'astro:content' { | ||
interface Render { | ||
'.md': Promise<{ | ||
Content: import('astro').MarkdownInstance<{}>['Content']; | ||
headings: import('astro').MarkdownHeading[]; | ||
remarkPluginFrontmatter: Record<string, any>; | ||
}>; | ||
} | ||
} | ||
|
||
declare module 'astro:content' { | ||
export { z } from 'astro/zod'; | ||
|
||
type Flatten<T> = T extends { [K: string]: infer U } ? U : never; | ||
|
||
export type CollectionKey = keyof AnyEntryMap; | ||
export type CollectionEntry<C extends CollectionKey> = Flatten<AnyEntryMap[C]>; | ||
|
||
export type ContentCollectionKey = keyof ContentEntryMap; | ||
export type DataCollectionKey = keyof DataEntryMap; | ||
|
||
// This needs to be in sync with ImageMetadata | ||
export type ImageFunction = () => import('astro/zod').ZodObject<{ | ||
src: import('astro/zod').ZodString; | ||
width: import('astro/zod').ZodNumber; | ||
height: import('astro/zod').ZodNumber; | ||
format: import('astro/zod').ZodUnion< | ||
[ | ||
import('astro/zod').ZodLiteral<'png'>, | ||
import('astro/zod').ZodLiteral<'jpg'>, | ||
import('astro/zod').ZodLiteral<'jpeg'>, | ||
import('astro/zod').ZodLiteral<'tiff'>, | ||
import('astro/zod').ZodLiteral<'webp'>, | ||
import('astro/zod').ZodLiteral<'gif'>, | ||
import('astro/zod').ZodLiteral<'svg'>, | ||
import('astro/zod').ZodLiteral<'avif'>, | ||
] | ||
>; | ||
}>; | ||
|
||
type BaseSchemaWithoutEffects = | ||
| import('astro/zod').AnyZodObject | ||
| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]> | ||
| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]> | ||
| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>; | ||
|
||
type BaseSchema = | ||
| BaseSchemaWithoutEffects | ||
| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>; | ||
|
||
export type SchemaContext = { image: ImageFunction }; | ||
|
||
type DataCollectionConfig<S extends BaseSchema> = { | ||
type: 'data'; | ||
schema?: S | ((context: SchemaContext) => S); | ||
}; | ||
|
||
type ContentCollectionConfig<S extends BaseSchema> = { | ||
type?: 'content'; | ||
schema?: S | ((context: SchemaContext) => S); | ||
}; | ||
|
||
type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>; | ||
|
||
export function defineCollection<S extends BaseSchema>( | ||
input: CollectionConfig<S> | ||
): CollectionConfig<S>; | ||
|
||
type AllValuesOf<T> = T extends any ? T[keyof T] : never; | ||
type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf< | ||
ContentEntryMap[C] | ||
>['slug']; | ||
|
||
export function getEntryBySlug< | ||
C extends keyof ContentEntryMap, | ||
E extends ValidContentEntrySlug<C> | (string & {}), | ||
>( | ||
collection: C, | ||
// Note that this has to accept a regular string too, for SSR | ||
entrySlug: E | ||
): E extends ValidContentEntrySlug<C> | ||
? Promise<CollectionEntry<C>> | ||
: Promise<CollectionEntry<C> | undefined>; | ||
|
||
export function getDataEntryById<C extends keyof DataEntryMap, E extends keyof DataEntryMap[C]>( | ||
collection: C, | ||
entryId: E | ||
): Promise<CollectionEntry<C>>; | ||
|
||
export function getCollection<C extends keyof AnyEntryMap, E extends CollectionEntry<C>>( | ||
collection: C, | ||
filter?: (entry: CollectionEntry<C>) => entry is E | ||
): Promise<E[]>; | ||
export function getCollection<C extends keyof AnyEntryMap>( | ||
collection: C, | ||
filter?: (entry: CollectionEntry<C>) => unknown | ||
): Promise<CollectionEntry<C>[]>; | ||
|
||
export function getEntry< | ||
C extends keyof ContentEntryMap, | ||
E extends ValidContentEntrySlug<C> | (string & {}), | ||
>(entry: { | ||
collection: C; | ||
slug: E; | ||
}): E extends ValidContentEntrySlug<C> | ||
? Promise<CollectionEntry<C>> | ||
: Promise<CollectionEntry<C> | undefined>; | ||
export function getEntry< | ||
C extends keyof DataEntryMap, | ||
E extends keyof DataEntryMap[C] | (string & {}), | ||
>(entry: { | ||
collection: C; | ||
id: E; | ||
}): E extends keyof DataEntryMap[C] | ||
? Promise<DataEntryMap[C][E]> | ||
: Promise<CollectionEntry<C> | undefined>; | ||
export function getEntry< | ||
C extends keyof ContentEntryMap, | ||
E extends ValidContentEntrySlug<C> | (string & {}), | ||
>( | ||
collection: C, | ||
slug: E | ||
): E extends ValidContentEntrySlug<C> | ||
? Promise<CollectionEntry<C>> | ||
: Promise<CollectionEntry<C> | undefined>; | ||
export function getEntry< | ||
C extends keyof DataEntryMap, | ||
E extends keyof DataEntryMap[C] | (string & {}), | ||
>( | ||
collection: C, | ||
id: E | ||
): E extends keyof DataEntryMap[C] | ||
? Promise<DataEntryMap[C][E]> | ||
: Promise<CollectionEntry<C> | undefined>; | ||
|
||
/** Resolve an array of entry references from the same collection */ | ||
export function getEntries<C extends keyof ContentEntryMap>( | ||
entries: { | ||
collection: C; | ||
slug: ValidContentEntrySlug<C>; | ||
}[] | ||
): Promise<CollectionEntry<C>[]>; | ||
export function getEntries<C extends keyof DataEntryMap>( | ||
entries: { | ||
collection: C; | ||
id: keyof DataEntryMap[C]; | ||
}[] | ||
): Promise<CollectionEntry<C>[]>; | ||
|
||
export function reference<C extends keyof AnyEntryMap>( | ||
collection: C | ||
): import('astro/zod').ZodEffects< | ||
import('astro/zod').ZodString, | ||
C extends keyof ContentEntryMap | ||
? { | ||
collection: C; | ||
slug: ValidContentEntrySlug<C>; | ||
} | ||
: { | ||
collection: C; | ||
id: keyof DataEntryMap[C]; | ||
} | ||
>; | ||
// Allow generic `string` to avoid excessive type errors in the config | ||
// if `dev` is not running to update as you edit. | ||
// Invalid collection names will be caught at build time. | ||
export function reference<C extends string>( | ||
collection: C | ||
): import('astro/zod').ZodEffects<import('astro/zod').ZodString, never>; | ||
|
||
type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T; | ||
type InferEntrySchema<C extends keyof AnyEntryMap> = import('astro/zod').infer< | ||
ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']> | ||
>; | ||
|
||
type ContentEntryMap = { | ||
"blog": { | ||
"first-post.md": { | ||
id: "first-post.md"; | ||
slug: "first-post"; | ||
body: string; | ||
collection: "blog"; | ||
data: InferEntrySchema<"blog"> | ||
} & { render(): Render[".md"] }; | ||
"using-mdx.mdx": { | ||
id: "using-mdx.mdx"; | ||
slug: "using-mdx"; | ||
body: string; | ||
collection: "blog"; | ||
data: InferEntrySchema<"blog"> | ||
} & { render(): Render[".mdx"] }; | ||
}; | ||
|
||
}; | ||
|
||
type DataEntryMap = { | ||
|
||
}; | ||
|
||
type AnyEntryMap = ContentEntryMap & DataEntryMap; | ||
|
||
type ContentConfig = typeof import("../src/content/config"); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import { defineConfig } from 'astro/config'; | ||
import mdx from '@astrojs/mdx'; | ||
|
||
import sitemap from '@astrojs/sitemap'; | ||
|
||
// https://astro.build/config | ||
export default defineConfig({ | ||
site: 'https://example.com', | ||
integrations: [mdx(), sitemap()], | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export default { | ||
ignore: '.astro/types.d.ts', | ||
compilers: { | ||
astro: (text: string) => [...text.matchAll(/import[^;]+/g)].join('\n'), | ||
css: (text: string) => [...text.matchAll(/(?<=@)import[^;]+/g)].join('\n'), | ||
mdx: (text: string) => [...text.matchAll(/import[^;]+/g)].join('\n'), | ||
}, | ||
}; |
Empty file.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"name": "@fixtures/astro", | ||
"type": "module", | ||
"version": "*", | ||
"scripts": { | ||
"dev": "astro dev", | ||
"start": "astro dev", | ||
"build": "astro build", | ||
"preview": "astro preview", | ||
"astro": "astro" | ||
}, | ||
"dependencies": { | ||
"@astrojs/mdx": "*", | ||
"@astrojs/rss": "*", | ||
"@astrojs/sitemap": "*", | ||
"astro": "*" | ||
} | ||
} |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
--- | ||
// Import the global.css file here so that it is included on | ||
// all pages through the use of the <BaseHead /> component. | ||
import '../styles/global.css'; | ||
interface Props { | ||
title: string; | ||
description: string; | ||
image?: string; | ||
} | ||
const canonicalURL = new URL(Astro.url.pathname, Astro.site); | ||
const { title, description, image = '/favicon.svg' } = Astro.props; | ||
--- | ||
|
||
<!-- Global Metadata --> | ||
<meta charset="utf-8" /> | ||
<meta name="viewport" content="width=device-width,initial-scale=1" /> | ||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" /> | ||
<meta name="generator" content={Astro.generator} /> | ||
|
||
<!-- Canonical URL --> | ||
<link rel="canonical" href={canonicalURL} /> | ||
|
||
<!-- Primary Meta Tags --> | ||
<title>{title}</title> | ||
<meta name="title" content={title} /> | ||
<meta name="description" content={description} /> | ||
|
||
<!-- Open Graph / Facebook --> | ||
<meta property="og:type" content="website" /> | ||
<meta property="og:url" content={Astro.url} /> | ||
<meta property="og:title" content={title} /> | ||
<meta property="og:description" content={description} /> | ||
<meta property="og:image" content={new URL(image, Astro.url)} /> | ||
|
||
<!-- Twitter --> | ||
<meta property="twitter:card" content="summary_large_image" /> | ||
<meta property="twitter:url" content={Astro.url} /> | ||
<meta property="twitter:title" content={title} /> | ||
<meta property="twitter:description" content={description} /> | ||
<meta property="twitter:image" content={new URL(image, Astro.url)} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
--- | ||
const today = new Date(); | ||
--- | ||
|
||
<footer> | ||
© {today.getFullYear()} Your name here. All rights reserved. | ||
<div class="social-links"> | ||
<a href="https://m.webtoo.ls/@astro" target="_blank"> | ||
<span class="sr-only">Follow Astro on Mastodon</span> | ||
<svg | ||
viewBox="0 0 16 16" | ||
aria-hidden="true" | ||
width="32" | ||
height="32" | ||
astro-icon="social/mastodon" | ||
><path | ||
fill="currentColor" | ||
d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z" | ||
></path></svg | ||
> | ||
</a> | ||
<a href="https://twitter.com/astrodotbuild" target="_blank"> | ||
<span class="sr-only">Follow Astro on Twitter</span> | ||
<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/twitter" | ||
><path | ||
fill="currentColor" | ||
d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z" | ||
></path></svg | ||
> | ||
</a> | ||
<a href="https://github.com/withastro/astro" target="_blank"> | ||
<span class="sr-only">Go to Astro's GitHub repo</span> | ||
<svg viewBox="0 0 16 16" aria-hidden="true" width="32" height="32" astro-icon="social/github" | ||
><path | ||
fill="currentColor" | ||
d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" | ||
></path></svg | ||
> | ||
</a> | ||
</div> | ||
</footer> | ||
<style> | ||
footer { | ||
padding: 2em 1em 6em 1em; | ||
background: linear-gradient(var(--gray-gradient)) no-repeat; | ||
color: rgb(var(--gray)); | ||
text-align: center; | ||
} | ||
.social-links { | ||
display: flex; | ||
justify-content: center; | ||
gap: 1em; | ||
margin-top: 1em; | ||
} | ||
.social-links a { | ||
text-decoration: none; | ||
color: rgb(var(--gray)); | ||
} | ||
.social-links a:hover { | ||
color: rgb(var(--gray-dark)); | ||
} | ||
</style> |
Oops, something went wrong.