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

✋ 🆙 [email protected] #240995

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
126 changes: 105 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"native-keymap": "^3.3.5",
"native-watchdog": "^1.4.1",
"node-pty": "^1.1.0-beta22",
"open": "^8.4.2",
"open": "^10.1.0",
"tas-client-umd": "0.2.0",
"v8-inspect-profiler": "^0.1.1",
"vscode-oniguruma": "1.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ flakySuite('Native Modules (all platforms)', () => {
assert.ok(typeof nodePty.spawn === 'function', testErrorMessage('node-pty'));
});

test('open', async () => {
const { default: open } = await import('open');
assert.ok(typeof open === 'function', testErrorMessage('open'));
});

test('@vscode/spdlog', async () => {
const spdlog = await import('@vscode/spdlog');
assert.ok(typeof spdlog.createRotatingLogger === 'function', testErrorMessage('@vscode/spdlog'));
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/native/electron-main/nativeHostMainService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,13 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
}

try {
const { default: open } = await import('open');
const { default: open, apps } = await import('open');
const res = await open(url, {
app: {
// Use `open.apps` helper to allow cross-platform browser
// aliases to be looked up properly. Fallback to the
// configured value if not found.
name: Object.hasOwn(open.apps, configuredBrowser) ? open.apps[(configuredBrowser as keyof typeof open['apps'])] : configuredBrowser
name: Object.hasOwn(apps, configuredBrowser) ? apps[(configuredBrowser as keyof typeof apps)] : configuredBrowser
}
});

Expand Down
Loading