From 64869b57103a6e261fbbf331d0b699541bb86b8e Mon Sep 17 00:00:00 2001 From: FredKSchott Date: Sun, 3 Apr 2022 12:01:54 +0000 Subject: [PATCH 1/4] [ci] collect stats --- scripts/stats/stats.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/stats/stats.csv b/scripts/stats/stats.csv index dcf1654ca..55abf1334 100644 --- a/scripts/stats/stats.csv +++ b/scripts/stats/stats.csv @@ -1,4 +1,5 @@ Date,Commits (24hr),Issues (24hr),Issues:BUG (24hr),Issues:RFC (24hr),Issues:DOC (24hr),PRs (24hr),Open PRs,Open Issues,Bugs: Needs Triage,Bugs: Accepted,RFC: In Progress,RFC: Accepted,Date (ISO) +"Sunday, April 3, 2022",13,2,2,0,0,8,7,88,42,40,0,0,"2022-04-03T12:01:50.051Z" "Saturday, April 2, 2022",5,0,0,0,0,4,8,88,42,40,0,0,"2022-04-02T12:01:53.880Z" "Friday, April 1, 2022",13,0,0,0,0,7,7,90,43,41,0,0,"2022-04-01T12:04:00.672Z" "Thursday, March 31, 2022",6,4,4,0,0,6,10,93,46,41,0,0,"2022-03-31T12:02:11.044Z" From 75919537be17f3c11991d5bfc24a7d75b7c32e36 Mon Sep 17 00:00:00 2001 From: Tony Sullivan Date: Sun, 3 Apr 2022 17:05:30 +0000 Subject: [PATCH 2/4] Fixing the new config defaults (docs only) (#2973) * updating the default listed in config jsdocs * chore: adding changeset * outDir had the wrong default listed as well * chore: updating changeset description --- .changeset/plenty-suits-happen.md | 5 +++++ packages/astro/src/@types/astro.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/plenty-suits-happen.md diff --git a/.changeset/plenty-suits-happen.md b/.changeset/plenty-suits-happen.md new file mode 100644 index 000000000..11700a96b --- /dev/null +++ b/.changeset/plenty-suits-happen.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Updates the @docs default value listed for config.publicDir and config.outputDir diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 854e7e377..058771d8a 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -157,7 +157,7 @@ export interface AstroUserConfig { * @docs * @name publicDir * @type {string} - * @default `"./publicDir"` + * @default `"./public"` * @description * Set the directory for your static assets. Files in this directory are served at `/` during dev and copied to your build directory during build. These files are always served or copied as-is, without transform or bundling. * @@ -175,7 +175,7 @@ export interface AstroUserConfig { * @docs * @name outDir * @type {string} - * @default `"./outDir"` + * @default `"./out"` * @description Set the directory that `astro build` writes your final build to. * * The value can be either an absolute file system path or a path relative to the project root. From ad3c391696c5b9cc350a22831717682e73e25776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Seery?= Date: Sun, 3 Apr 2022 14:32:12 -0300 Subject: [PATCH 3/4] fix(markdown): escape when mode == 'md' (#2971) * Fix rehype escape * Changeset --- .changeset/silent-cows-shave.md | 5 +++++ packages/markdown/remark/src/index.ts | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 .changeset/silent-cows-shave.md diff --git a/.changeset/silent-cows-shave.md b/.changeset/silent-cows-shave.md new file mode 100644 index 000000000..93b4f2120 --- /dev/null +++ b/.changeset/silent-cows-shave.md @@ -0,0 +1,5 @@ +--- +'@astrojs/markdown-remark': patch +--- + +Escape expressions when mode == 'md' diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts index c15cf502d..dd9f95d58 100644 --- a/packages/markdown/remark/src/index.ts +++ b/packages/markdown/remark/src/index.ts @@ -50,8 +50,7 @@ export async function renderMarkdown(content: string, opts?: MarkdownRenderingOp let parser = unified() .use(markdown) - .use(isMDX ? [remarkJsx] : []) - .use(isMDX ? [remarkExpressions] : []) + .use(isMDX ? [remarkJsx, remarkExpressions] : []) .use([remarkUnwrap]); if (remarkPlugins.length === 0 && rehypePlugins.length === 0) { @@ -91,10 +90,8 @@ export async function renderMarkdown(content: string, opts?: MarkdownRenderingOp }); parser - .use(isMDX ? [rehypeJsx] : []) - .use(isMDX ? [rehypeExpressions] : []) - .use(isMDX ? [] : [rehypeRaw]) - .use(isMDX ? [rehypeEscape] : []) + .use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw]) + .use(rehypeEscape) .use(rehypeIslands); let result: string; From 824458790a45e9b476e8acf6c406c49d28740dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Seery?= Date: Sun, 3 Apr 2022 14:32:39 -0300 Subject: [PATCH 4/4] fix(cli): prevent CLI from hanging (#2974) * fix(cli): prevent hanging CLI * Changeset --- .changeset/soft-dolphins-join.md | 5 +++++ packages/astro/astro.js | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/soft-dolphins-join.md diff --git a/.changeset/soft-dolphins-join.md b/.changeset/soft-dolphins-join.md new file mode 100644 index 000000000..e03f6b388 --- /dev/null +++ b/.changeset/soft-dolphins-join.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Prevent CLI from hanging diff --git a/packages/astro/astro.js b/packages/astro/astro.js index 69ea565f7..d763b0302 100755 --- a/packages/astro/astro.js +++ b/packages/astro/astro.js @@ -96,4 +96,6 @@ Please upgrade Node.js to a supported version: "${engines}"\n`); process.exit(1); } -main(); +main() + .then(() => process.exit(0)) + .catch(() => process.exit(1));