Skip to content

Commit 3140312

Browse files
code-ashercode-asher
committed
Update VS Code to 1.92.1
1 parent 461d4cb commit 3140312

20 files changed

+97
-64
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
Code v1.92.1
26+
27+
### Changed
28+
29+
- Updated to Code 1.92.1.
30+
2531
## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10
2632

2733
Code v1.91.0

‎lib/vscode

Submodule vscode updated 969 files

‎patches/base-path.diff

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.html
8686
<link data-name="vs/workbench/workbench.web.main" rel="stylesheet" href="{{WORKBENCH_WEB_BASE_URL}}/out/vs/workbench/workbench.web.main.css">
8787

8888
</head>
89-
@@ -38,7 +38,7 @@
90-
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/loader.js"></script>
91-
<script src="{{WORKBENCH_WEB_BASE_URL}}/out/vs/webPackagePaths.js"></script>
89+
@@ -40,7 +40,7 @@
9290
<script>
91+
92+
// Packages
9393
- const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location.origin).toString();
9494
+ const baseUrl = new URL('{{WORKBENCH_WEB_BASE_URL}}', window.location).toString();
9595
Object.keys(self.webPackagePaths).map(function (key, index) {
@@ -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-
@@ -270,16 +270,15 @@ export class WebClientServer {
114+
@@ -269,16 +269,15 @@ export class WebClientServer {
115115
return void res.end();
116116
}
117117

@@ -133,7 +133,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
133133
);
134134
if (!remoteAuthority) {
135135
return serveError(req, res, 400, `Bad request.`);
136-
@@ -306,8 +305,12 @@ export class WebClientServer {
136+
@@ -305,8 +304,12 @@ export class WebClientServer {
137137
scopes: [['user:email'], ['repo']]
138138
} : undefined;
139139

@@ -146,29 +146,39 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
146146
embedderIdentifier: 'server-distro',
147147
extensionsGallery: this._webExtensionResourceUrlTemplate && this._productService.extensionsGallery ? {
148148
...this._productService.extensionsGallery,
149-
@@ -343,8 +346,10 @@ export class WebClientServer {
149+
@@ -335,7 +338,7 @@ export class WebClientServer {
150+
folderUri: resolveWorkspaceURI(this._environmentService.args['default-folder']),
151+
workspaceUri: resolveWorkspaceURI(this._environmentService.args['default-workspace']),
152+
productConfiguration,
153+
- callbackRoute: this._callbackRoute
154+
+ callbackRoute: vscodeBase + this._callbackRoute
155+
};
156+
157+
const cookies = cookie.parse(req.headers.cookie || '');
158+
@@ -352,9 +355,11 @@ export class WebClientServer {
150159
const values: { [key: string]: string } = {
151160
WORKBENCH_WEB_CONFIGURATION: asJSON(workbenchWebConfiguration),
152161
WORKBENCH_AUTH_SESSION: authSessionInfo ? asJSON(authSessionInfo) : '',
153162
- WORKBENCH_WEB_BASE_URL: this._staticRoute,
154-
- WORKBENCH_NLS_BASE_URL: nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : '',
155163
+ WORKBENCH_WEB_BASE_URL: vscodeBase + this._staticRoute,
156-
+ WORKBENCH_NLS_BASE_URL: vscodeBase + (nlsBaseUrl ? `${nlsBaseUrl}${!nlsBaseUrl.endsWith('/') ? '/' : ''}${this._productService.commit}/${this._productService.version}/` : ''),
164+
WORKBENCH_NLS_URL,
165+
- WORKBENCH_NLS_FALLBACK_URL: `${this._staticRoute}/out/nls.messages.js`
166+
+ WORKBENCH_NLS_FALLBACK_URL: `${vscodeBase}${this._staticRoute}/out/nls.messages.js`,
157167
+ BASE: base,
158168
+ VS_BASE: vscodeBase,
159169
};
160170

161171
if (useTestResolver) {
162-
@@ -371,7 +376,7 @@ export class WebClientServer {
172+
@@ -381,7 +386,7 @@ export class WebClientServer {
163173
'default-src \'self\';',
164174
'img-src \'self\' https: data: blob:;',
165175
'media-src \'self\';',
166-
- `script-src 'self' 'unsafe-eval' ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${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(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ''};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
176+
- `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : `http://${remoteAuthority}`};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
177+
+ `script-src 'self' 'unsafe-eval' ${WORKBENCH_NLS_BASE_URL ?? ''} ${this._getScriptCspHashes(data).join(' ')} '${webWorkerExtensionHostIframeScriptSHA}' ${useTestResolver ? '' : ``};`, // the sha is the same as in src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
168178
'child-src \'self\';',
169179
`frame-src 'self' https://*.vscode-cdn.net data:;`,
170180
'worker-src \'self\' data: blob:;',
171-
@@ -444,3 +449,70 @@ export class WebClientServer {
181+
@@ -454,3 +459,70 @@ export class WebClientServer {
172182
return void res.end(data);
173183
}
174184
}
@@ -298,15 +308,7 @@ Index: code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/ext
298308
===================================================================
299309
--- code-server.orig/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
300310
+++ code-server/lib/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.ts
301-
@@ -16,7 +16,6 @@ import { getServiceMachineId } from 'vs/
302-
import { IStorageService } from 'vs/platform/storage/common/storage';
303-
import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
304-
import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
305-
-import { RemoteAuthorities } from 'vs/base/common/network';
306-
import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
307-
308-
const WEB_EXTENSION_RESOURCE_END_POINT_SEGMENT = '/web-extension-resource/';
309-
@@ -99,7 +98,7 @@ export abstract class AbstractExtensionR
311+
@@ -98,7 +98,7 @@ export abstract class AbstractExtensionR
310312
: version,
311313
path: 'extension'
312314
}));

‎patches/clipboard.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
102102
===================================================================
103103
--- code-server.orig/lib/vscode/src/vs/server/node/server.cli.ts
104104
+++ code-server/lib/vscode/src/vs/server/node/server.cli.ts
105-
@@ -76,6 +76,7 @@ const isSupportedForPipe = (optionId: ke
105+
@@ -75,6 +75,7 @@ const isSupportedForPipe = (optionId: ke
106106
case 'verbose':
107107
case 'remote':
108108
case 'locate-shell-integration-path':
109109
+ case 'stdin-to-clipboard':
110110
return true;
111111
default:
112112
return false;
113-
@@ -293,6 +294,23 @@ export async function main(desc: Product
113+
@@ -292,6 +293,23 @@ export async function main(desc: Product
114114
}
115115
}
116116
} else {

‎patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
77
===================================================================
88
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
99
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
10-
@@ -287,6 +287,10 @@ export class Extension implements IExten
10+
@@ -299,6 +299,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/external-file-actions.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
112112
===================================================================
113113
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
114114
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
115-
@@ -334,6 +334,8 @@ export class WebClientServer {
115+
@@ -333,6 +333,8 @@ export class WebClientServer {
116116
serverBasePath: this._basePath,
117117
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',
118118
userDataPath: this._environmentService.userDataPath,
@@ -167,8 +167,8 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/files/browser/fileActions
167167
import { AutoSaveAfterShortDelayContext } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
168168
import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
169169
import { Schemas } from 'vs/base/common/network';
170-
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext } from 'vs/workbench/common/contextkeys';
171-
+import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, IsEnabledFileDownloads, IsEnabledFileUploads } from 'vs/workbench/common/contextkeys';
170+
-import { DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from 'vs/workbench/common/contextkeys';
171+
+import { IsEnabledFileDownloads, IsEnabledFileUploads, DirtyWorkingCopiesContext, EnterMultiRootWorkspaceSupportContext, HasWebFileSystemAccess, WorkbenchStateContext, WorkspaceFolderCountContext, SidebarFocusContext, ActiveEditorCanRevertContext, ActiveEditorContext, ResourceContextKey, ActiveEditorAvailableEditorIdsContext, MultipleEditorsSelectedInGroupContext, TwoEditorsSelectedInGroupContext, SelectedEditorsInGroupFileOrUntitledResourceContextKey } from 'vs/workbench/common/contextkeys';
172172
import { IsWebContext } from 'vs/platform/contextkey/common/contextkeys';
173173
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
174174
import { ThemeIcon } from 'vs/base/common/themables';

‎patches/getting-started.diff

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,18 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
181181
===================================================================
182182
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
183183
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
184-
@@ -19,6 +19,7 @@ export const serverOptions: OptionDescri
184+
@@ -18,6 +18,7 @@ export const serverOptions: OptionDescri
185+
'auth': { type: 'string' },
185186
'disable-file-downloads': { type: 'boolean' },
186187
'disable-file-uploads': { type: 'boolean' },
187-
'locale': { type: 'string' },
188188
+ 'disable-getting-started-override': { type: 'boolean' },
189189

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

192-
@@ -105,6 +106,7 @@ export interface ServerParsedArgs {
192+
@@ -103,6 +104,7 @@ export interface ServerParsedArgs {
193+
'auth'?: string;
193194
'disable-file-downloads'?: boolean;
194195
'disable-file-uploads'?: boolean;
195-
'locale'?: string
196196
+ 'disable-getting-started-override'?: boolean,
197197

198198
/* ----- server setup ----- */
@@ -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-
@@ -339,6 +339,7 @@ export class WebClientServer {
204+
@@ -337,6 +337,7 @@ export class WebClientServer {
205205
userDataPath: this._environmentService.userDataPath,
206206
isEnabledFileDownloads: !this._environmentService.args['disable-file-downloads'],
207207
isEnabledFileUploads: !this._environmentService.args['disable-file-uploads'],

‎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-
@@ -307,6 +307,7 @@ export class WebClientServer {
267+
@@ -306,6 +306,7 @@ export class WebClientServer {
268268
} : undefined;
269269

270270
const productConfiguration = {

‎patches/keepalive.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Index: code-server/lib/vscode/src/vs/platform/request/node/proxy.ts
1212
+ keepAlive: true,
1313
};
1414

15-
return requestURL.protocol === 'http:'
15+
if (requestURL.protocol === 'http:') {

‎patches/local-storage.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
1818
===================================================================
1919
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
2020
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
21-
@@ -329,6 +329,7 @@ export class WebClientServer {
21+
@@ -328,6 +328,7 @@ export class WebClientServer {
2222
remoteAuthority,
2323
serverBasePath: this._basePath,
2424
webviewEndpoint: vscodeBase + this._staticRoute + '/out/vs/workbench/contrib/webview/browser/pre',

0 commit comments

Comments
 (0)