Update

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

@@ -589,7 +589,6 @@ export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
 		adapter: AstroAdapter | undefined;
 		renderers: AstroRenderer[];
 		scripts: { stage: InjectedScriptStage; content: string }[];
-		projectFlags: number;
 	};
 }
 

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,

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>;

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';
@@ -10,7 +9,6 @@ import { eachPageData } from './internal.js';
 import { addRollupInput } from './add-rollup-input.js';
 import { virtualModuleId as pagesVirtualModuleId } from './vite-plugin-pages.js';
 import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
-import { hasUserConfig } from '../project-flags.js';
 
 export const virtualModuleId = '@astrojs-ssr-virtual-entry';
 const resolvedVirtualModuleId = '\0' + virtualModuleId;
@@ -35,21 +33,11 @@ export function vitePluginSSR(
 		load(id) {
 			if (id === resolvedVirtualModuleId) {
 				return `import * as adapter from '${adapter.serverEntrypoint}';
-import _astroRemark from '@astrojs/markdown-remark';
 import * as _main from '${pagesVirtualModuleId}';
 import { deserializeManifest as _deserializeManifest } from 'astro/app';
-${hasUserConfig(buildOpts.astroConfig) ?
-	`import _astroConfig from '/astro.config';` :
-	`const _astroConfig = undefined;`
-}
-const _markdownRender = _astroConfig?.markdown?.render ? _astroConfig.markdown.render[0] : _astroRemark;
-let _manifest = _deserializeManifest('${manifestReplace}');
-Object.assign(_manifest, {
+const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 	pageMap: _main.pageMap,
-	renderers: _main.renderers,
-	markdown: {
-		render: [_markdownRender, _manifest.markdown.render[1]],
-	},
+	renderers: _main.renderers
 });
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : 'undefined'};
 
@@ -121,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,

packages/astro/src/core/config.ts

@@ -12,7 +12,6 @@ import loadTypeScript from '@proload/plugin-tsm';
 import postcssrc from 'postcss-load-config';
 import { arraify, isObject } from './util.js';
 import { appendForwardSlash, trimSlashes } from './path.js';
-import { flags as projectFlags } from './project-flags.js';
 
 load.use([loadTypeScript]);
 
@@ -177,7 +176,6 @@ export async function validateConfig(
 	userConfig: any,
 	root: string,
 	cmd: string,
-	hasUserConfig: boolean
 ): Promise<AstroConfig> {
 	const fileProtocolRoot = pathToFileURL(root + path.sep);
 	// Manual deprecation checks
@@ -279,11 +277,8 @@ export async function validateConfig(
 	// First-Pass Validation
 	const result = {
 		...(await AstroConfigRelativeSchema.parseAsync(userConfig)),
-		_ctx: { scripts: [], renderers: [], adapter: undefined, projectFlags: 0 },
+		_ctx: { scripts: [], renderers: [], adapter: undefined },
 	};
-	if(hasUserConfig) {
-		result._ctx.projectFlags |= projectFlags.USER_CONFIG;
-	}
 	// Final-Pass Validation (perform checks that require the full config object)
 	if (
 		!result.experimental?.integrations &&
@@ -391,7 +386,7 @@ export async function loadConfig(configOptions: LoadConfigOptions): Promise<Astr
 
 	// Automatically load config file using Proload
 	// If `userConfigPath` is `undefined`, Proload will search for `astro.config.[cm]?[jt]s`
-	let config, hasUserConfig = false;
+	let config;
 	try {
 		config = await load('astro', {
 			mustExist: !!userConfigPath,
@@ -405,10 +400,9 @@ export async function loadConfig(configOptions: LoadConfigOptions): Promise<Astr
 		throw err;
 	}
 	if (config) {
-		hasUserConfig = true;
 		userConfig = config.value;
 	}
-	return resolveConfig(userConfig, root, flags, configOptions.cmd, hasUserConfig);
+	return resolveConfig(userConfig, root, flags, configOptions.cmd);
 }
 
 /** Attempt to resolve an Astro configuration object. Normalize, validate, and return. */
@@ -417,10 +411,9 @@ export async function resolveConfig(
 	root: string,
 	flags: CLIFlags = {},
 	cmd: string,
-	hasUserConfig: boolean
 ): Promise<AstroConfig> {
 	const mergedConfig = mergeCLIFlags(userConfig, flags, cmd);
-	const validatedConfig = await validateConfig(mergedConfig, root, cmd, hasUserConfig);
+	const validatedConfig = await validateConfig(mergedConfig, root, cmd);
 
 	return validatedConfig;
 }

packages/astro/test/ssr-markdown.test.js

@@ -35,9 +35,9 @@ describe('Markdown pages in SSR', () => {
 		expect($('#subheading').text()).to.equal('Subheading');
 	});
 
-	it.only('Renders the Markdown component correctly', async () => {
+	it('Renders the Markdown component correctly', async () => {
 		const html = await fetchHTML('/page');
-		console.log(html);
 		const $ = cheerioLoad(html);
+		expect($('#something')).to.have.lengthOf(1);
 	});
 });