From 91575e1b2a412fc0e7b3805521cf1f72868ec9a5 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 3 Nov 2022 14:15:39 -0700 Subject: [PATCH] chore: clean up base-path patch Only change here was they moved lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts so I had to update it. Code still looks the same though. --- patches/base-path.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/base-path.diff b/patches/base-path.diff index 1d29f7ccf..98b4c4104 100644 --- a/patches/base-path.diff +++ b/patches/base-path.diff @@ -119,7 +119,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts --- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts +++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts @@ -267,12 +267,11 @@ export class WebClientServer { - return res.end(); + return void res.end(); } - const getFirstHeader = (headerName: string) => { @@ -176,7 +176,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts `frame-src 'self' https://*.vscode-cdn.net data:;`, 'worker-src \'self\' data:;', @@ -417,3 +421,70 @@ export class WebClientServer { - return res.end(data); + return void res.end(data); } } + @@ -279,10 +279,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts // Create workbench create(document.body, { -Index: code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts +Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts =================================================================== ---- code-server.orig/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts -+++ code-server/lib/vscode/src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts +--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts ++++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts @@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/ import { IStorageService } from 'vs/platform/storage/common/storage'; import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';