diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts index 021e55a56..b7542d39b 100644 --- a/packages/astro/src/runtime/server/index.ts +++ b/packages/astro/src/runtime/server/index.ts @@ -5,9 +5,9 @@ export { escapeHTML, HTMLBytes, HTMLString, + isHTMLString, markHTMLString, unescapeHTML, - isHTMLString, } from './escape.js'; export { renderJSX } from './jsx.js'; export { diff --git a/packages/integrations/markdoc/src/extensions/shiki.ts b/packages/integrations/markdoc/src/extensions/shiki.ts index 96d91d541..c61a8ad71 100644 --- a/packages/integrations/markdoc/src/extensions/shiki.ts +++ b/packages/integrations/markdoc/src/extensions/shiki.ts @@ -1,9 +1,9 @@ // @ts-expect-error Cannot find module 'astro/runtime/server/index.js' or its corresponding type declarations. -import { unescapeHTML } from 'astro/runtime/server/index.js'; +import Markdoc from '@markdoc/markdoc'; import type { ShikiConfig } from 'astro'; +import { unescapeHTML } from 'astro/runtime/server/index.js'; import type * as shikiTypes from 'shiki'; import type { AstroMarkdocConfig } from '../config.js'; -import Markdoc from '@markdoc/markdoc'; import { MarkdocError } from '../utils.js'; // Map of old theme names to new names to preserve compatibility when we upgrade shiki diff --git a/packages/integrations/markdoc/src/heading-ids.ts b/packages/integrations/markdoc/src/heading-ids.ts index 57b84d059..5c2f197f2 100644 --- a/packages/integrations/markdoc/src/heading-ids.ts +++ b/packages/integrations/markdoc/src/heading-ids.ts @@ -1,7 +1,7 @@ -import Markdoc, { type ConfigType, type RenderableTreeNode, type Schema } from '@markdoc/markdoc'; +import Markdoc, { type RenderableTreeNode, type Schema } from '@markdoc/markdoc'; import Slugger from 'github-slugger'; -import { getTextContent } from './runtime.js'; import type { AstroMarkdocConfig } from './config.js'; +import { getTextContent } from './runtime.js'; import { MarkdocError } from './utils.js'; function getSlug( diff --git a/packages/integrations/markdoc/src/runtime.ts b/packages/integrations/markdoc/src/runtime.ts index 4c5614b56..5a59d5fef 100644 --- a/packages/integrations/markdoc/src/runtime.ts +++ b/packages/integrations/markdoc/src/runtime.ts @@ -1,8 +1,8 @@ import type { MarkdownHeading } from '@astrojs/markdown-remark'; import Markdoc, { type RenderableTreeNode } from '@markdoc/markdoc'; import type { ContentEntryModule } from 'astro'; -import { setupHeadingConfig } from './heading-ids.js'; import type { AstroMarkdocConfig } from './config.js'; +import { setupHeadingConfig } from './heading-ids.js'; import { MarkdocError } from './utils.js'; /** Used to call `Markdoc.transform()` and `Markdoc.Ast` in runtime modules */