Merge pull request #1342 from quarto-dev/bugfix/github-issue-1340

Fix disappearing supporting images bug (#1340)

Author: jjallaire

src/command/render/project.ts

@@ -294,6 +294,12 @@ export async function renderProject(
         renderedFile.supporting = renderedFile.supporting.filter((file) =>
           file !== libDir
         );
+        // ensure that we don't have overlapping paths in supporting
+        renderedFile.supporting = renderedFile.supporting.filter((file) => {
+          return !renderedFile.supporting!.some((dir) =>
+            file.startsWith(dir) && file !== dir
+          );
+        });
         if (keepFiles) {
           renderedFile.supporting.map((file) => copyDir(file));
         } else {

src/core/handlers/mermaid.ts

@@ -203,7 +203,6 @@ mermaid.initialize();
           const m = defEl.innerHTML.match(/id="([^\"]+)"/);
           if (m) {
             const id = m[1];
-            console.log("Will try to patch", id);
             idsToPatch.push(id);
           }
         }
@@ -328,7 +327,6 @@ mermaid.initialize();
 
       const attrs: Record<string, unknown> = {};
       if (isRevealjsOutput(handlerContext.options.context.format.pandoc)) {
-        console.log("Setting reveal to true");
         attrs.reveal = true;
       }
 

tests/docs/bug-repros/issue-1340/_quarto.yml

@@ -0,0 +1,16 @@
+project:
+  type: book
+
+book:
+  title: "btest"
+  author: "Jane Doe"
+  date: "7/7/2022"
+  chapters:
+    - index.qmd
+
+format:
+  html:
+    theme: cosmo
+
+
+

tests/docs/bug-repros/issue-1340/index.qmd

@@ -0,0 +1,11 @@
+# Descriptive Statistics, Distributions, and Graphics {#sec-descript}
+
+```{mermaid}
+flowchart TD
+mpy[Mean or Proportion<br>of Y vs. X] --> nps[Nonparametric<br>Smoother]
+```
+```{r}
+x <- seq(-3, 35, length=150)
+xl <- expression(x)
+plot(x, dt(x, 4, 6), type='l', xlab=xl, ylab='')
+```

tests/integration/mermaid/github-issue-1340.test.ts

@@ -0,0 +1,43 @@
+/*
+* github-issue-1340.test.ts
+*
+* Copyright (C) 2022 by RStudio, PBC
+*
+*/
+
+import { docs, fileLoader, outputForInput } from "../../utils.ts";
+import {
+  ensureHtmlElements,
+  ensureHtmlSelectorSatisfies,
+  verifyPath,
+} from "../../verify.ts";
+import { testRender } from "../../smoke/render/render.ts";
+import { ExecuteOutput } from "../../test.ts";
+import { join } from "path/mod.ts";
+
+const input = docs("bug-repros/issue-1340/");
+const output = join(input, "_book");
+// const output = outputForInput(join(input, "index.qmd"), "html"); <- doesn't work for book projects, right.
+testRender(input, "html", false, [{
+  name: "file exists",
+  verify: (_outputs: ExecuteOutput[]): Promise<void> => {
+    verifyPath(
+      join(
+        output,
+        "index_files",
+        "figure-html",
+        "unnamed-chunk-4-1.png",
+      ),
+    );
+    return Promise.resolve();
+  },
+}, {
+  name: "manual cleanup for book project",
+  verify: (_outputs: ExecuteOutput[]): Promise<void> => {
+    Deno.removeSync(output, { recursive: true });
+    Deno.removeSync(join(input, ".quarto"), { recursive: true });
+    Deno.removeSync(join(input, ".gitignore"));
+
+    return Promise.resolve();
+  },
+}]);