Skip to content

Commit 8d9a44a

Browse files
benz0licode-asher
andauthored
Update Code to 1.113.0 (#7716)
* Update Code to 1.113.0 * Use CI build targets The target we have been using has started throwing all sorts of errors during the build (even without any of our patches). After checking the VS Code repo I think these are the ones we should actually be using. They are way faster, too. --------- Co-authored-by: Asher <ash@coder.com>
1 parent ada3489 commit 8d9a44a

15 files changed

+21
-61
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.22.0
1+
22.22.1

ci/build/build-vscode.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ EOF
112112
# this because we have an NPM package that could be installed on any platform.
113113
# The correct platform dependencies and scripts will be installed as part of
114114
# the post-install during `npm install` or when building a standalone release.
115-
node --max-old-space-size=16384 --optimize-for-size \
116-
./node_modules/gulp/bin/gulp.js \
117-
"vscode-reh-web-linux-x64${MINIFY:+-min}"
115+
npm run gulp core-ci
116+
npm run gulp "vscode-reh-web-linux-x64${MINIFY:+-min}-ci"
118117

119118
# Reset so if you develop after building you will not be stuck with the wrong
120119
# commit (the dev client will use `oss-dev` but the dev server will still use

lib/vscode

Submodule vscode updated 881 files

patches/clipboard.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
7878
===================================================================
7979
--- code-server.orig/lib/vscode/src/vs/platform/environment/common/argv.ts
8080
+++ code-server/lib/vscode/src/vs/platform/environment/common/argv.ts
81-
@@ -139,6 +139,7 @@ export interface NativeParsedArgs {
81+
@@ -143,6 +143,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/platform/environment/node/argv.ts
9292
+++ code-server/lib/vscode/src/vs/platform/environment/node/argv.ts
93-
@@ -106,6 +106,7 @@ export const OPTIONS: OptionDescriptions
93+
@@ -115,6 +115,7 @@ export const OPTIONS: OptionDescriptions
9494
'user-data-dir': { type: 'string', cat: 'o', args: 'dir', description: localize('userDataDir', "Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code.") },
9595
'profile': { type: 'string', 'cat': 'o', args: 'profileName', description: localize('profileName', "Opens the provided folder or workspace with the given profile and associates the profile with the workspace. If the profile does not exist, a new empty one is created.") },
9696
'help': { type: 'boolean', cat: 'o', alias: 'h', description: localize('help', "Print usage.") },

patches/display-language.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverServices.ts
1818
import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
1919
import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
2020
import { ConfigurationService } from '../../platform/configuration/common/configurationService.js';
21-
@@ -277,6 +277,9 @@ export async function setupServerService
21+
@@ -297,6 +297,9 @@ export async function setupServerService
2222

2323
socketServer.registerChannel('mcpManagement', new McpManagementChannel(mcpManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
2424

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

199199
/* ----- server setup ----- */
200200

201-
@@ -113,6 +114,7 @@ export interface ServerParsedArgs {
201+
@@ -116,6 +117,7 @@ export interface ServerParsedArgs {
202202
'disable-file-downloads'?: boolean;
203203
'disable-file-uploads'?: boolean;
204204
'disable-getting-started-override'?: boolean,

patches/external-file-actions.diff

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

100100
/* ----- server setup ----- */
101101

102-
@@ -107,6 +109,8 @@ export interface ServerParsedArgs {
102+
@@ -110,6 +112,8 @@ export interface ServerParsedArgs {
103103
/* ----- code-server ----- */
104104
'disable-update-check'?: boolean;
105105
'auth'?: string;
@@ -230,7 +230,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
230230
import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
231231
import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
232232
import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
233-
@@ -144,7 +144,7 @@ export class SimpleFileDialog extends Di
233+
@@ -152,7 +152,7 @@ export class SimpleFileDialog extends Di
234234
@IFileDialogService private readonly fileDialogService: IFileDialogService,
235235
@IModelService private readonly modelService: IModelService,
236236
@ILanguageService private readonly languageService: ILanguageService,
@@ -239,7 +239,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
239239
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
240240
@IPathService protected readonly pathService: IPathService,
241241
@IKeybindingService private readonly keybindingService: IKeybindingService,
242-
@@ -322,21 +322,23 @@ export class SimpleFileDialog extends Di
242+
@@ -362,21 +362,23 @@ export class SimpleFileDialog extends Di
243243
this.filePickBox.placeholder = nls.localize('remoteFileDialog.placeholder', "Folder path");
244244
this.filePickBox.ok = true;
245245
this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;

patches/fix-build.diff

Lines changed: 0 additions & 38 deletions
This file was deleted.

patches/getting-started.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
189189

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

192-
@@ -111,6 +112,7 @@ export interface ServerParsedArgs {
192+
@@ -114,6 +115,7 @@ export interface ServerParsedArgs {
193193
'auth'?: string;
194194
'disable-file-downloads'?: boolean;
195195
'disable-file-uploads'?: boolean;

patches/logout.diff

Lines changed: 1 addition & 1 deletion
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-
@@ -105,6 +106,7 @@ export const serverOptions: OptionDescri
31+
@@ -108,6 +109,7 @@ export const serverOptions: OptionDescri
3232
export interface ServerParsedArgs {
3333
/* ----- code-server ----- */
3434
'disable-update-check'?: boolean;

patches/proposed-api.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/services/extensions/common/extens
1717
- if (!extension.enabledApiProposals) {
1818
- return false;
1919
- }
20-
- return extension.enabledApiProposals.includes(proposal);
20+
- return true;// extension.enabledApiProposals.includes(proposal);
2121
+ return true
2222
}
2323

0 commit comments

Comments
 (0)