diff --git a/packages/astro/src/content/index.ts b/packages/astro/src/content/index.ts index 5c3e6defef15..15b61b5f2690 100644 --- a/packages/astro/src/content/index.ts +++ b/packages/astro/src/content/index.ts @@ -1,7 +1,7 @@ +export { getContentPaths } from './utils.js'; export { astroBundleDelayedAssetPlugin, astroDelayedAssetPlugin, } from './vite-plugin-content-assets.js'; export { astroContentServerPlugin } from './vite-plugin-content-server.js'; export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js'; -export { getContentPaths } from './utils.js'; diff --git a/packages/astro/src/core/build/vite-plugin-ssr.ts b/packages/astro/src/core/build/vite-plugin-ssr.ts index dbe5b1b4c503..928e3820e9a7 100644 --- a/packages/astro/src/core/build/vite-plugin-ssr.ts +++ b/packages/astro/src/core/build/vite-plugin-ssr.ts @@ -7,6 +7,7 @@ import type { StaticBuildOptions } from './types'; import glob from 'fast-glob'; import * as fs from 'fs'; import { fileURLToPath } from 'url'; +import { getContentPaths } from '../../content/index.js'; import { runHookBuildSsr } from '../../integrations/index.js'; import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js'; import { pagesVirtualModuleId } from '../app/index.js'; @@ -15,7 +16,6 @@ import { serializeRouteData } from '../routing/index.js'; import { addRollupInput } from './add-rollup-input.js'; import { getOutFile, getOutFolder } from './common.js'; import { eachPrerenderedPageData, eachServerPageData, sortedCSS } from './internal.js'; -import { getContentPaths } from '../../content/index.js'; export const virtualModuleId = '@astrojs-ssr-virtual-entry'; const resolvedVirtualModuleId = '\0' + virtualModuleId; diff --git a/packages/integrations/mdx/src/plugins.ts b/packages/integrations/mdx/src/plugins.ts index a93db383b767..c823c6e7cd85 100644 --- a/packages/integrations/mdx/src/plugins.ts +++ b/packages/integrations/mdx/src/plugins.ts @@ -1,24 +1,24 @@ import { rehypeHeadingIds } from '@astrojs/markdown-remark'; -import type { Image } from 'mdast'; 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, MarkdownAstroData } from 'astro'; import type { Literal, MemberExpression } from 'estree'; -import { visit } from 'unist-util-visit'; import { visit as estreeVisit } from 'estree-util-visit'; import { bold, yellow } from 'kleur/colors'; +import type { Image } from 'mdast'; +import { pathToFileURL } from 'node:url'; 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 { MdxOptions } from './index.js'; import { rehypeInjectHeadingsExport } from './rehype-collect-headings.js'; import rehypeMetaString from './rehype-meta-string.js'; import remarkPrism from './remark-prism.js'; import remarkShiki from './remark-shiki.js'; -import { jsToTreeNode, isRelativePath } from './utils.js'; -import { pathToFileURL } from 'node:url'; +import { isRelativePath, jsToTreeNode } from './utils.js'; export function recmaInjectImportMetaEnvPlugin({ importMetaEnv, diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts index 07df39ee8c6a..66889108e083 100644 --- a/packages/markdown/remark/src/index.ts +++ b/packages/markdown/remark/src/index.ts @@ -6,6 +6,7 @@ import rehypeEscape from './rehype-escape.js'; import rehypeExpressions from './rehype-expressions.js'; 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 { remarkInitializeAstroData } from './remark-initialize-astro-data.js'; import remarkMarkAndUnravel from './remark-mark-and-unravel.js'; @@ -14,7 +15,6 @@ import remarkPrism from './remark-prism.js'; import scopedStyles from './remark-scoped-styles.js'; import remarkShiki from './remark-shiki.js'; import remarkUnwrap from './remark-unwrap.js'; -import toRemarkContentRelImageError from './remark-content-rel-image-error.js'; import rehypeRaw from 'rehype-raw'; import rehypeStringify from 'rehype-stringify';