withastro · matthewp · Apr 14, 2022 · Apr 8, 2022 · Apr 8, 2022 · Apr 14, 2022
diff --git a/.changeset/wild-llamas-argue.md b/.changeset/wild-llamas-argue.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes usage of the Markdown component in SSR
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
@@ -8,6 +8,7 @@ import type { SSRManifest as Manifest, RouteInfo } from './types';
 import type { LogOptions } from '../logger/core.js';
 
 import mime from 'mime';
+import astroRemark from '@astrojs/markdown-remark';
 import { consoleLogDestination } from '../logger/console.js';
 export { deserializeManifest } from './common.js';
 import { matchRoute } from '../routing/match.js';
@@ -19,7 +20,6 @@ import {
  createModuleScriptElementWithSrcSet,
 } from '../render/ssr-element.js';
 import { prependForwardSlash } from '../path.js';
-import { createRequest } from '../request.js';
 
 export class App {
  #manifest: Manifest;
@@ -82,7 +82,7 @@ export class App {
  legacyBuild: false,
  links,
  logging: this.#logging,
- markdownRender: manifest.markdown.render,
+ markdownRender: [astroRemark, this.#manifest.markdown ?? {}],
  mod,
  origin: url.origin,
  pathname: url.pathname,

diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
@@ -1,7 +1,7 @@
 import type {
+ AstroUserConfig,
  RouteData,
  SerializedRouteData,
- MarkdownRenderOptions,
  ComponentInstance,
  SSRLoadedRenderer,
 } from '../../@types/astro';
@@ -22,9 +22,7 @@ export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
 export interface SSRManifest {
  routes: RouteInfo[];
  site?: string;
- markdown: {
- render: MarkdownRenderOptions;
- };
+ markdown: AstroUserConfig['markdown'];
  pageMap: Map<ComponentPath, ComponentInstance>;
  renderers: SSRLoadedRenderer[];
  entryModules: Record<string, string>;

diff --git a/packages/astro/src/core/build/vite-plugin-ssr.ts b/packages/astro/src/core/build/vite-plugin-ssr.ts
@@ -1,4 +1,3 @@
-import astroRemark from '@astrojs/markdown-remark';
 import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from './internal.js';
 import type { AstroAdapter } from '../../@types/astro';
@@ -110,9 +109,7 @@ function buildManifest(opts: StaticBuildOptions, internals: BuildInternals): Ser
  const ssrManifest: SerializedSSRManifest = {
  routes,
  site: astroConfig.site,
- markdown: {
- render: [astroRemark, astroConfig.markdown],
- },
+ markdown: astroConfig.markdown,
  pageMap: null as any,
  renderers: [],
  entryModules,

diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts
@@ -175,7 +175,7 @@ export const AstroConfigSchema = z.object({
 export async function validateConfig(
  userConfig: any,
  root: string,
- cmd: string
+ cmd: string,
 ): Promise<AstroConfig> {
  const fileProtocolRoot = pathToFileURL(root + path.sep);
  // Manual deprecation checks
@@ -410,7 +410,7 @@ export async function resolveConfig(
  userConfig: AstroUserConfig,
  root: string,
  flags: CLIFlags = {},
- cmd: string
+ cmd: string,
 ): Promise<AstroConfig> {
  const mergedConfig = mergeCLIFlags(userConfig, flags, cmd);
  const validatedConfig = await validateConfig(mergedConfig, root, cmd);

diff --git a/packages/astro/test/fixtures/ssr-markdown/package.json b/packages/astro/test/fixtures/ssr-markdown/package.json
@@ -0,0 +1,8 @@
+{
+ "name": "@test/ssr-markdown",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "astro": "workspace:*"
+ }
+}
diff --git a/packages/astro/test/fixtures/ssr-markdown/src/layouts/Base.astro b/packages/astro/test/fixtures/ssr-markdown/src/layouts/Base.astro
@@ -0,0 +1,8 @@
+<html>
+<head>Testing</head>
+<body>
+ <article>
+ <slot />
+ </article>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/ssr-markdown/src/pages/page.astro b/packages/astro/test/fixtures/ssr-markdown/src/pages/page.astro
@@ -0,0 +1,14 @@
+---
+import { Markdown } from 'astro/components';
+---
+
+<html>
+<head><title>Testing</title></head>
+<body>
+ <Markdown>
+ # Something
+
+ else here
+ </Markdown>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/ssr-markdown/src/pages/post.md b/packages/astro/test/fixtures/ssr-markdown/src/pages/post.md
@@ -0,0 +1,9 @@
+---
+layout: ../layouts/Base.astro
+---
+
+# Hello world
+
+This is some test
+
+## Subheading
diff --git a/packages/astro/test/ssr-markdown.test.js b/packages/astro/test/ssr-markdown.test.js
@@ -0,0 +1,42 @@
+import { expect } from 'chai';
+import { load as cheerioLoad } from 'cheerio';
+import { loadFixture } from './test-utils.js';
+import testAdapter from './test-adapter.js';
+
+describe('Markdown pages in SSR', () => {
+ /** @type {import('./test-utils').Fixture} */
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ root: './fixtures/ssr-markdown/',
+ experimental: {
+ ssr: true,
+ },
+ adapter: testAdapter(),
+ });
+ await fixture.build();
+ });
+
+ async function fetchHTML(path) {
+ const app = await fixture.loadTestAdapterApp();
+ const request = new Request('http:https://example.com' + path);
+ debugger;
+ const response = await app.render(request);
+ const html = await response.text();
+ return html;
+ }
+
+
+ it('Renders markdown pages correctly', async () => {
+ const html = await fetchHTML('/post');
+ const $ = cheerioLoad(html);
+ expect($('#subheading').text()).to.equal('Subheading');
+ });
+
+ it('Renders the Markdown component correctly', async () => {
+ const html = await fetchHTML('/page');
+ const $ = cheerioLoad(html);
+ expect($('#something')).to.have.lengthOf(1);
+ });
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml