feat: revert mdx integration changes

docs/astro.config.mjs

@@ -1,7 +1,5 @@
 // @ts-check
 import { defineConfig } from 'astro/config';
-// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-import mdx from '@astrojs/mdx';
 import starlight from '@astrojs/starlight';
 import starlightLinksValidator from 'starlight-links-validator';
 import markdocGrammar from './grammars/markdoc.tmLanguage.json';
@@ -192,7 +190,5 @@ export default defineConfig({
 					]
 				: [],
 		}),
-		// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-		mdx(),
 	],
 });

docs/package.json

@@ -17,7 +17,6 @@
   },
   "dependencies": {
     "@astro-community/astro-embed-youtube": "^0.5.6",
-    "@astrojs/mdx": "^4.0.0-beta.3",
     "@astrojs/starlight": "workspace:*",
     "@lunariajs/core": "^0.1.1",
     "@types/culori": "^2.1.1",

examples/basics/astro.config.mjs

@@ -1,8 +1,6 @@
 // @ts-check
 import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
-// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
@@ -26,7 +24,5 @@ export default defineConfig({
 				},
 			],
 		}),
-		// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-		mdx(),
 	],
 });

examples/tailwind/astro.config.mjs

@@ -2,8 +2,6 @@
 import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
 import tailwind from '@astrojs/tailwind';
-// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
@@ -28,8 +26,6 @@ export default defineConfig({
 			],
 			customCss: ['./src/tailwind.css'],
 		}),
-		// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-		mdx(),
 		tailwind({ applyBaseStyles: false }),
 	],
 });

examples/tailwind/package.json

@@ -11,7 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.0.0-beta.3",
     "@astrojs/starlight": "^0.29.2",
     "@astrojs/starlight-tailwind": "^2.0.3",
     "@astrojs/tailwind": "^5.1.2",

packages/starlight/__e2e__/fixtures/basics/astro.config.mjs

@@ -1,16 +1,12 @@
 // @ts-check
 import starlight from '@astrojs/starlight';
 import { defineConfig } from 'astro/config';
-// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-import mdx from '@astrojs/mdx';
 
 export default defineConfig({
 	integrations: [
 		starlight({
 			title: 'Basics',
 			pagefind: false,
 		}),
-		// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-		mdx(),
 	],
 });

packages/starlight/__e2e__/fixtures/ssr/astro.config.mjs

@@ -2,8 +2,6 @@
 import { defineConfig } from 'astro/config';
 import starlight from '@astrojs/starlight';
 import node from '@astrojs/node';
-// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-import mdx from '@astrojs/mdx';
 
 const prerendering = process.env.STARLIGHT_PRERENDER === 'yes';
 
@@ -24,7 +22,5 @@ export default defineConfig({
 			prerender: prerendering,
 			pagefind: false,
 		}),
-		// TODO(HiDeoo) Remove or keep depending on the final decision regarding the peer dep change
-		mdx(),
 	],
 });

packages/starlight/__e2e__/fixtures/ssr/package.json

@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@astrojs/mdx": "^4.0.0-beta.3",
     "@astrojs/node": "^9.0.0-beta.3",
     "@astrojs/starlight": "workspace:*",
     "astro": "^5.0.0-beta.11"

packages/starlight/index.ts

@@ -7,6 +7,7 @@
 /// <reference path="./i18n.d.ts" />
 /// <reference path="./virtual.d.ts" />
 
+import mdx from '@astrojs/mdx';
 import type { AstroIntegration } from 'astro';
 import { spawn } from 'node:child_process';
 import { dirname, relative } from 'node:path';
@@ -95,19 +96,18 @@ export default function StarlightIntegration({
 				if (!allIntegrations.find(({ name }) => name === '@astrojs/sitemap')) {
 					integrations.push(starlightSitemap(starlightConfig));
 				}
+				if (!allIntegrations.find(({ name }) => name === '@astrojs/mdx')) {
+					integrations.push(mdx({ optimize: true }));
+				}
 
 				// Add Starlight directives restoration integration at the end of the list so that remark
 				// plugins injected by Starlight plugins through Astro integrations can handle text and
 				// leaf directives before they are transformed back to their original form.
 				integrations.push(starlightDirectivesRestorationIntegration());
 
-				// TODO(HiDeoo) `astroExpressiveCode()` has to come before `mdx()` so if the peer dep
-				// change is persisted, we probably want to add some tests here with some clear instruction
-				// on how users should order their integrations.
-
 				// Add integrations immediately after Starlight in the config array.
-				// e.g. if a user has `integrations: [starlight(), mdx(), tailwind()]`, then the order will
-				// be `[starlight(), expressiveCode(), sitemap(), mdx(), tailwind()]`.
+				// e.g. if a user has `integrations: [starlight(), tailwind()]`, then the order will be
+				// `[starlight(), expressiveCode(), sitemap(), mdx(), tailwind()]`.
 				// This ensures users can add integrations before/after Starlight and we respect that order.
 				const selfIndex = config.integrations.findIndex((i) => i.name === '@astrojs/starlight');
 				config.integrations.splice(selfIndex + 1, 0, ...integrations);

packages/starlight/package.json

@@ -191,6 +191,7 @@
     "vitest": "^2.1.4"
   },
   "dependencies": {
+    "@astrojs/mdx": "^4.0.0-beta.4",
     "@astrojs/sitemap": "^3.1.6",
     "@pagefind/default-ui": "^1.0.3",
     "@types/hast": "^3.0.4",