Markdown bug bash! (withastro#1789)

SiriousHunter · Nov 10, 2021 · bb11c63 · bb11c63
1 parent 036588e
commit bb11c63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/runtime/server/index.ts b/src/runtime/server/index.ts
@@ -208,6 +208,8 @@ export function createAstro(fileURLStr: string, site: string): TopLevelAstro {
   };
 }
 
+const toAttributeString = (value: any) => String(value).replace(/&/g, '&#38;').replace(/"/g, '&#34;')
+
 // A helper used to turn expressions into attribute key/value
 export function addAttribute(value: any, key: string) {
   if (value == null || value === false) {
@@ -216,10 +218,10 @@ export function addAttribute(value: any, key: string) {
 
   // support "class" from an expression passed into an element (#782)
   if (key === 'class:list') {
-    return ` ${key.slice(0, -5)}="${serializeListValue(value)}"`;
+    return ` ${key.slice(0, -5)}="${toAttributeString(serializeListValue(value))}"`;
   }
 
-  return ` ${key}="${value}"`;
+  return ` ${key}="${toAttributeString(value)}"`;
 }
 
 // Adds support for `<Component {...value} />

diff --git a/src/vite-plugin-markdown/index.ts b/src/vite-plugin-markdown/index.ts
@@ -40,10 +40,11 @@ export default function markdown({ config }: AstroPluginOptions): Plugin {
 ${layout ? `import Layout from '${layout}';` : ''}
 ${components ? `import * from '${components}';` : ''}
 ${setup}
+const $$content = ${JSON.stringify(content)}
 ---`;
         // If the user imported "Layout", wrap the content in a Layout
         if (/\bLayout\b/.test(prelude)) {
-          astroResult = `${prelude}\n<Layout content={${JSON.stringify(content)}}>\n\n${astroResult}\n\n</Layout>`;
+          astroResult = `${prelude}\n<Layout content={$$content}>\n\n${astroResult}\n\n</Layout>`;
         } else {
           astroResult = `${prelude}\n${astroResult}`;
         }