Merge branch 'main' into task/warn-perms

Author: Al Manning

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -39,3 +39,4 @@ body:
         - label: "Please [format your issue](https://quarto.org/bug-reports.html#formatting-make-githubs-markdown-work-for-us) so it is easier for us to read the bug report."
         - label: Please document the RStudio IDE version you're running (if applicable), by providing the value displayed in the "About RStudio" main menu dialog?
         - label: Please document the operating system you're running. If on Linux, please provide the specific distribution.
+        - label: Please provide the output of `quarto check` so we know which version of quarto and its dependencies you're running.

news/changelog-1.3.md

@@ -150,6 +150,7 @@
 - Improve title recognition for pages that don't include a title in metadata ([#4528](https://github.com/quarto-dev/quarto-cli/issues/4528))
 - Ensure that footnote are properly indexed for website and book searches ([#4601](https://github.com/quarto-dev/quarto-cli/issues/4601)).
 - Permit sidebar items to include icons ([#3830](https://github.com/quarto-dev/quarto-cli/issues/3830)).
+- Use light navbar background by default for generated websites.
 
 ## Books
 
@@ -207,6 +208,7 @@
 - Fix issue with "No inspectable targets" with Chrome Browser ([#4653](https://github.com/quarto-dev/quarto-cli/issues/4653))
 - Add `title` attribute for callouts (can be used rather than heading for defining the title)
 - Handle more varieties of raw HTML for Docusaurus output
+- Read and process DOM one-file-at-time in books and websites to reduce total memory usage ([#4350](https://github.com/quarto-dev/quarto-cli/issues/4350)).
 
 ## Pandoc filter changes
 

src/command/render/codetools.ts

@@ -140,14 +140,24 @@ export function codeToolsPostprocessor(format: Format) {
         const codeTools = resolveCodeTools(format, doc);
         if (codeTools.source || codeTools.toggle) {
           const title = doc.querySelector("#title-block-header h1");
-          if (title) {
-            const header = (title as Element).parentElement;
+          const header = title !== null
+            ? (title as Element).parentElement
+            : doc.querySelector("main.content");
+
+          if (header) {
             const titleDiv = doc.createElement("div");
             titleDiv.classList.add("quarto-title-block");
             const layoutDiv = doc.createElement("div");
             titleDiv.appendChild(layoutDiv);
-            header?.replaceChild(titleDiv, title);
-            layoutDiv.appendChild(title);
+            if (title) {
+              header?.replaceChild(titleDiv, title);
+              layoutDiv.appendChild(title);
+            } else {
+              // create an empty title
+              const h1El = doc.createElement("h1");
+              layoutDiv.appendChild(h1El);
+              layoutDiv.classList.add("quarto-title-tools-only");
+            }
             const button = doc.createElement("button");
             button.setAttribute("type", "button");
             button.classList.add("btn");
@@ -159,7 +169,13 @@ export function codeToolsPostprocessor(format: Format) {
               button.appendChild(doc.createTextNode(" " + codeTools.caption));
             }
             layoutDiv.appendChild(button);
-            header!.appendChild(titleDiv);
+
+            if (title) {
+              header!.appendChild(titleDiv);
+            } else {
+              header!.prepend(titleDiv);
+            }
+
             if (codeTools.toggle) {
               button.setAttribute("id", kCodeToolsMenuButtonId);
               button.classList.add("dropdown-toggle");

src/command/render/pandoc.ts

@@ -703,16 +703,11 @@ export async function runPandoc(
   // timing results json file
   const timingResultsFile = options.services.temp.createFile();
 
-  if (allDefaults.to?.match(/[.]lua$/)) {
-    formatFilterParams["custom-writer"] = allDefaults.to;
-    allDefaults.to = resourcePath("filters/customwriter/customwriter.lua");
-  }
-  if (Deno.env.get("QUARTO_ALLENMANNING_WORKAROUND_CONFLUENCE") === undefined) {
-    if (allDefaults.writer?.match(/[.]lua$/)) {
-      formatFilterParams["custom-writer"] = allDefaults.writer;
-      allDefaults.writer = resourcePath(
-        "filters/customwriter/customwriter.lua",
-      );
+  const writerKeys: ("to" | "writer")[] = ["to", "writer"];
+  for (const key of writerKeys) {
+    if (allDefaults[key]?.match(/[.]lua$/)) {
+      formatFilterParams["custom-writer"] = allDefaults[key];
+      allDefaults[key] = resourcePath("filters/customwriter/customwriter.lua");
     }
   }
 

src/command/render/render-contexts.ts

@@ -656,8 +656,12 @@ const readExtensionFormat = async (
     // Read the yaml file and resolve / bucketize
     const extensionFormat = extension?.contributes.formats;
     if (extensionFormat) {
+      const fmtTarget = formatDesc.modifiers
+        ? `${formatDesc.baseFormat}${formatDesc.modifiers.join("")}`
+        : formatDesc.baseFormat;
       const extensionMetadata =
-        (extensionFormat[formatDesc.baseFormat] || {}) as Metadata;
+        (extensionFormat[fmtTarget] || extensionFormat[formatDesc.baseFormat] ||
+          {}) as Metadata;
       extensionMetadata[kExtensionName] = extensionMetadata[kExtensionName] ||
         formatDesc.extension;
 

src/config/constants.ts

@@ -513,6 +513,13 @@ export const kCrossrefChaptersAppendix = "chapters-appendix";
 export const kCrossrefChaptersAlpha = "chapters-alpha";
 export const kCrossrefChapterId = "chapter-id";
 
+export const kGrid = "grid";
+export const kContentMode = "content-mode";
+export const kAuto = "auto";
+export const kStandardContent = "standard";
+export const kFullContent = "full";
+export const kSlimContent = "slim";
+
 export const kFigResponsive = "fig-responsive";
 export const kOutputLocation = "output-location";
 

src/core/cri/cri.ts

@@ -76,6 +76,31 @@ export async function criClient(appPath?: string, port?: number) {
   }
   const app: string = appPath || await getBrowserExecutablePath();
 
+  const version = Deno.run({
+    cmd: [app, "--version"],
+    stdout: "piped",
+    stderr: "piped",
+  });
+  const [status, stdout, _stderr] = await Promise.all([
+    version.status(),
+    version.output(),
+    version.stderrOutput(),
+  ]);
+  if (!status.success) {
+    throw new Error(`Failed to get chrome version`);
+  }
+  const versionString = new TextDecoder().decode(stdout);
+  let versionNumber = 0;
+
+  const chromeMatch = versionString.match(/Google Chrome (\d+)/);
+  if (chromeMatch) {
+    versionNumber = Number(chromeMatch[1]);
+  }
+  const chromiumMatch = versionString.match(/Chromium (\d+)/);
+  if (chromiumMatch) {
+    versionNumber = Number(chromiumMatch[1]);
+  }
+
   const cmd = [
     app,
     "--headless",
@@ -113,7 +138,7 @@ export async function criClient(appPath?: string, port?: number) {
       const maxTries = 5;
       for (let i = 0; i < maxTries; ++i) {
         try {
-          client = await cdp({ port });
+          client = await cdp({ port, version: versionNumber });
           break;
         } catch (e) {
           if (i === maxTries - 1) {

src/core/cri/deno-cri/devtools.js

@@ -50,6 +50,14 @@ export async function New(options) {
   if (Object.prototype.hasOwnProperty.call(options, "url")) {
     options.path += `?${options.url}`;
   }
+  // we don't mutate here because we don't want other
+  // calls to have PUT as the method
+  if (options.version >= 109) {
+    options = {
+      ...options,
+      method: "PUT",
+    };
+  }
   const result = await devToolsInterface(options);
   return JSON.parse(result);
 }

src/core/cri/deno-cri/external-request.js

@@ -18,7 +18,11 @@ export default async function externalRequest(options) {
     }*/
 
   const url = `${options.protocol}:/${options.host}:${options.port}${options.path}`;
-  const response = await fetch(url);
+  const fetchOpts = {};
+  if (options.method) {
+    fetchOpts.method = options.method;
+  }
+  const response = await fetch(url, options);
   const text = await response.text();
 
   if (response.status !== 200) {

src/core/deno-dom.ts

@@ -25,6 +25,20 @@ export async function parseHtml(src: string): Promise<HTMLDocument> {
   return result;
 }
 
+export async function writeDomToHtmlFile(
+  doc: HTMLDocument,
+  path: string,
+  doctype?: string,
+) {
+  if (doc.documentElement === null) {
+    throw new Error("Document has no root element");
+  }
+  const output = doctype
+    ? doctype + "\n" + doc.documentElement.outerHTML
+    : doc.documentElement.outerHTML;
+  await Deno.writeTextFile(path, output);
+}
+
 // We are combining a number of scripts from
 // https://github.com/b-fuze/deno-dom/blob/master/deno-dom-native.ts
 // into this. If deno-dom fails, it's likely that this needs to be brought up to date.