Refactor @astrojs/prism, fix Prism component import not working

.changeset/slow-spiders-fly.md

@@ -0,0 +1,8 @@
+---
+'astro': patch
+'@astrojs/prism': patch
+'@astrojs/mdx': patch
+'@astrojs/markdown-remark': patch
+---
+
+Refactor `@astrojs/mdx` and `@astrojs/markdown-remark` to use `@astrojs/prism` instead of duplicating the code

packages/astro-prism/Prism.astro

@@ -1,5 +1,5 @@
 ---
-import { runHighlighterWithAstro } from './dist/internal';
+import { runHighlighterWithAstro } from './dist/index';
 
 export interface Props {
 	class?: string;

packages/astro-prism/README.md

@@ -16,10 +16,10 @@ import { Prism } from "@astrojs/prism"
 
 ## Internal
 
-This package exports a `runHighlighterWithAstro` function inside `internal.ts` to make sure the Astro language is loaded when highlighting code
+This package exports a `runHighlighterWithAstro` function to highlight while making sure the Astro language is loaded beforehand
 
 ```typescript
-import { runHighlighterWithAstro } from '@astrojs/prism/dist/internal';
+import { runHighlighterWithAstro } from '@astrojs/prism';
 
 runHighlighterWithAstro(`
   ---

packages/astro-prism/package.json

@@ -20,7 +20,6 @@
   },
   "exports": {
     ".": "./dist/index.js",
-    "./dist/internal": "./dist/internal.js",
     "./Prism.astro": "./Prism.astro"
   },
   "keywords": [

packages/astro-prism/src/highlighter.ts

@@ -0,0 +1,42 @@
+import Prism from 'prismjs';
+import loadLanguages from 'prismjs/components/index.js';
+import { addAstro } from './plugin';
+
+const languageMap = new Map([['ts', 'typescript']]);
+
+export function runHighlighterWithAstro(lang: string | undefined, code: string) {
+	let classLanguage = `language-${lang}`;
+
+	if (!lang) {
+		lang = 'plaintext';
+	}
+
+	const ensureLoaded = (language: string) => {
+		if (language && !Prism.languages[language]) {
+			loadLanguages([language]);
+		}
+	};
+
+	if (languageMap.has(lang)) {
+		ensureLoaded(languageMap.get(lang)!);
+	} else if (lang === 'astro') {
+		ensureLoaded('typescript');
+		addAstro(Prism);
+	} else {
+		ensureLoaded('markup-templating'); // Prism expects this to exist for a number of other langs
+		ensureLoaded(lang);
+	}
+
+	if (lang && !Prism.languages[lang]) {
+		// eslint-disable-next-line no-console
+		console.warn(`Unable to load the language: ${lang}`);
+	}
+
+	const grammar = Prism.languages[lang];
+	let html = code;
+	if (grammar) {
+		html = Prism.highlight(code, grammar, lang);
+	}
+
+	return { classLanguage, html };
+}

packages/astro-prism/src/index.ts

@@ -1,2 +1,3 @@
 // @ts-expect-error
 export { default as Prism } from '../Prism.astro';
+export { runHighlighterWithAstro } from './highlighter';

packages/astro-prism/src/internal.ts → packages/astro-prism/src/plugin.ts

@@ -1,7 +1,4 @@
-import Prism from 'prismjs';
-import loadLanguages from 'prismjs/components/index.js';
-
-function addAstro() {
+export function addAstro(Prism: typeof import('prismjs')) {
 	if (Prism.languages.astro) {
 		return;
 	}
@@ -188,42 +185,3 @@ function addAstro() {
 		walkTokens(env.tokens);
 	});
 }
-
-const languageMap = new Map([['ts', 'typescript']]);
-
-export function runHighlighterWithAstro(lang: string | undefined, code: string) {
-	let classLanguage = `language-${lang}`;
-
-	if (!lang) {
-		lang = 'plaintext';
-	}
-
-	const ensureLoaded = (language: string) => {
-		if (language && !Prism.languages[language]) {
-			loadLanguages([language]);
-		}
-	};
-
-	if (languageMap.has(lang)) {
-		ensureLoaded(languageMap.get(lang)!);
-	} else if (lang === 'astro') {
-		ensureLoaded('typescript');
-		addAstro();
-	} else {
-		ensureLoaded('markup-templating'); // Prism expects this to exist for a number of other langs
-		ensureLoaded(lang);
-	}
-
-	if (lang && !Prism.languages[lang]) {
-		// eslint-disable-next-line no-console
-		console.warn(`Unable to load the language: ${lang}`);
-	}
-
-	const grammar = Prism.languages[lang];
-	let html = code;
-	if (grammar) {
-		html = Prism.highlight(code, grammar, lang);
-	}
-
-	return { classLanguage, html };
-}

packages/integrations/mdx/src/remark-prism.ts

@@ -1,4 +1,4 @@
-import { runHighlighterWithAstro } from '@astrojs/prism/dist/internal';
+import { runHighlighterWithAstro } from '@astrojs/prism';
 import { visit } from 'unist-util-visit';
 
 /**  */

packages/markdown/remark/src/remark-prism.ts

@@ -1,4 +1,4 @@
-import { runHighlighterWithAstro } from '@astrojs/prism/dist/internal';
+import { runHighlighterWithAstro } from '@astrojs/prism';
 import { visit } from 'unist-util-visit';
 const noVisit = new Set(['root', 'html', 'text']);