Skip to content

Commit 534a658

Browse files
committed
refactor: move plain md to content entry type
1 parent 24df79b commit 534a658

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

packages/astro/src/content/consts.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export const defaultContentEntryExts = ['.md'] as const;
21
export const PROPAGATED_ASSET_FLAG = 'astroPropagatedAssets';
32
export const CONTENT_FLAG = 'astroContent';
43
export const VIRTUAL_MODULE_ID = 'astro:content';

packages/astro/src/content/utils.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ErrorPayload as ViteErrorPayload, normalizePath, ViteDevServer } from '
77
import { z } from 'zod';
88
import { AstroConfig, AstroSettings } from '../@types/astro.js';
99
import { AstroError, AstroErrorData } from '../core/errors/index.js';
10-
import { CONTENT_TYPES_FILE, defaultContentEntryExts } from './consts.js';
10+
import { CONTENT_TYPES_FILE } from './consts.js';
1111

1212
export const collectionConfigParser = z.object({
1313
schema: z.any().optional(),
@@ -119,11 +119,7 @@ export async function getEntryData(
119119
}
120120

121121
export function getContentEntryExts(settings: Pick<AstroSettings, 'contentEntryTypes'>) {
122-
return [
123-
// TODO: roll defaults into settings
124-
...defaultContentEntryExts,
125-
...settings.contentEntryTypes.map((t) => t.extensions).flat(),
126-
];
122+
return settings.contentEntryTypes.map((t) => t.extensions).flat();
127123
}
128124

129125
export class NoCollectionError extends Error {}

packages/astro/src/core/config/settings.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { fileURLToPath, pathToFileURL } from 'url';
55
import jsxRenderer from '../../jsx/renderer.js';
66
import { createDefaultDevConfig } from './config.js';
77
import { loadTSConfig } from './tsconfig.js';
8+
import { markdownContentEntryType } from '../../vite-plugin-markdown/content-entry-type.js';
89

910
export function createBaseSettings(config: AstroConfig): AstroSettings {
1011
return {
@@ -15,8 +16,7 @@ export function createBaseSettings(config: AstroConfig): AstroSettings {
1516
adapter: undefined,
1617
injectedRoutes: [],
1718
pageExtensions: ['.astro', '.html', ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
18-
/** TODO: default Markdown entry type */
19-
contentEntryTypes: [],
19+
contentEntryTypes: [markdownContentEntryType],
2020
renderers: [jsxRenderer],
2121
scripts: [],
2222
watchFiles: [],

0 commit comments

Comments
 (0)