diff options
| -rw-r--r-- | examples/with-content/src/content/types.generated.d.ts | 77 | ||||
| -rw-r--r-- | packages/astro/src/vite-plugin-markdown/index.ts | 2 | ||||
| -rw-r--r-- | packages/integrations/mdx/src/plugins.ts | 10 | ||||
| -rw-r--r-- | packages/markdown/remark/src/index.ts | 2 |
4 files changed, 45 insertions, 46 deletions
diff --git a/examples/with-content/src/content/types.generated.d.ts b/examples/with-content/src/content/types.generated.d.ts index ef8bd420e..906aabb75 100644 --- a/examples/with-content/src/content/types.generated.d.ts +++ b/examples/with-content/src/content/types.generated.d.ts @@ -42,45 +42,44 @@ declare module 'astro:content' { }; const entryMap: { - "blog": { -"first-post.md": { - id: "first-post.md", - slug: "first-post", - body: string, - collection: "blog", - data: InferEntrySchema<"blog"> -}, -"markdown-style-guide.md": { - id: "markdown-style-guide.md", - slug: "markdown-style-guide", - body: string, - collection: "blog", - data: InferEntrySchema<"blog"> -}, -"second-post.md": { - id: "second-post.md", - slug: "second-post", - body: string, - collection: "blog", - data: InferEntrySchema<"blog"> -}, -"third-post.md": { - id: "third-post.md", - slug: "third-post", - body: string, - collection: "blog", - data: InferEntrySchema<"blog"> -}, -"using-mdx.mdx": { - id: "using-mdx.mdx", - slug: "using-mdx", - body: string, - collection: "blog", - data: InferEntrySchema<"blog"> -}, -}, - + blog: { + 'first-post.md': { + id: 'first-post.md'; + slug: 'first-post'; + body: string; + collection: 'blog'; + data: InferEntrySchema<'blog'>; + }; + 'markdown-style-guide.md': { + id: 'markdown-style-guide.md'; + slug: 'markdown-style-guide'; + body: string; + collection: 'blog'; + data: InferEntrySchema<'blog'>; + }; + 'second-post.md': { + id: 'second-post.md'; + slug: 'second-post'; + body: string; + collection: 'blog'; + data: InferEntrySchema<'blog'>; + }; + 'third-post.md': { + id: 'third-post.md'; + slug: 'third-post'; + body: string; + collection: 'blog'; + data: InferEntrySchema<'blog'>; + }; + 'using-mdx.mdx': { + id: 'using-mdx.mdx'; + slug: 'using-mdx'; + body: string; + collection: 'blog'; + data: InferEntrySchema<'blog'>; + }; + }; }; - type ContentConfig = typeof import("./config"); + type ContentConfig = typeof import('./config'); } diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 53b482d8e..fb2725763 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -1,7 +1,7 @@ import { renderMarkdown } from '@astrojs/markdown-remark'; import { - safelyGetAstroData, InvalidAstroDataError, + safelyGetAstroData, } from '@astrojs/markdown-remark/dist/internal.js'; import fs from 'fs'; import matter from 'gray-matter'; diff --git a/packages/integrations/mdx/src/plugins.ts b/packages/integrations/mdx/src/plugins.ts index 4701b1679..675a8a645 100644 --- a/packages/integrations/mdx/src/plugins.ts +++ b/packages/integrations/mdx/src/plugins.ts @@ -1,12 +1,12 @@ import { rehypeHeadingIds } from '@astrojs/markdown-remark'; +import { + InvalidAstroDataError, + safelyGetAstroData, +} from '@astrojs/markdown-remark/dist/internal.js'; import { nodeTypes } from '@mdx-js/mdx'; import type { PluggableList } from '@mdx-js/mdx/lib/core.js'; import type { Options as MdxRollupPluginOptions } from '@mdx-js/rollup'; import type { AstroConfig } from 'astro'; -import { - safelyGetAstroData, - InvalidAstroDataError, -} from '@astrojs/markdown-remark/dist/internal.js'; import type { Literal, MemberExpression } from 'estree'; import { visit as estreeVisit } from 'estree-util-visit'; import { bold, yellow } from 'kleur/colors'; @@ -16,7 +16,7 @@ import rehypeRaw from 'rehype-raw'; import remarkGfm from 'remark-gfm'; import remarkSmartypants from 'remark-smartypants'; import { visit } from 'unist-util-visit'; -import type { Data, VFile } from 'vfile'; +import type { VFile } from 'vfile'; import { MdxOptions } from './index.js'; import { rehypeInjectHeadingsExport } from './rehype-collect-headings.js'; import rehypeMetaString from './rehype-meta-string.js'; diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts index 480cc9e38..5d442e830 100644 --- a/packages/markdown/remark/src/index.ts +++ b/packages/markdown/remark/src/index.ts @@ -1,5 +1,6 @@ import type { MarkdownRenderingOptions, MarkdownRenderingResult, MarkdownVFile } from './types'; +import { toRemarkInitializeAstroData } from './frontmatter-injection.js'; import { loadPlugins } from './load-plugins.js'; import { rehypeHeadingIds } from './rehype-collect-headings.js'; import rehypeEscape from './rehype-escape.js'; @@ -8,7 +9,6 @@ import rehypeIslands from './rehype-islands.js'; import rehypeJsx from './rehype-jsx.js'; import toRemarkContentRelImageError from './remark-content-rel-image-error.js'; import remarkEscape from './remark-escape.js'; -import { toRemarkInitializeAstroData } from './frontmatter-injection.js'; import remarkMarkAndUnravel from './remark-mark-and-unravel.js'; import remarkMdxish from './remark-mdxish.js'; import remarkPrism from './remark-prism.js'; |