Change priority order for chromium to use

- Env var
- chrome-headless-shell
- system
- chromium

Author: cderv

src/command/check/check.ts

@@ -32,6 +32,7 @@ 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 { safeExistsSync } from "../../core/path.ts";
 import {
   chromeHeadlessShellExecutablePath,
   chromeHeadlessShellInstallDir,
@@ -441,22 +442,18 @@ async function checkInstall(conf: CheckConfiguration) {
     conf.jsonResult.chrome = chromeJson;
   }
   const chromeCb = async () => {
-    const chromeDetected = await findChrome();
+    const envPath = Deno.env.get("QUARTO_CHROMIUM");
     const chromeHsPath = chromeHeadlessShellExecutablePath();
+    const chromeDetected = await findChrome();
     const chromiumTool = installableTool("chromium");
     const chromiumQuarto = chromiumTool && await chromiumTool.installed()
       ? chromiumTool
       : undefined;
-    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}`);
-      }
-      chromeJson["path"] = chromeDetected.path;
-      chromeJson["source"] = chromeDetected.source;
+    if (envPath && safeExistsSync(envPath)) {
+      chromeHeadlessOutput.push(`${kIndent}Using: Chrome from QUARTO_CHROMIUM`);
+      chromeHeadlessOutput.push(`${kIndent}Path: ${envPath}`);
+      chromeJson["path"] = envPath;
+      chromeJson["source"] = "QUARTO_CHROMIUM";
     } else if (chromeHsPath !== undefined) {
       const version = readInstalledVersion(chromeHeadlessShellInstallDir());
       chromeJson["source"] = "quarto-chrome-headless-shell";
@@ -469,6 +466,16 @@ async function checkInstall(conf: CheckConfiguration) {
         chromeHeadlessOutput.push(`${kIndent}Version: ${version}`);
         chromeJson["version"] = version;
       }
+    } else 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}`);
+      }
+      chromeJson["path"] = chromeDetected.path;
+      chromeJson["source"] = chromeDetected.source;
     } else if (chromiumQuarto !== undefined) {
       chromeJson["source"] = "quarto";
       chromeHeadlessOutput.push(

src/core/puppeteer.ts

@@ -213,20 +213,8 @@ interface ChromeInfo {
 export async function findChrome(): Promise<ChromeInfo> {
   let path;
   let source;
-  // First check env var and use this path if specified
-  const envPath = Deno.env.get("QUARTO_CHROMIUM");
-  if (envPath) {
-    debug("[CHROMIUM] Using path specified in QUARTO_CHROMIUM");
-    if (safeExistsSync(envPath)) {
-      debug(`[CHROMIUM] Found at ${envPath}, and will be used.`);
-      return { path: envPath, source: "QUARTO_CHROMIUM" };
-    } else {
-      debug(
-        `[CHROMIUM] Not found at ${envPath}. Check your environment variable valye. Searching now for another binary.`,
-      );
-    }
-  }
-  // Otherwise, try to find the path based on OS.
+  // Find Chrome/Edge from OS-specific known locations.
+  // QUARTO_CHROMIUM env var is handled by callers before calling this function.
   if (isMac) {
     const programs = [
       "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
@@ -292,17 +280,31 @@ export async function getBrowserExecutablePath() {
 
   let executablePath: string | undefined = undefined;
 
-  // Priority 1: QUARTO_CHROMIUM env var + system Chrome/Edge
-  if (executablePath === undefined) {
-    executablePath = (await findChrome()).path;
+  // Priority 1: QUARTO_CHROMIUM env var
+  const envPath = Deno.env.get("QUARTO_CHROMIUM");
+  if (envPath && safeExistsSync(envPath)) {
+    debug(`[CHROMIUM] Using QUARTO_CHROMIUM: ${envPath}`);
+    executablePath = envPath;
   }
 
   // Priority 2: Quarto-installed chrome-headless-shell
   if (executablePath === undefined) {
     executablePath = chromeHeadlessShellExecutablePath();
+    if (executablePath) {
+      debug(`[CHROMIUM] Using chrome-headless-shell: ${executablePath}`);
+    }
+  }
+
+  // Priority 3: System Chrome/Edge
+  if (executablePath === undefined) {
+    const chromeInfo = await findChrome();
+    if (chromeInfo.path) {
+      debug(`[CHROMIUM] Using system Chrome from ${chromeInfo.source}: ${chromeInfo.path}`);
+      executablePath = chromeInfo.path;
+    }
   }
 
-  // Priority 3: Legacy puppeteer-managed Chromium revisions
+  // Priority 4: Legacy puppeteer-managed Chromium revisions
   if (executablePath === undefined && availableRevisions.length > 0) {
     // get the latest available revision
     availableRevisions.sort((a: string, b: string) => Number(b) - Number(a));