From 7e089659d2660263fb030421a3249c799a571563 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 28 Jun 2024 14:34:42 +0200 Subject: [PATCH 1/2] puppeteer - look also for Microsoft Edge on MacOS in addition to Google Chrome --- src/core/puppeteer.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/puppeteer.ts b/src/core/puppeteer.ts index a25ece360b..de201fe938 100644 --- a/src/core/puppeteer.ts +++ b/src/core/puppeteer.ts @@ -5,7 +5,7 @@ */ import { readRegistryKey } from "./windows.ts"; -import { which } from "./path.ts"; +import { safeExistsSync, which } from "./path.ts"; import { error, info } from "../deno_ral/log.ts"; import { existsSync } from "fs/mod.ts"; import { UnreachableError } from "./lib/error.ts"; @@ -202,10 +202,13 @@ export async function withHeadlessBrowser( async function findChrome(): Promise { let path; if (Deno.build.os === "darwin") { - path = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"; - if (!existsSync(path)) { - return undefined; - } + const programs = [ + "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", + "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge", + ]; + return programs.find((p) => { + safeExistsSync(p); + }); } else if (Deno.build.os === "windows") { // Try the HKLM key const programs = ["chrome.exe", "msedge.exe"]; From 7066ab47843d1d425e5f11a8e2ab7e8ecb71fac9 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Mon, 1 Jul 2024 15:33:44 -0700 Subject: [PATCH 2/2] changelog --- news/changelog-1.6.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/news/changelog-1.6.md b/news/changelog-1.6.md index 8c9a78b7b1..501d808203 100644 --- a/news/changelog-1.6.md +++ b/news/changelog-1.6.md @@ -3,3 +3,7 @@ All changes included in 1.6: ## `quarto inspect` - ([#10188](https://github.com/quarto-dev/quarto-cli/issues/10188)): `quarto inspect` properly resolves includes across subdirectory boundaries. + +## Other Fixes and Improvements + +- ([#10162](https://github.com/quarto-dev/quarto-cli/issues/10162)): Use Edge on `macOS` as a Chromium browser when available.