Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-30 22:03:56 -05:00
Code Issues Activity

wip

Browse source
This commit is contained in:
Fred K. Schott 2021-07-02 08:59:14 -07:00
parent 2ab625bee8
commit 7bd836f030
6 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/blog/src/pages/posts/test.mdc Normal file
View file

@ -0,0 +1,11 @@
---
import Logo from '../../components/Logo.astro';
---
# Hello, World!
hi
<Logo />
hi

2
package.json
View file

@ -12,7 +12,7 @@
"build": "yarn build:core",
"build:all": "lerna run build",
"build:one": "lerna run build --scope",
"build:core": "lerna run build --scope astro --scope @astrojs/parser --scope @astrojs/markdown-support --scope create-astro",
"build:core": "lerna run build --scope astro --scope @astrojs/parser --scope @astrojs/markdown-support",
"build:vscode": "lerna run build --scope astro-languageserver --scope astro-vscode --scope @astrojs/parser",
"dev:vscode": "lerna run dev --scope astro-languageserver --scope astro-vscode --scope @astrojs/parser --parallel --stream",
"format": "prettier -w \"**/*.{js,jsx,ts,tsx,md,json}\"",

2
packages/astro/snowpack-plugin.cjs
View file

@ -31,7 +31,7 @@ module.exports = (snowpackConfig, options = {}) => {
'astring'
],
resolve: {
input: ['.astro', '.md'],
input: ['.astro', '.md', '.mdc'],
output: ['.js', '.css'],
},
async transform({contents, id, fileExt}) {

2
packages/astro/src/build/util.ts
View file

@ -23,7 +23,7 @@ export function getDistPath(specifier: string, { astroConfig, srcPath }: { astro
const projectLoc = fileLoc.pathname.replace(projectRoot.pathname, '');
const ext = path.extname(fileLoc.pathname);
const isPage = fileLoc.pathname.includes(pagesRoot.pathname) && (ext === '.astro' || ext === '.md');
const isPage = fileLoc.pathname.includes(pagesRoot.pathname) && (ext === '.astro' || ext === '.md' || ext === '.mdc');
// if this lives in src/pages, return that URL
if (isPage) {
const [, publicURL] = projectLoc.split(pagesRoot.pathname);

36
packages/astro/src/compiler/index.ts
View file

@ -3,7 +3,7 @@ import type { CompileResult, TransformResult } from '../@types/astro';
import type { CompileOptions } from '../@types/compiler.js';
import path from 'path';
import { MarkdownRenderingOptions, renderMarkdownWithFrontmatter } from '@astrojs/markdown-support';
import { MarkdownRenderingOptions, renderMarkdown, renderMarkdownWithFrontmatter } from '@astrojs/markdown-support';
import { parse } from '@astrojs/parser';
import { transform } from './transform/index.js';
@ -80,6 +80,33 @@ async function convertMdToJsx(
return await convertAstroToJsx(raw, convertOptions);
}
/**
* .md -> .astro source
*/
export async function convertMdcToAstroSource(contents: string, opts?: MarkdownRenderingOptions): Promise<string> {
const [,frontmatterScript, markdownContent] = contents.split('---');
return `---
import { Markdown } from 'astro/components';
${frontmatterScript}
---
<Markdown>
${markdownContent}
</Markdown>`;
}
/**
* .mdc -> .jsx
* Core function processing Markdown, but along the way also calls convertAstroToJsx().
*/
async function convertMdcToJsx(
contents: string,
{ compileOptions, filename, fileID }: { compileOptions: CompileOptions; filename: string; fileID: string }
): Promise<TransformResult> {
const raw = await convertMdcToAstroSource(contents, compileOptions.astroConfig.markdownOptions);
const convertOptions = { compileOptions, filename, fileID };
return await convertAstroToJsx(raw, convertOptions);
}
/** Given a file, process it either as .astro, .md */
async function transformFromSource(
contents: string,
@ -87,10 +114,13 @@ async function transformFromSource(
): Promise<TransformResult> {
const fileID = path.relative(projectRoot, filename);
switch (true) {
case filename.slice(-6) === '.astro':
case filename.endsWith('.astro'):
return await convertAstroToJsx(contents, { compileOptions, filename, fileID });
case filename.slice(-3) === '.md':
case filename.endsWith('.mdc'):
return await convertMdcToJsx(contents, { compileOptions, filename, fileID });
case filename.endsWith('.md'):
return await convertMdToJsx(contents, { compileOptions, filename, fileID });
default:

6
packages/astro/src/search.ts
View file

@ -48,7 +48,7 @@ export function searchForPage(url: URL, astroConfig: AstroConfig): SearchResult
// Try to find index.astro/md paths
if (reqPath.endsWith('/')) {
const candidates = [`${base}index.astro`, `${base}index.md`];
const candidates = [`${base}index.astro`, `${base}index.md`, `${base}index.mdc`];
const location = findAnyPage(candidates, astroConfig);
if (location) {
return {
@ -59,7 +59,7 @@ export function searchForPage(url: URL, astroConfig: AstroConfig): SearchResult
}
} else {
// Try to find the page by its name.
const candidates = [`${base}.astro`, `${base}.md`];
const candidates = [`${base}.astro`, `${base}.md`, `${base}.mdc`];
let location = findAnyPage(candidates, astroConfig);
if (location) {
return {
@ -71,7 +71,7 @@ export function searchForPage(url: URL, astroConfig: AstroConfig): SearchResult
}
// Try to find name/index.astro/md
const candidates = [`${base}/index.astro`, `${base}/index.md`];
const candidates = [`${base}/index.astro`, `${base}/index.md`, `${base}/index.mdc`];
const location = findAnyPage(candidates, astroConfig);
if (location) {
return {