mirror of
https://github.com/coder/code-server.git
synced 2025-09-19 12:28:49 +08:00
chore: update Code to 1.72.2 (#5650)
* chore: update Code to 1.72.2 * chore: refresh integration patch * chore: refresh base-path * chore: refresh proposed-api patch * chore: refresh marketplace patch * chore: refresh webview patch * chore: refresh disable-builtin patch * chore: refresh logout, update-check patches * chor: refresh proxy-uri patch * fix: delete unique-db patch This was supposed to be removed in https://github.com/coder/code-server/pull/5519 Looks like I didn't update the series or actually delete the patch. * fix: drop log-level patch This was merged upstream! * chore: refresh local-storage patch * chore: refresh service-worker patch * chore: refresh sourcemaps patch * chore: refresh disable-downloads patch * chore: refresh telemetry patch * chore: refresh language patch * chore: refresh cli-window-open patch * Revert "fix: delete unique-db patch" This reverts commit ca0506c5f6b49da5644697bb2f5b29d135a8d201. * fixup!: rm extra spaces integration patch * fixup: space * fixup! update unique-db patch * fixup!: update hash in webview patch * fixup! update marketplace patch * fixup!: remove comma
This commit is contained in:
@ -104,7 +104,7 @@ Index: code-server/lib/vscode/src/vs/platform/remote/browser/browserSocketFactor
|
||||
connect(host: string, port: number, path: string, query: string, debugLabel: string, callback: IConnectCallback): void {
|
||||
const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
|
||||
+ path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
|
||||
const socket = this._webSocketFactory.create(`${webSocketSchema}://${/:/.test(host) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
|
||||
const socket = this._webSocketFactory.create(`${webSocketSchema}://${(/:/.test(host) && !/\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}&skipWebSocketFrames=false`, debugLabel);
|
||||
const errorListener = socket.onError((err) => callback(err, undefined));
|
||||
socket.onOpen(() => {
|
||||
@@ -282,6 +283,3 @@ export class BrowserSocketFactory implem
|
||||
@ -262,7 +262,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
||||
===================================================================
|
||||
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
||||
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
||||
@@ -485,6 +485,7 @@ function doCreateUri(path: string, query
|
||||
@@ -489,6 +489,7 @@ function doCreateUri(path: string, query
|
||||
});
|
||||
}
|
||||
|
||||
@ -270,7 +270,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
|
||||
return URI.parse(window.location.href).with({ path, query });
|
||||
}
|
||||
|
||||
@@ -496,7 +497,7 @@ function doCreateUri(path: string, query
|
||||
@@ -500,7 +501,7 @@ function doCreateUri(path: string, query
|
||||
if (!configElement || !configElementAttribute) {
|
||||
throw new Error('Missing web configuration element');
|
||||
}
|
||||
|
Reference in New Issue
Block a user