Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

puppeteer - look also for Microsoft Edge on MacOS in addition to Google Chrome #10172

Merged
merged 3 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions news/changelog-1.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
13 changes: 8 additions & 5 deletions src/core/puppeteer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -202,10 +202,13 @@ export async function withHeadlessBrowser<T>(
async function findChrome(): Promise<string | undefined> {
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"];
Expand Down
Loading