Merge branch 'main' into feat/scope-spec

.changeset/tiny-glasses-play.md

@@ -0,0 +1,6 @@
+---
+'@astrojs/image': minor
+---
+
+- Fixes two bugs that were blocking SSR support when deployed to a hosting service
+- The built-in `sharp` service now automatically rotates images based on EXIF data

.changeset/two-hounds-sort.md

@@ -0,0 +1,20 @@
+---
+'astro': minor
+'@astrojs/markdown-component': minor
+'@astrojs/markdown-remark': minor
+---
+
+The use of components and JSX expressions in Markdown are no longer supported by default.
+
+For long term support, migrate to the `@astrojs/mdx` integration for MDX support (including `.mdx` pages!).
+
+Not ready to migrate to MDX? Add the legacy flag to your Astro config to re-enable the previous Markdown support.
+
+```js
+// https://astro.build/config
+export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	}
+});
+```

packages/astro/e2e/fixtures/preact-compat-component/astro.config.mjs

@@ -3,5 +3,8 @@ import preact from '@astrojs/preact';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [preact({ compat: true })],
 });

packages/astro/e2e/fixtures/preact-component/astro.config.mjs

@@ -4,5 +4,8 @@ import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [preact(), mdx()],
 });

packages/astro/e2e/fixtures/react-component/astro.config.mjs

@@ -4,5 +4,8 @@ import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [react(), mdx()],
 });

packages/astro/e2e/fixtures/solid-component/astro.config.mjs

@@ -4,5 +4,8 @@ import solid from '@astrojs/solid-js';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [solid(), mdx()],
 });

packages/astro/e2e/fixtures/svelte-component/astro.config.mjs

@@ -4,5 +4,8 @@ import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [svelte(), mdx()],
 });

packages/astro/e2e/fixtures/vue-component/astro.config.mjs

