Skip to content

Commit 788da5d

Browse files
benz0libenz0li
authored
Update Code to 1.80.1 (#6340)
* Update Code to 1.80.1 (#6340) * Give build workflow more time to run
1 parent 070a5a3 commit 788da5d

17 files changed

+63
-62
lines changed

‎.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
build:
204204
name: Build code-server
205205
runs-on: ubuntu-20.04
206-
timeout-minutes: 30
206+
timeout-minutes: 60
207207
env:
208208
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
209209
steps:

‎lib/vscode

Submodule vscode updated 941 files

‎patches/base-path.diff

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/base/common/network.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/base/common/network.ts
1212
+++ code-server/lib/vscode/src/vs/base/common/network.ts
13-
@@ -167,7 +167,9 @@ class RemoteAuthoritiesImpl {
13+
@@ -168,7 +168,9 @@ class RemoteAuthoritiesImpl {
1414
return URI.from({
1515
scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,
1616
authority: `${host}:${port}`,
@@ -111,7 +111,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
111111
===================================================================
112112
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
113113
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
114-
@@ -267,12 +267,11 @@ export class WebClientServer {
114+
@@ -268,16 +268,15 @@ export class WebClientServer {
115115
return void res.end();
116116
}
117117

@@ -120,16 +120,20 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
120120
- return Array.isArray(val) ? val[0] : val;
121121
- };
122122
-
123-
- const remoteAuthority = getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host;
123+
const useTestResolver = (!this._environmentService.isBuilt && this._environmentService.args['use-test-resolver']);
124124
+ // For now we are getting the remote authority from the client to avoid
125125
+ // needing specific configuration for reverse proxies to work. Set this to
126126
+ // something invalid to make sure we catch code that is using this value
127127
+ // from the backend when it should not.
128-
+ const remoteAuthority = 'remote';
128+
const remoteAuthority = (
129+
useTestResolver
130+
? 'test+test'
131+
- : (getFirstHeader('x-original-host') || getFirstHeader('x-forwarded-host') || req.headers.host)
132+
+ : 'remote'
133+
);
129134
if (!remoteAuthority) {
130135
return serveError(req, res, 400, `Bad request.`);
131-
}
132-
@@ -298,8 +297,12 @@ export class WebClientServer {
136+
@@ -304,8 +303,12 @@ export class WebClientServer {
133137
scopes: [['user:email'], ['repo']]
134138
} : undefined;
135139

@@ -142,7 +146,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
142146
embedderIdentifier: 'server-distro',
143147
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
144148
...this._productService.extensionsGallery,
145-
@@ -334,11 +337,12 @@ export class WebClientServer {
149+
@@ -340,8 +343,10 @@ export class WebClientServer {
146150
const values: { [key: string]: string } = {
147151
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
148152
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
@@ -154,20 +158,17 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
154158
+ VS_BASE: vscodeBase,
155159
};
156160

157-
-
158-
let data;
159-
try {
160-
const workbenchTemplate = (await fsp.readFile(filePath)).toString();
161-
@@ -352,7 +356,7 @@ export class WebClientServer {
161+
if (useTestResolver) {
162+
@@ -366,7 +371,7 @@ export class WebClientServer {
162163
'default-src \'self\';',
163164
'img-src \'self\' https: data: blob:;',
164165
'media-src \'self\';',
165-
- `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=' http://${remoteAuthority};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
166-
+ `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=';`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
166+
- `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
167+
+ `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} 'sha256-fh3TwPMflhsEIpR8g1OYTIMVWhXTLcjQ9kh2tIpmv54=' ${useTestResolver ? '' : ''};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
167168
'child-src \'self\';',
168169
`frame-src 'self' https://*.vscode-cdn.net data:;`,
169170
'worker-src \'self\' data: blob:;',
170-
@@ -425,3 +429,70 @@ export class WebClientServer {
171+
@@ -439,3 +444,70 @@ export class WebClientServer {
171172
return void res.end(data);
172173
}
173174
}

‎patches/cli-window-open.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTe
1717
===================================================================
1818
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
1919
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
20-
@@ -97,10 +97,14 @@ class RemoteTerminalBackend extends Base
20+
@@ -103,10 +103,14 @@ class RemoteTerminalBackend extends Base
2121
}
2222
const reqId = e.reqId;
2323
const commandId = e.commandId;

‎patches/disable-downloads.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
1212
===================================================================
1313
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
1414
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
15-
@@ -281,6 +281,11 @@ export interface IWorkbenchConstructionO
15+
@@ -288,6 +288,11 @@ export interface IWorkbenchConstructionO
1616
*/
1717
readonly userDataPath?: string
1818

@@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
6666

6767
/* ----- server setup ----- */
6868

69-
@@ -94,6 +95,7 @@ export interface ServerParsedArgs {
69+
@@ -95,6 +96,7 @@ export interface ServerParsedArgs {
7070
/* ----- code-server ----- */
7171
'disable-update-check'?: boolean;
7272
'auth'?: string
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
8080
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
81-
@@ -325,6 +325,7 @@ export class WebClientServer {
81+
@@ -331,6 +331,7 @@ export class WebClientServer {
8282
remoteAuthority,
8383
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
8484
userDataPath: this._environmentService.userDataPath,

‎patches/display-language.diff

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
2121
===================================================================
2222
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
2323
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
24-
@@ -234,6 +234,9 @@ export async function setupServerService
24+
@@ -230,6 +230,9 @@ export async function setupServerService
2525
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2626
socketServer.registerChannel('extensions', channel);
2727

2828
+ const languagePackChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(ILanguagePackService));
2929
+ socketServer.registerChannel('languagePacks', languagePackChannel);
3030
+
31-
const encryptionChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(IEncryptionMainService));
32-
socketServer.registerChannel('encryption', encryptionChannel);
31+
const credentialsChannel = ProxyChannel.fromService<RemoteAgentConnectionContext>(accessor.get(ICredentialsMainService));
32+
socketServer.registerChannel('credentials', credentialsChannel);
3333

3434
Index: code-server/lib/vscode/src/vs/base/common/platform.ts
3535
===================================================================
@@ -210,8 +210,8 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
210210
+import { getLocaleFromConfig, getNLSConfiguration } from 'vs/server/node/remoteLanguagePacks';
211211
import { CharCode } from 'vs/base/common/charCode';
212212
import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts';
213-
214-
@@ -337,6 +338,8 @@ export class WebClientServer {
213+
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
214+
@@ -343,6 +344,8 @@ export class WebClientServer {
215215
callbackRoute: this._callbackRoute
216216
};
217217

@@ -220,14 +220,14 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
220220
const nlsBaseUrl = this._productService.extensionsGallery?.nlsBaseUrl;
221221
const values: { [key: string]: string } = {
222222
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
223-
@@ -345,6 +348,7 @@ export class WebClientServer {
223+
@@ -351,6 +354,7 @@ export class WebClientServer {
224224
WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
225225
BASE: base,
226226
VS_BASE: vscodeBase,
227227
+ NLS_CONFIGURATION: asJSON(nlsConfiguration),
228228
};
229229

230-
let data;
230+
if (useTestResolver) {
231231
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
232232
===================================================================
233233
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
@@ -240,7 +240,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
240240

241241
/* ----- server setup ----- */
242242

243-
@@ -96,6 +97,7 @@ export interface ServerParsedArgs {
243+
@@ -97,6 +98,7 @@ export interface ServerParsedArgs {
244244
'disable-update-check'?: boolean;
245245
'auth'?: string
246246
'disable-file-downloads'?: boolean;
@@ -261,7 +261,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
261261
import 'vs/workbench/services/path/browser/pathService';
262262
import 'vs/workbench/services/themes/browser/browserHostColorSchemeService';
263263
import 'vs/workbench/services/encryption/browser/encryptionService';
264-
@@ -116,8 +116,9 @@ registerSingleton(ILanguagePackService,
264+
@@ -117,8 +117,9 @@ registerSingleton(ILanguagePackService,
265265
// Logs
266266
import 'vs/workbench/contrib/logs/browser/logs.contribution';
267267

@@ -339,7 +339,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
339339
===================================================================
340340
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
341341
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
342-
@@ -335,9 +335,6 @@ export abstract class AbstractInstallAct
342+
@@ -337,9 +337,6 @@ export class InstallAction extends Exten
343343
if (this.extension.isBuiltin) {
344344
return;
345345
}
@@ -349,7 +349,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
349349
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
350350
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
351351
this.updateLabel();
352-
@@ -715,7 +712,7 @@ export abstract class InstallInOtherServ
352+
@@ -607,7 +604,7 @@ export abstract class InstallInOtherServ
353353
}
354354

355355
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -358,7 +358,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
358358
}
359359

360360
// Prefers to run on UI
361-
@@ -1803,17 +1800,6 @@ export class SetLanguageAction extends E
361+
@@ -1695,17 +1692,6 @@ export class SetLanguageAction extends E
362362
update(): void {
363363
this.enabled = false;
364364
this.class = SetLanguageAction.DisabledClass;
@@ -376,15 +376,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
376376
}
377377

378378
override async run(): Promise<any> {
379-
@@ -1830,7 +1816,6 @@ export class ClearLanguageAction extends
379+
@@ -1722,7 +1708,6 @@ export class ClearLanguageAction extends
380380
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
381381

382382
constructor(
383383
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
384384
@ILocaleService private readonly localeService: ILocaleService,
385385
) {
386386
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
387-
@@ -1840,17 +1825,6 @@ export class ClearLanguageAction extends
387+
@@ -1732,17 +1717,6 @@ export class ClearLanguageAction extends
388388
update(): void {
389389
this.enabled = false;
390390
this.class = ClearLanguageAction.DisabledClass;

‎patches/getting-started.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { OpenFolderAction, OpenFileFolderAction, OpenFolderViaWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
2929
import { OpenRecentAction } from 'vs/workbench/browser/actions/windowActions';
3030
import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
31-
@@ -770,6 +770,72 @@ export class GettingStartedPage extends
31+
@@ -782,6 +782,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -819,6 +885,9 @@ export class GettingStartedPage extends
104+
@@ -831,6 +897,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -135,7 +135,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
135135
===================================================================
136136
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
137137
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
138-
@@ -286,6 +286,11 @@ export interface IWorkbenchConstructionO
138+
@@ -293,6 +293,11 @@ export interface IWorkbenchConstructionO
139139
*/
140140
readonly isEnabledFileDownloads?: boolean
141141

@@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
189189

190190
/* ----- server setup ----- */
191191

192-
@@ -98,6 +99,7 @@ export interface ServerParsedArgs {
192+
@@ -99,6 +100,7 @@ export interface ServerParsedArgs {
193193
'auth'?: string
194194
'disable-file-downloads'?: boolean;
195195
'locale'?: string
@@ -201,7 +201,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
201201
===================================================================
202202
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
203203
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
204-
@@ -328,6 +328,7 @@ export class WebClientServer {
204+
@@ -334,6 +334,7 @@ export class WebClientServer {
205205
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
206206
userDataPath: this._environmentService.userDataPath,
207207
isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],

‎patches/integration.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
264264
===================================================================
265265
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
266266
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
267-
@@ -299,6 +299,7 @@ export class WebClientServer {
267+
@@ -305,6 +305,7 @@ export class WebClientServer {
268268
} : undefined;
269269

270270
const productConfiguration = <Partial<IProductConfiguration>>{

‎patches/local-storage.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
23-
@@ -320,6 +320,7 @@ export class WebClientServer {
23+
@@ -326,6 +326,7 @@ export class WebClientServer {
2424
const workbenchWebConfiguration = {
2525
remoteAuthority,
2626
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.api.ts
3434
+++ code-server/lib/vscode/src/vs/workbench/browser/web.api.ts
35-
@@ -276,6 +276,11 @@ export interface IWorkbenchConstructionO
35+
@@ -283,6 +283,11 @@ export interface IWorkbenchConstructionO
3636
*/
3737
readonly configurationDefaults?: Record<string, any>;
3838

‎patches/logout.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2828

2929
/* ----- server setup ----- */
3030

31-
@@ -92,6 +93,7 @@ export const serverOptions: OptionDescri
31+
@@ -93,6 +94,7 @@ export const serverOptions: OptionDescri
3232
export interface ServerParsedArgs {
3333
/* ----- code-server ----- */
3434
'disable-update-check'?: boolean;
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -304,6 +304,7 @@ export class WebClientServer {
43+
@@ -310,6 +310,7 @@ export class WebClientServer {
4444
codeServerVersion: this._productService.codeServerVersion,
4545
rootEndpoint: base,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,

‎patches/marketplace.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4040
===================================================================
4141
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
4242
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
43-
@@ -111,7 +111,7 @@ export class WebClientServer {
43+
@@ -112,7 +112,7 @@ export class WebClientServer {
4444
const serverRootPath = getRemoteServerRootPath(_productService);
4545
this._staticRoute = `${serverRootPath}/static`;
4646
this._callbackRoute = `${serverRootPath}/callback`;
@@ -49,7 +49,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4949
}
5050

5151
/**
52-
@@ -304,14 +304,7 @@ export class WebClientServer {
52+
@@ -310,14 +310,7 @@ export class WebClientServer {
5353
codeServerVersion: this._productService.codeServerVersion,
5454
rootEndpoint: base,
5555
embedderIdentifier: 'server-distro',

0 commit comments

Comments
 (0)