Add quarto install chrome-headless-shell command

.github/workflows/test-smokes.yml

@@ -212,8 +212,9 @@ jobs:
         id: cache-typst
         uses: ./.github/actions/cache-typst
 
-      - name: Install Chrome
-        uses: browser-actions/setup-chrome@latest
+      - name: Install Chrome Headless Shell
+        run: |
+          quarto install chrome-headless-shell --no-prompt
 
       - name: Setup Julia
         uses: julia-actions/setup-julia@v2

news/changelog-1.9.md

@@ -136,9 +136,10 @@ All changes included in 1.9:
 
 - (): New `quarto call build-ts-extension` command builds a TypeScript extension, such as an engine extension, and places the artifacts in the `_extensions` directory. See the [engine extension pre-release documentation](https://prerelease.quarto.org/docs/extensions/engine.html) for details.
 
-### `install verapdf`
+### `install`
 
 - ([#4426](https://github.com/quarto-dev/quarto-cli/issues/4426)): New `quarto install verapdf` command installs [veraPDF](https://verapdf.org/) for PDF/A and PDF/UA validation. When verapdf is available, PDFs created with the `pdf-standard` option are automatically validated for compliance. Also supports `quarto uninstall verapdf`, `quarto update verapdf`, and `quarto tools`.
+- ([#11877](https://github.com/quarto-dev/quarto-cli/issues/11877), [#10961](https://github.com/quarto-dev/quarto-cli/issues/10961), [#6821](https://github.com/quarto-dev/quarto-cli/issues/6821), [#13704](https://github.com/quarto-dev/quarto-cli/issues/13704)): New `quarto install chrome-headless-shell` command downloads [Chrome Headless Shell](https://developer.chrome.com/blog/chrome-headless-shell) from Google's Chrome for Testing API. This is the recommended headless browser for diagram rendering (Mermaid, Graphviz) to non-HTML formats. Smaller and lighter than full Chrome, with fewer system dependencies.
 
 ### `preview`
 

src/command/check/check.ts

@@ -22,7 +22,7 @@ import { pandocBinaryPath } from "../../core/resources.ts";
 import { lines } from "../../core/text.ts";
 import { satisfies } from "semver/mod.ts";
 import { dartCommand } from "../../core/dart-sass.ts";
-import { allTools } from "../../tools/tools.ts";
+import { allTools, installableTool } from "../../tools/tools.ts";
 import { texLiveContext, tlVersion } from "../render/latexmk/texlive.ts";
 import { which } from "../../core/path.ts";
 import { dirname } from "../../deno_ral/path.ts";
@@ -31,7 +31,7 @@ import { typstBinaryPath } from "../../core/typst.ts";
 import { quartoCacheDir } from "../../core/appdirs.ts";
 import { isWindows } from "../../deno_ral/platform.ts";
 import { makeStringEnumTypeEnforcer } from "../../typing/dynamic.ts";
-import { findChrome } from "../../core/puppeteer.ts";
+import { detectBrowser } from "../../core/puppeteer.ts";
 import { executionEngines } from "../../execute/engine.ts";
 
 export function getTargets(): readonly string[] {
@@ -436,35 +436,28 @@ async function checkInstall(conf: CheckConfiguration) {
     conf.jsonResult.chrome = chromeJson;
   }
   const chromeCb = async () => {
-    const chromeDetected = await findChrome();
-    const chromiumQuarto = tools.installed.find((tool) =>
-      tool.name === "chromium"
-    );
-    if (chromeDetected.path !== undefined) {
-      chromeHeadlessOutput.push(`${kIndent}Using: Chrome found on system`);
-      chromeHeadlessOutput.push(
-        `${kIndent}Path: ${chromeDetected.path}`,
-      );
-      if (chromeDetected.source) {
-        chromeHeadlessOutput.push(`${kIndent}Source: ${chromeDetected.source}`);
+    const check = await detectChromeForCheck();
+
+    if (check.warning) {
+      chromeHeadlessOutput.push(`${kIndent}NOTE: ${check.warning}`);
+      chromeJson["warning"] = check.warning;
+    }
+
+    if (check.detected) {
+      const { label, path, source, displaySource, version } = check.detected;
+      chromeHeadlessOutput.push(`${kIndent}Using: ${label}`);
+      if (path) {
+        chromeHeadlessOutput.push(`${kIndent}Path: ${path}`);
+        chromeJson["path"] = path;
       }
-      chromeJson["path"] = chromeDetected.path;
-      chromeJson["source"] = chromeDetected.source;
-    } else if (chromiumQuarto !== undefined) {
-      chromeJson["source"] = "quarto";
-      chromeHeadlessOutput.push(
-        `${kIndent}Using: Chromium installed by Quarto`,
-      );
-      if (chromiumQuarto?.binDir) {
-        chromeHeadlessOutput.push(
-          `${kIndent}Path: ${chromiumQuarto?.binDir}`,
-        );
-        chromeJson["path"] = chromiumQuarto?.binDir;
+      chromeJson["source"] = source;
+      if (displaySource) {
+        chromeHeadlessOutput.push(`${kIndent}Source: ${displaySource}`);
+      }
+      if (version) {
+        chromeHeadlessOutput.push(`${kIndent}Version: ${version}`);
+        chromeJson["version"] = version;
       }
-      chromeHeadlessOutput.push(
-        `${kIndent}Version: ${chromiumQuarto.installedVersion}`,
-      );
-      chromeJson["version"] = chromiumQuarto.installedVersion;
     } else {
       chromeHeadlessOutput.push(`${kIndent}Chrome:  (not detected)`);
       chromeJson["installed"] = false;
@@ -524,3 +517,47 @@ title: "Title"
     }, markdownRenderCb);
   }
 }
+
+interface ChromeDetectionResult {
+  label: string;
+  path?: string;
+  source: string;
+  version?: string;
+  displaySource?: string;
+}
+
+interface ChromeCheckInfo {
+  warning?: string;
+  detected?: ChromeDetectionResult;
+}
+
+async function detectChromeForCheck(): Promise<ChromeCheckInfo> {
+  const detection = await detectBrowser();
+
+  if (detection.detected) {
+    return { detected: detection.detected };
+  }
+
+  const result: ChromeCheckInfo = {};
+  if (detection.warning) {
+    result.warning = detection.warning;
+  }
+
+  // Legacy: chromium installed by Quarto
+  const chromiumTool = installableTool("chromium");
+  if (chromiumTool && await chromiumTool.installed()) {
+    let path: string | undefined;
+    if (chromiumTool.binDir) {
+      path = await chromiumTool.binDir();
+    }
+    const version = await chromiumTool.installedVersion();
+    result.detected = {
+      label: "Chromium installed by Quarto",
+      path,
+      source: "quarto",
+      version,
+    };
+  }
+
+  return result;
+}

src/command/install/cmd.ts

@@ -14,7 +14,7 @@ import {
   selectTool,
   updateOrInstallTool,
 } from "../../tools/tools-console.ts";
-import { installTool } from "../../tools/tools.ts";
+import { installableToolNames, installTool } from "../../tools/tools.ts";
 import { resolveCompatibleArgs } from "../remove/cmd.ts";
 
 export const installCommand = new Command()
@@ -36,14 +36,18 @@ export const installCommand = new Command()
     "Update system path when a tool is installed",
   )
   .description(
-    "Installs a global dependency (TinyTex or Chromium).",
+    `Installs a global dependency (${installableToolNames().join(", ")}).`,
   )
   .example(
     "Install TinyTeX",
     "quarto install tinytex",
   )
   .example(
-    "Install Chromium",
+    "Install Chrome Headless Shell",
+    "quarto install chrome-headless-shell",
+  )
+  .example(
+    "Install Chromium (legacy)",
     "quarto install chromium",
   )
   .example(

src/command/remove/cmd.ts

@@ -21,6 +21,7 @@ import {
   removeTool,
   selectTool,
 } from "../../tools/tools-console.ts";
+import { installableTools } from "../../tools/tools.ts";
 import { notebookContext } from "../../render/notebook/notebook-context.ts";
 import { signalCommandFailure } from "../utils.ts";
 
@@ -172,7 +173,7 @@ export const resolveCompatibleArgs = (
       return {
         action: "extension",
       };
-    } else if (extname === "tinytex" || extname === "chromium") {
+    } else if (installableTools().includes(extname.toLowerCase())) {
       return {
         action: "tool",
         name: args[0],

src/command/uninstall/cmd.ts

@@ -13,6 +13,7 @@ import {
   removeTool,
   selectTool,
 } from "../../tools/tools-console.ts";
+import { installableToolNames } from "../../tools/tools.ts";
 
 export const uninstallCommand = new Command()
   .name("uninstall")
@@ -26,11 +27,19 @@ export const uninstallCommand = new Command()
     "Update system path when a tool is installed",
   )
   .description(
-    "Removes an extension.",
+    `Uninstalls a global dependency (${installableToolNames().join(", ")}).`,
   )
   .example(
-    "Remove extension using name",
-    "quarto remove <extension-name>",
+    "Uninstall TinyTeX",
+    "quarto uninstall tinytex",
+  )
+  .example(
+    "Uninstall Chrome Headless Shell",
+    "quarto uninstall chrome-headless-shell",
+  )
+  .example(
+    "Uninstall Chromium (legacy)",
+    "quarto uninstall chromium",
   )
   .action(
     async (

src/command/update/cmd.ts

@@ -14,6 +14,7 @@ import {
   selectTool,
   updateOrInstallTool,
 } from "../../tools/tools-console.ts";
+import { installableToolNames } from "../../tools/tools.ts";
 import { resolveCompatibleArgs } from "../remove/cmd.ts";
 
 export const updateCommand = new Command()
@@ -28,7 +29,7 @@ export const updateCommand = new Command()
     "Embed this extension within another extension (used when authoring extensions).",
   )
   .description(
-    "Updates an extension or global dependency.",
+    `Updates an extension or global dependency (${installableToolNames().join(", ")}).`,
   )
   .example(
     "Update extension (Github)",
@@ -47,7 +48,11 @@ export const updateCommand = new Command()
     "quarto update tool tinytex",
   )
   .example(
-    "Update Chromium",
+    "Update Chrome Headless Shell",
+    "quarto update tool chrome-headless-shell",
+  )
+  .example(
+    "Update Chromium (legacy)",
     "quarto update tool chromium",
   )
   .example(