@@ -4,6 +4,9 @@ import mdx from '@astrojs/mdx';
 
 // https://astro.build/config
 export default defineConfig({
+	legacy: {
+		astroFlavoredMarkdown: true,
+	},
 	integrations: [
 		mdx(),
 		vue({

packages/astro/src/@types/astro.ts

@@ -527,27 +527,6 @@ export interface AstroUserConfig {
 		 */
 		drafts?: boolean;
 
-		/**
-		 * @docs
-		 * @name markdown.mode
-		 * @type {'md' | 'mdx'}
-		 * @default `mdx`
-		 * @description
-		 * Control whether Markdown processing is done using MDX or not.
-		 *
-		 * MDX processing enables you to use JSX inside your Markdown files. However, there may be instances where you don't want this behavior, and would rather use a "vanilla" Markdown processor. This field allows you to control that behavior.
-		 *
-		 * ```js
-		 * {
-		 *   markdown: {
-		 *     // Example: Use non-MDX processor for Markdown files
-		 *     mode: 'md',
-		 *   }
-		 * }
-		 * ```
-		 */
-		mode?: 'md' | 'mdx';
-
 		/**
 		 * @docs
 		 * @name markdown.shikiConfig
@@ -716,6 +695,16 @@ export interface AstroUserConfig {
 	buildOptions?: never;
 	/** @deprecated `devOptions` has been renamed to `server` */
 	devOptions?: never;
+
+	legacy?: {
+		/**
+		 * Enable components and JSX expressions in markdown
+		 * Consider our MDX integration before applying this flag!
+		 * @see https://docs.astro.build/en/guides/integrations-guide/mdx/
+		 * Default: false
+		 */
+		astroFlavoredMarkdown?: boolean;
+	};
 }
 
 // NOTE(fks): We choose to keep our hand-generated AstroUserConfig interface so that

packages/astro/src/core/build/generate.ts

@@ -213,7 +213,10 @@ async function generatePath(
 		adapterName: undefined,
 		links,
 		logging,
-		markdown: astroConfig.markdown,
+		markdown: {
+			...astroConfig.markdown,
+			isAstroFlavoredMd: astroConfig.legacy.astroFlavoredMarkdown,
+		},
 		mod,
 		mode: opts.mode,
 		origin,

packages/astro/src/core/build/vite-plugin-ssr.ts

@@ -153,7 +153,10 @@ function buildManifest(
 		routes,
 		site: astroConfig.site,
 		base: astroConfig.base,
-		markdown: astroConfig.markdown,
+		markdown: {
+			...astroConfig.markdown,
+			isAstroFlavoredMd: astroConfig.legacy.astroFlavoredMarkdown,
+		},
 		pageMap: null as any,
 		renderers: [],
 		entryModules,

packages/astro/src/core/config.ts

@@ -50,6 +50,9 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = {
 		rehypePlugins: [],
 	},
 	vite: {},
+	legacy: {
+		astroFlavoredMarkdown: false,
+	},
 };
 
 async function resolvePostcssConfig(inlineOptions: any, root: URL): Promise<PostCSSConfigResult> {
@@ -172,9 +175,6 @@ export const AstroConfigSchema = z.object({
 		.default({}),
 	markdown: z
 		.object({
-			// NOTE: "mdx" allows us to parse/compile Astro components in markdown.
-			// TODO: This should probably be updated to something more like "md" | "astro"
-			mode: z.enum(['md', 'mdx']).default('mdx'),
 			drafts: z.boolean().default(false),
 			syntaxHighlight: z
 				.union([z.literal('shiki'), z.literal('prism'), z.literal(false)])
@@ -212,6 +212,15 @@ export const AstroConfigSchema = z.object({
 	vite: z
 		.custom<ViteUserConfig>((data) => data instanceof Object && !Array.isArray(data))
 		.default(ASTRO_CONFIG_DEFAULTS.vite),
+	legacy: z
+		.object({
+			astroFlavoredMarkdown: z
+				.boolean()
+				.optional()
+				.default(ASTRO_CONFIG_DEFAULTS.legacy.astroFlavoredMarkdown),
+		})
+		.optional()
+		.default({}),
 });
 
 /** Turn raw config values into normalized values */

packages/astro/src/core/render/dev/index.ts

@@ -173,7 +173,10 @@ export async function render(
 		links,
 		styles,
 		logging,
-		markdown: astroConfig.markdown,
+		markdown: {
+			...astroConfig.markdown,
+			isAstroFlavoredMd: astroConfig.legacy.astroFlavoredMarkdown,
+		},
 		mod,
 		mode,
 		origin,

packages/astro/src/jsx-runtime/index.ts

@@ -29,23 +29,24 @@ export function transformSlots(vnode: AstroVNode) {
 		delete child.props.slot;
 		delete vnode.props.children;
 	}
-	if (!Array.isArray(vnode.props.children)) return;
-	// Handle many children with slot attributes
-	vnode.props.children = vnode.props.children
-		.map((child) => {
-			if (!isVNode(child)) return child;
-			if (!('slot' in child.props)) return child;
-			const name = toSlotName(child.props.slot);
-			if (Array.isArray(slots[name])) {
-				slots[name].push(child);
-			} else {
-				slots[name] = [child];
-				slots[name]['$$slot'] = true;
-			}
-			delete child.props.slot;
-			return Empty;
-		})
-		.filter((v) => v !== Empty);
+	if (Array.isArray(vnode.props.children)) {
+		// Handle many children with slot attributes
+		vnode.props.children = vnode.props.children
+			.map((child) => {
+				if (!isVNode(child)) return child;
+				if (!('slot' in child.props)) return child;
+				const name = toSlotName(child.props.slot);
+				if (Array.isArray(slots[name])) {
+					slots[name].push(child);
+				} else {
+					slots[name] = [child];
+					slots[name]['$$slot'] = true;
+				}
+				delete child.props.slot;
+				return Empty;
+			})
+			.filter((v) => v !== Empty);
+	}
 	Object.assign(vnode.props, slots);
 }
 

packages/astro/src/runtime/server/jsx.ts

@@ -19,6 +19,9 @@ let consoleFilterRefs = 0;
 export async function renderJSX(result: SSRResult, vnode: any): Promise<any> {
 	switch (true) {
 		case vnode instanceof HTMLString:
+			if (vnode.toString().trim() === '') {
+				return '';
+			}
 			return vnode;
 		case typeof vnode === 'string':
 			return markHTMLString(escapeHTML(vnode));
@@ -55,6 +58,9 @@ export async function renderJSX(result: SSRResult, vnode: any): Promise<any> {
 		}
 
 		if (vnode.type) {
+			if (typeof vnode.type === 'function' && (vnode.type as any)['astro:renderer']) {
+				skipAstroJSXCheck.add(vnode.type);
+			}
 			if (typeof vnode.type === 'function' && vnode.props['server:root']) {
 				const output = await vnode.type(vnode.props ?? {});
 				return await renderJSX(result, output);
@@ -76,27 +82,42 @@ export async function renderJSX(result: SSRResult, vnode: any): Promise<any> {
 			}
 
 			const { children = null, ...props } = vnode.props ?? {};
-			const slots: Record<string, any> = {
+			const _slots: Record<string, any> = {
 				default: [],
 			};
 			function extractSlots(child: any): any {
 				if (Array.isArray(child)) {
 					return child.map((c) => extractSlots(c));
 				}
 				if (!isVNode(child)) {
-					return slots.default.push(child);
+					_slots.default.push(child);
+					return;
 				}
 				if ('slot' in child.props) {
-					slots[child.props.slot] = [...(slots[child.props.slot] ?? []), child];
+					_slots[child.props.slot] = [...(_slots[child.props.slot] ?? []), child];
 					delete child.props.slot;
 					return;
 				}
-				slots.default.push(child);
+				_slots.default.push(child);
 			}
 			extractSlots(children);
-			for (const [key, value] of Object.entries(slots)) {
-				slots[key] = () => renderJSX(result, value);
+			for (const [key, value] of Object.entries(props)) {
+				if (value['$$slot']) {
+					_slots[key] = value;
+					delete props[key];
+				}
+			}
+			const slotPromises = [];
+			const slots: Record<string, any> = {};
+			for (const [key, value] of Object.entries(_slots)) {
+				slotPromises.push(
+					renderJSX(result, value).then((output) => {
+						if (output.toString().trim().length === 0) return;
+						slots[key] = () => output;
+					})
+				);
 			}
+			await Promise.all(slotPromises);
 
 			let output: string | AsyncIterable<string>;
 			if (vnode.type === ClientOnlyPlaceholder && vnode.props['client:only']) {

packages/astro/src/vite-plugin-markdown/index.ts

@@ -137,7 +137,7 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
 				const filename = normalizeFilename(id);
 				const source = await fs.promises.readFile(filename, 'utf8');
 				const renderOpts = config.markdown;
-				const isMDX = renderOpts.mode === 'mdx';
+				const isAstroFlavoredMd = config.legacy.astroFlavoredMarkdown;
 
 				const fileUrl = new URL(`file://${filename}`);
 				const isPage = fileUrl.pathname.startsWith(resolvePages(config).pathname);
@@ -149,7 +149,7 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
 				// Turn HTML comments into JS comments while preventing nested `*/` sequences
 				// from ending the JS comment by injecting a zero-width space
 				// Inside code blocks, this is removed during renderMarkdown by the remark-escape plugin.
-				if (isMDX) {
+				if (isAstroFlavoredMd) {
 					markdownContent = markdownContent.replace(
 						/<\s*!--([^-->]*)(.*?)-->/gs,
 						(whole) => `{/*${whole.replace(/\*\//g, '*\u200b/')}*/}`
@@ -159,6 +159,7 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
 				let renderResult = await renderMarkdown(markdownContent, {
 					...renderOpts,
 					fileURL: fileUrl,
+					isAstroFlavoredMd,
 				} as any);
 				let { code: astroResult, metadata } = renderResult;
 				const { layout = '', components = '', setup = '', ...content } = frontmatter;
@@ -168,29 +169,29 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
 				const prelude = `---
 import Slugger from 'github-slugger';
 ${layout ? `import Layout from '${layout}';` : ''}
-${isMDX && components ? `import * from '${components}';` : ''}
+${isAstroFlavoredMd && components ? `import * from '${components}';` : ''}
 ${hasInjectedScript ? `import '${PAGE_SSR_SCRIPT_ID}';` : ''}
-${isMDX ? setup : ''}
+${isAstroFlavoredMd ? setup : ''}
 
 const slugger = new Slugger();
 function $$slug(value) {
 	return slugger.slug(value);
 }
 
 const $$content = ${JSON.stringify(
-					isMDX
+					isAstroFlavoredMd
 						? content
 						: // Avoid stripping "setup" and "components"
 						  // in plain MD mode
 						  { ...content, setup, components }
 				)}
 ---`;
 				const imports = `${layout ? `import Layout from '${layout}';` : ''}
-${isMDX ? setup : ''}`.trim();
+${isAstroFlavoredMd ? setup : ''}`.trim();
 
 				// Wrap with set:html fragment to skip
 				// JSX expressions and components in "plain" md mode
-				if (!isMDX) {
+				if (!isAstroFlavoredMd) {
 					astroResult = `<Fragment set:html={${JSON.stringify(astroResult)}} />`;
 				}
 

packages/astro/test/astro-markdown-md-mode.test.js

@@ -38,7 +38,6 @@ describe('Astro Markdown - plain MD mode', () => {
 				root: './fixtures/astro-markdown-md-mode/',
 				markdown: {
 					syntaxHighlight: 'prism',
-					mode: 'md',
 				},
 			});
 			await fixture.build();