Skip to content

Commit 77af2a5

Browse files
committed
Fix worker require paths when behind proxy
1 parent ecac0dd commit 77af2a5

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ci/vscode.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -3030,7 +3030,7 @@ index bbb72e9511..0785d3391d 100644
30303030
-registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy(IExtensionStoragePaths) { whenReady = Promise.resolve(); });
30313031
+registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
30323032
diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
3033-
index 79455414c0..8931c1355a 100644
3033+
index 79455414c0..a407593b4d 100644
30343034
--- a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
30353035
+++ b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
30363036
@@ -14,7 +14,11 @@
@@ -3040,8 +3040,8 @@ index 79455414c0..8931c1355a 100644
30403040
- catchError: true
30413041
+ catchError: true,
30423042
+ paths: {
3043-
+ '@coder/node-browser': `{{BASE}}/static/{{COMMIT}}/lib/vscode/node_modules/@coder/node-browser/out/client/client.js`,
3044-
+ '@coder/requirefs': `{{BASE}}/static/{{COMMIT}}/lib/vscode/node_modules/@coder/requirefs/out/requirefs.js`,
3043+
+ '@coder/node-browser': `../node_modules/@coder/node-browser/out/client/client.js`,
3044+
+ '@coder/requirefs': `../node_modules/@coder/requirefs/out/requirefs.js`,
30453045
+ }
30463046
});
30473047

src/browser/pages/vscode.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
const url = new URL(window.location.origin + "/" + parts.join("/"))
5555
const el = document.getElementById("vscode-remote-commit")
5656
const commit = el ? el.getAttribute("data-settings") : ""
57-
const staticBase = url.href + "/static/" + commit + "/lib/vscode"
57+
const staticBase = url.href.replace(/\/+$/, "") + "/static/" + commit + "/lib/vscode"
5858
let nlsConfig
5959
try {
6060
nlsConfig = JSON.parse(document.getElementById("vscode-remote-nls-configuration").getAttribute("data-settings"))

src/node/app/static.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ export class StaticHttpProvider extends HttpProvider {
2323
const split = route.requestPath.split("/").slice(1)
2424

2525
switch (split[split.length - 1]) {
26-
case "manifest.json":
27-
case "extensionHostWorkerMain.js": {
26+
case "manifest.json": {
2827
const response = await this.getUtf8Resource(this.rootPath, ...split)
2928
return this.replaceTemplates(route, response)
3029
}

0 commit comments

Comments
 (0)