ensure replaceAll() is called with function parameter when string is not known to be free of $ (#12853)

Author: cscheid

package/src/common/update-html-dependencies.ts

@@ -820,63 +820,63 @@ async function updateBootstrapFromBslib(
       for (let line of varContents) {
         line = line.replaceAll(
           "var(--#{$prefix}font-sans-serif)",
-          "$font-family-sans-serif"
+          "$$font-family-sans-serif"
         );
         line = line.replaceAll(
           "var(--#{$prefix}font-monospace)",
-          "$font-family-monospace"
+          "$$font-family-monospace"
         );
         line = line.replaceAll(
           "var(--#{$prefix}success-rgb)",
-          "$success"
+          "$$success"
         );
         line = line.replaceAll(
           "var(--#{$prefix}danger-rgb)",
-          "$danger"
+          "$$danger"
         );
         line = line.replaceAll(
           "var(--#{$prefix}body-color-rgb)",
-          "$body-color"
+          "$$body-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}body-bg-rgb)",
-          "$body-bg"
+          "$$body-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-color-rgb)",
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
         line = line.replaceAll(
           /RGBA?\(var\(--#\{\$prefix\}emphasis-color-rgb,(.*?)\).*?\)/gm,
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );        
         line = line.replaceAll(
           "var(--#{$prefix}secondary-color)",
-          "$body-secondary-color"
+          "$$body-secondary-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}secondary-bg)",
-          "$body-secondary-bg"
+          "$$body-secondary-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}tertiary-bg)",
-          "$body-tertiary-bg"
+          "$$body-tertiary-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}tertiary-color)",
           "$body-tertiary-color"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-bg)",
-          "$body-emphasis-bg"
+          "$$body-emphasis-bg"
         );
         line = line.replaceAll(
           "var(--#{$prefix}emphasis-color)",
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
         line = line.replaceAll(
           "$emphasis-color-rgb", 
-          "$body-emphasis-color"
+          "$$body-emphasis-color"
         );
 
         line = line.replaceAll(/var\(--#\{\$prefix\}(.*?)\)/gm, "$$$1");

src/core/handlers/mermaid.ts

@@ -258,7 +258,7 @@ mermaid.initialize(${JSON.stringify(mermaidOpts)});
         const oldId = svg.getAttribute("id") as string;
         svg.setAttribute("id", newMermaidId);
         const style = svg.querySelector("style")!;
-        style.innerHTML = style.innerHTML.replaceAll(oldId, newMermaidId);
+        style.innerHTML = style.innerHTML.replaceAll(oldId, () => newMermaidId);
 
         for (const defNode of svg.querySelectorAll("defs")) {
           const defEl = defNode as Element;
@@ -296,11 +296,11 @@ mermaid.initialize(${JSON.stringify(mermaidOpts)});
           // this string substitution is fraught, but I don't know how else to fix the problem.
           oldSvgSrc = oldSvgSrc.replaceAll(
             `"${idToPatch}"`,
-            `"${to}"`,
+            () => `"${to}"`,
           );
           oldSvgSrc = oldSvgSrc.replaceAll(
             `#${idToPatch}`,
-            `#${to}`,
+            () => `#${to}`,
           );
         }
         svg = mappedDiff(svg, oldSvgSrc);

src/core/jupyter/jupyter-embed.ts

@@ -339,7 +339,14 @@ export async function replaceNotebookPlaceholders(
       }
 
       // Replace the placeholders with the rendered markdown
-      markdown = markdown.replaceAll(match[0], nbMarkdown || "");
+      markdown = markdown.replaceAll(
+        match[0],
+        // https://github.com/quarto-dev/quarto-cli/issues/12853
+        // we use a function here to avoid
+        // escaping issues with $ in the markdown
+        // (e.g. $x$ in math mode)
+        () => nbMarkdown ?? "",
+      );
     }
     match = regex.exec(markdown);
   }

src/core/jupyter/jupyter.ts

@@ -1039,7 +1039,7 @@ export function mdFromContentCell(
           for (let i = 0; i < source.length; i++) {
             source[i] = source[i].replaceAll(
               `attachment:${file}`,
-              imageFile,
+              () => imageFile,
             );
           }
           // only process one supported mime type

src/execute/rmd.ts

@@ -135,7 +135,10 @@ export const knitrEngine: ExecutionEngine = {
       options.quiet,
       // fixup .rmarkdown file references
       (output) => {
-        output = output.replaceAll(`${inputStem}.rmarkdown`, inputBasename);
+        output = output.replaceAll(
+          `${inputStem}.rmarkdown`,
+          () => inputBasename,
+        );
 
         const m = output.match(/^Quitting from lines (\d+)-(\d+)/m);
         if (m) {

src/format/jats/format-jats-postprocess.ts

@@ -88,7 +88,7 @@ export const renderSubarticlePostProcessor = (
         // Replace the placeholder with the rendered subarticle
         outputContents = outputContents.replaceAll(
           placeholder,
-          subArtLines.join("\n"),
+          () => subArtLines.join("\n"),
         );
 
         // Move supporting and resource files into place