Skip to content
Merged
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
32 changes: 18 additions & 14 deletions vscode-patches/0052-feat-support-configuring-worker-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Date: Tue, 11 Feb 2025 16:33:43 +0100
Subject: [PATCH] feat: support configuring worker options

---
build/monaco/monaco.d.ts.recipe | 8 ++++++--
src/vs/base/browser/browser.ts | 6 ++++--
.../browser/services/standaloneWebWorkerService.ts | 6 ++++++
src/vs/monaco.d.ts | 8 ++++++--
.../platform/webWorker/browser/webWorkerService.ts | 2 ++
.../webWorker/browser/webWorkerServiceImpl.ts | 13 +++++++++----
.../services/extensions/browser/extensionService.ts | 7 ++++++-
.../extensions/browser/webWorkerExtensionHost.ts | 1 +
.../electron-browser/nativeExtensionService.ts | 7 ++++++-
.../worker/webWorkerExtensionHostIframe.html | 10 +++++-----
10 files changed, 51 insertions(+), 17 deletions(-)
build/monaco/monaco.d.ts.recipe | 8 ++++++--
src/vs/base/browser/browser.ts | 6 ++++--
.../services/standaloneWebWorkerService.ts | 6 ++++++
src/vs/monaco.d.ts | 8 ++++++--
.../webWorker/browser/webWorkerService.ts | 2 ++
.../webWorker/browser/webWorkerServiceImpl.ts | 15 ++++++++++-----
.../extensions/browser/extensionService.ts | 7 ++++++-
.../extensions/browser/webWorkerExtensionHost.ts | 1 +
.../electron-browser/nativeExtensionService.ts | 7 ++++++-
.../worker/webWorkerExtensionHostIframe.html | 10 +++++-----
10 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
index b1f676796af..7b40b6ed32f 100644
Expand Down Expand Up @@ -107,7 +107,7 @@ index fd5150435af..e8d736fa762 100644
+ getWorkerOptions(descriptor: WebWorkerDescriptor): WorkerOptions | undefined;
}
diff --git a/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts
index b60b03f8606..4316a40d6d5 100644
index b60b03f8606..1eb4f9f3492 100644
--- a/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts
+++ b/src/vs/platform/webWorker/browser/webWorkerServiceImpl.ts
@@ -32,10 +32,11 @@ export class WebWorkerService implements IWebWorkerService {
Expand Down Expand Up @@ -135,8 +135,12 @@ index b60b03f8606..4316a40d6d5 100644
}

const ttPolicy = ((): ReturnType<typeof createTrustedTypesPolicy> => {
@@ -80,7 +85,7 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work
return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: 'module' });
@@ -77,10 +82,10 @@ export function createBlobWorker(blobUrl: string, options?: WorkerOptions): Work
if (!blobUrl.startsWith('blob:')) {
throw new URIError('Not a blob-url: ' + blobUrl);
}
- return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { ...options, type: 'module' });
+ return new Worker(ttPolicy ? ttPolicy.createScriptURL(blobUrl) as unknown as string : blobUrl, { type: 'module', ...options });
}

-function getWorkerBootstrapUrl(label: string, workerScriptUrl: string, workerLoadingFailedErrorMessage: string | undefined): string {
Expand Down
Loading