Skip to content

Commit d796cc2

Browse files
jsjoeiojsjoeio
authored
chore(Code): upgrade to 1.65 (#5047)
* docs(CONTRIBUTING): update Code workflow * chore: update vscode to release/1.65 * chore(quilt): ignore patch backup files * chore: refresh/update patches for 1.65
1 parent 0fceb12 commit d796cc2

19 files changed

+40
-63
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ test/test-results
2222

2323
# Quilt's internal data.
2424
/.pc
25+
/patches/*.diff~

‎docs/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ re-apply the patches.
9696
### Version updates to Code
9797

9898
1. Update the `lib/vscode` submodule to the desired upstream version branch.
99-
2. From the code-server **project root**, run `yarn install`.
100-
3. Apply the patches (`quilt push -a`) or restore your stashed changes. At this
99+
2. Apply the patches (`quilt push -a`) or restore your stashed changes. At this
101100
stage you may need to resolve conflicts. For example use `quilt push -f`,
102101
manually apply the rejected portions, then `quilt refresh`.
102+
3. From the code-server **project root**, run `yarn install`.
103103
4. Test code-server locally to make sure everything works.
104104
5. Check the Node.js version that's used by Electron (which is shipped with VS
105105
Code. If necessary, update your version of Node.js to match.

‎lib/vscode‎

Submodule vscode updated 2032 files

‎patches/base-path.diff‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
185185
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
186186
productConfiguration: <Partial<IProductConfiguration>>{
187187
+ rootEndpoint: base,
188+
embedderIdentifier: 'server-distro',
188189
extensionsGallery: this._webExtensionResourceUrlTemplate ? {
189190
...this._productService.extensionsGallery,
190-
'resourceUrlTemplate': this._webExtensionResourceUrlTemplate.with({
191-
@@ -289,7 +295,9 @@ export class WebClientServer {
191+
@@ -290,7 +296,9 @@ export class WebClientServer {
192192
} : undefined
193193
}
194194
})))
@@ -199,7 +199,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
199199

200200
const cspDirectives = [
201201
'default-src \'self\';',
202-
@@ -368,3 +376,70 @@ export class WebClientServer {
202+
@@ -369,3 +377,70 @@ export class WebClientServer {
203203
return res.end(data);
204204
}
205205
}
@@ -286,19 +286,19 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
286286
===================================================================
287287
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
288288
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
289-
@@ -504,6 +504,7 @@ function doCreateUri(path: string, query
289+
@@ -482,6 +482,7 @@ function doCreateUri(path: string, query
290290
});
291291
}
292292

293293
+ path = (window.location.pathname + "/" + path).replace(/\/\/+/g, "/")
294294
return URI.parse(window.location.href).with({ path, query });
295295
}
296296

297-
@@ -515,7 +516,7 @@ function doCreateUri(path: string, query
297+
@@ -493,7 +494,7 @@ function doCreateUri(path: string, query
298298
if (!configElement || !configElementAttribute) {
299299
throw new Error('Missing web configuration element');
300300
}
301-
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
301+
- const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents; workspaceUri?: UriComponents } = JSON.parse(configElementAttribute);
302302
+ const config: IWorkbenchConstructionOptions & { folderUri?: UriComponents, workspaceUri?: UriComponents } = { ...JSON.parse(configElementAttribute), remoteAuthority: location.host }
303303

304304
// Create workbench

‎patches/display-language.diff‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
66
===================================================================
77
--- code-server.orig/lib/vscode/src/vs/server/node/serverServices.ts
88
+++ code-server/lib/vscode/src/vs/server/node/serverServices.ts
9-
@@ -198,6 +198,9 @@ export async function setupServerService
9+
@@ -188,6 +188,9 @@ export async function setupServerService
1010
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
1111
socketServer.registerChannel('extensions', channel);
1212

@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/base/common/platform.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/base/common/platform.ts
2222
+++ code-server/lib/vscode/src/vs/base/common/platform.ts
23-
@@ -83,6 +83,17 @@ if (typeof navigator === 'object' && !is
23+
@@ -84,6 +84,17 @@ if (typeof navigator === 'object' && !is
2424
_isWeb = true;
2525
_locale = navigator.language;
2626
_language = _locale;
@@ -185,7 +185,7 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
185185
const data = (await util.promisify(fs.readFile)(filePath)).toString()
186186
.replace('{{WORKBENCH_WEB_CONFIGURATION}}', escapeAttribute(JSON.stringify({
187187
remoteAuthority,
188-
@@ -301,7 +304,8 @@ export class WebClientServer {
188+
@@ -302,7 +305,8 @@ export class WebClientServer {
189189
})))
190190
.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '')
191191
.replace(/{{BASE}}/g, base)
@@ -252,7 +252,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
252252
===================================================================
253253
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.ts
254254
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.ts
255-
@@ -109,6 +109,10 @@ registerSingleton(ICustomEndpointTelemet
255+
@@ -111,6 +111,10 @@ registerSingleton(IDiagnosticsService, N
256256

257257
//#region --- workbench contributions
258258

‎patches/integration.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
174174
===================================================================
175175
--- code-server.orig/lib/vscode/src/vs/workbench/browser/web.main.ts
176176
+++ code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
177-
@@ -69,6 +69,7 @@ import { ICredentialsService } from 'vs/
178-
import { IndexedDB } from 'vs/base/browser/indexedDB';
177+
@@ -69,6 +69,7 @@ import { IndexedDB } from 'vs/base/brows
179178
import { BrowserCredentialsService } from 'vs/workbench/services/credentials/browser/credentialsService';
180179
import { IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
180+
import { WebFileSystemAccess } from 'vs/platform/files/browser/webFileSystemAccess';
181181
+import { CodeServerClient } from 'vs/workbench/browser/client';
182182

183183
export class BrowserMain extends Disposable {

‎patches/last-opened.diff‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,3 @@ respect it here then remove our own redirction code that handles this.
66

77
Our version might be better anyway since it puts the workspace in the URL.
88

9-
Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
10-
===================================================================
11-
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
12-
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
13-
@@ -410,19 +410,6 @@ class WorkspaceProvider implements IWork
14-
workspace = { folderUri: URI.revive(config.folderUri) };
15-
} else if (config.workspaceUri) {
16-
workspace = { workspaceUri: URI.revive(config.workspaceUri) };
17-
- } else {
18-
- workspace = (() => {
19-
- const lastWorkspaceRaw = window.localStorage.getItem(WorkspaceProvider.LAST_WORKSPACE_STORAGE_KEY);
20-
- if (lastWorkspaceRaw) {
21-
- try {
22-
- return parse(lastWorkspaceRaw); // use marshalling#parse() to revive potential URIs
23-
- } catch (error) {
24-
- // Ignore
25-
- }
26-
- }
27-
-
28-
- return undefined;
29-
- })();
30-
}
31-
}
32-

‎patches/local-storage.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/environment/browser/envi
4848
===================================================================
4949
--- code-server.orig/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
5050
+++ code-server/lib/vscode/src/vs/workbench/services/environment/browser/environmentService.ts
51-
@@ -126,7 +126,14 @@ export class BrowserWorkbenchEnvironment
51+
@@ -52,7 +52,14 @@ export class BrowserWorkbenchEnvironment
5252
get logFile(): URI { return joinPath(this.logsHome, 'window.log'); }
5353

5454
@memoize

‎patches/logout.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
4545
rootEndpoint: base,
4646
updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
4747
+ logoutEndpoint: this._environmentService.args['auth'] ? base + '/logout' : undefined,
48+
embedderIdentifier: 'server-distro',
4849
extensionsGallery: {
4950
...this._productService.extensionsGallery,
50-
'resourceUrlTemplate': this._webExtensionResourceUrlTemplate ? this._webExtensionResourceUrlTemplate.with({
5151
Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
5252
===================================================================
5353
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts

‎patches/marketplace.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
3232
===================================================================
3333
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
3434
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
35-
@@ -285,14 +285,14 @@ export class WebClientServer {
36-
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
35+
@@ -286,14 +286,14 @@ export class WebClientServer {
3736
productConfiguration: <Partial<IProductConfiguration>>{
3837
rootEndpoint: base,
38+
embedderIdentifier: 'server-distro',
3939
- extensionsGallery: this._webExtensionResourceUrlTemplate ? {
4040
+ extensionsGallery: {
4141
...this._productService.extensionsGallery,

0 commit comments

Comments
 (0)