refactor(mdx): more unit tests, less integrations

packages/integrations/mdx/src/server.ts

@@ -3,7 +3,8 @@ import { AstroError } from 'astro/errors';
 import { AstroJSX, jsx } from 'astro/jsx-runtime';
 import { renderJSX } from 'astro/runtime/server/index.js';
 
-const slotName = (str: string) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());
+export const slotName = (str: string) =>
+	str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());
 
 // NOTE: In practice, MDX components are always tagged with `__astro_tag_component__`, so the right renderer
 // is used directly, and this check is not often used to return true.

packages/integrations/mdx/src/utils.ts

@@ -6,7 +6,7 @@ import type { MdxjsEsm } from 'mdast-util-mdx';
 import colors from 'piccolore';
 import type { PluggableList } from 'unified';
 
-function appendForwardSlash(path: string) {
+export function appendForwardSlash(path: string) {
 	return path.endsWith('/') ? path : path + '/';
 }
 

packages/integrations/mdx/src/vite-plugin-mdx-postprocess.ts

@@ -45,7 +45,7 @@ export function vitePluginMdxPostprocess(astroConfig: AstroConfig): Plugin {
 /**
  * Inject `Fragment` identifier import if not already present.
  */
-function injectUnderscoreFragmentImport(code: string, imports: readonly ImportSpecifier[]) {
+export function injectUnderscoreFragmentImport(code: string, imports: readonly ImportSpecifier[]) {
 	if (!isSpecifierImported(code, imports, underscoreFragmentImportRegex, 'astro/jsx-runtime')) {
 		code += `\nimport { Fragment as _Fragment } from 'astro/jsx-runtime';`;
 	}
@@ -55,7 +55,7 @@ function injectUnderscoreFragmentImport(code: string, imports: readonly ImportSp
 /**
  * Inject MDX metadata as exports of the module.
  */
-function injectMetadataExports(
+export function injectMetadataExports(
 	code: string,
 	exports: readonly ExportSpecifier[],
 	fileInfo: FileInfo,
@@ -73,7 +73,7 @@ function injectMetadataExports(
  * Transforms the `MDXContent` default export as `Content`, which wraps `MDXContent` and
  * passes additional `components` props.
  */
-function transformContentExport(code: string, exports: readonly ExportSpecifier[]) {
+export function transformContentExport(code: string, exports: readonly ExportSpecifier[]) {
 	if (exports.find(({ n }) => n === 'Content')) return code;
 
 	// If have `export const components`, pass that as props to `Content` as fallback
@@ -105,7 +105,7 @@ export default Content;`;
 /**
  * Add properties to the `Content` export.
  */
-function annotateContentExport(
+export function annotateContentExport(
 	code: string,
 	id: string,
 	ssr: boolean,
@@ -139,7 +139,7 @@ function annotateContentExport(
 /**
  * Check whether the `specifierRegex` matches for an import of `source` in the `code`.
  */
-function isSpecifierImported(
+export function isSpecifierImported(
 	code: string,
 	imports: readonly ImportSpecifier[],
 	specifierRegex: RegExp,

packages/integrations/mdx/test/fixtures/mdx-component/src/pages/glob.astro → packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/component/glob.astro

@@ -1,6 +1,6 @@
 ---
 import { parse } from 'node:path';
-const components = Object.values(import.meta.glob('../components/*.mdx', { eager: true }));
+const components = Object.values(import.meta.glob('../../components/component/*.mdx', { eager: true }));
 ---
 
 <div data-default-export>

packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/component/index.astro

@@ -0,0 +1,5 @@
+---
+import Test from '../../components/component/Test.mdx';
+---
+
+<Test />

packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/component/w-fragment.astro

@@ -0,0 +1,5 @@
+---
+import WithFragment from '../../components/component/WithFragment.mdx';
+---
+
+<WithFragment />

packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/index.mdx → packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/frontmatter/index.mdx

@@ -1,6 +1,6 @@
 ---
 title: 'Using YAML frontmatter'
-layout: '../layouts/Base.astro'
+layout: '../../layouts/Base.astro'
 illThrowIfIDontExist: "Oh no, that's scary!"
 ---
 

packages/integrations/mdx/test/fixtures/mdx-frontmatter/src/pages/with-headings.mdx → packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/frontmatter/with-headings.mdx

@@ -1,5 +1,5 @@
 ---
-layout: '../layouts/Base.astro'
+layout: '../../layouts/Base.astro'
 ---
 
 ## Section 1

packages/integrations/mdx/test/fixtures/mdx-slots/src/pages/glob.astro → packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/slots/glob.astro

@@ -1,5 +1,5 @@
 ---
-const components = Object.values(import.meta.glob('../components/*.mdx', { eager: true }));
+const components = Object.values(import.meta.glob('../../components/slots/*.mdx', { eager: true }));
 ---
 
 <div data-default-export>

packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/slots/index.astro

@@ -0,0 +1,5 @@
+---
+import Test from '../../components/slots/Test.mdx';
+---
+
+<Test />

packages/integrations/mdx/test/fixtures/mdx-get-static-paths/src/pages/[slug].astro → packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/static-paths/[slug].astro

@@ -1,6 +1,6 @@
 ---
 export const getStaticPaths = async () => {
-	const content = Object.values(import.meta.glob('../content/*.mdx', { eager: true }));
+	const content = Object.values(import.meta.glob('../../content/*.mdx', { eager: true }));
 
 	return content
     .filter((page) => !page.frontmatter.draft) // skip drafts

packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/url-export/test-1.mdx

@@ -0,0 +1 @@
+# I'm a page with a url of "/url-export/test-1!"

packages/integrations/mdx/test/fixtures/mdx-basics/src/pages/url-export/test-2.mdx

@@ -0,0 +1 @@
+# I'm a page with a url of "/url-export/test-2!"