Skip to content

Commit ea9a3a5

Browse files
authored
Update Code to 1.107.0 (#7599)
1 parent 472bf8a commit ea9a3a5

17 files changed

+40
-40
lines changed

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.20.0
1+
22.21.1

lib/vscode

Submodule vscode updated 1647 files

patches/base-path.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
241241
===================================================================
242242
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
243243
+++ code-server/lib/vscode/src/vs/base/common/product.ts
244-
@@ -65,6 +65,7 @@ export type ExtensionVirtualWorkspaceSup
244+
@@ -66,6 +66,7 @@ export type ExtensionVirtualWorkspaceSup
245245

246246
export interface IProductConfiguration {
247247
readonly codeServerVersion?: string

patches/clipboard.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Index: code-server/lib/vscode/src/vs/server/node/server.cli.ts
110110
return true;
111111
default:
112112
return false;
113-
@@ -295,6 +296,22 @@ export async function main(desc: Product
113+
@@ -300,6 +301,22 @@ export async function main(desc: Product
114114
}
115115
}
116116
} else {

patches/display-language.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
190190
===================================================================
191191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
192192
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
193-
@@ -21,6 +21,7 @@ export const serverOptions: OptionDescri
193+
@@ -22,6 +22,7 @@ export const serverOptions: OptionDescri
194194
'disable-file-downloads': { type: 'boolean' },
195195
'disable-file-uploads': { type: 'boolean' },
196196
'disable-getting-started-override': { type: 'boolean' },
197197
+ 'locale': { type: 'string' },
198198

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

201-
@@ -110,6 +111,7 @@ export interface ServerParsedArgs {
201+
@@ -113,6 +114,7 @@ export interface ServerParsedArgs {
202202
'disable-file-downloads'?: boolean;
203203
'disable-file-uploads'?: boolean;
204204
'disable-getting-started-override'?: boolean,
@@ -339,7 +339,7 @@ Index: code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
339339
===================================================================
340340
--- code-server.orig/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
341341
+++ code-server/lib/vscode/src/vs/workbench/workbench.web.main.internal.ts
342-
@@ -55,7 +55,7 @@ import './services/dialogs/browser/fileD
342+
@@ -54,7 +54,7 @@ import './services/dialogs/browser/fileD
343343
import './services/host/browser/browserHostService.js';
344344
import './services/lifecycle/browser/lifecycleService.js';
345345
import './services/clipboard/browser/clipboardService.js';

patches/external-file-actions.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9090
===================================================================
9191
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9292
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
93-
@@ -18,6 +18,8 @@ export const serverOptions: OptionDescri
93+
@@ -19,6 +19,8 @@ export const serverOptions: OptionDescri
9494
/* ----- code-server ----- */
9595
'disable-update-check': { type: 'boolean' },
9696
'auth': { type: 'string' },
@@ -99,7 +99,7 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
9999

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

102-
@@ -104,6 +106,8 @@ export interface ServerParsedArgs {
102+
@@ -107,6 +109,8 @@ export interface ServerParsedArgs {
103103
/* ----- code-server ----- */
104104
'disable-update-check'?: boolean;
105105
'auth'?: string;

patches/getting-started.diff

Lines changed: 4 additions & 4 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 { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
31-
@@ -902,6 +902,72 @@ export class GettingStartedPage extends
31+
@@ -916,6 +916,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-
@@ -937,6 +1003,9 @@ export class GettingStartedPage extends
104+
@@ -951,6 +1017,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -181,15 +181,15 @@ 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-
@@ -20,6 +20,7 @@ export const serverOptions: OptionDescri
184+
@@ -21,6 +21,7 @@ export const serverOptions: OptionDescri
185185
'auth': { type: 'string' },
186186
'disable-file-downloads': { type: 'boolean' },
187187
'disable-file-uploads': { type: 'boolean' },
188188
+ 'disable-getting-started-override': { type: 'boolean' },
189189

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

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

patches/integration.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/web.main.ts
172172
import { IProgressService } from '../../platform/progress/common/progress.js';
173173
import { DelayedLogChannel } from '../services/output/common/delayedLogChannel.js';
174174
import { dirname, joinPath } from '../../base/common/resources.js';
175-
@@ -130,6 +131,9 @@ export class BrowserMain extends Disposa
175+
@@ -133,6 +134,9 @@ export class BrowserMain extends Disposa
176176
// Startup
177177
const instantiationService = workbench.startup();
178178

@@ -186,7 +186,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
186186
===================================================================
187187
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
188188
+++ code-server/lib/vscode/src/vs/base/common/product.ts
189-
@@ -64,6 +64,8 @@ export type ExtensionVirtualWorkspaceSup
189+
@@ -65,6 +65,8 @@ export type ExtensionVirtualWorkspaceSup
190190
};
191191

192192
export interface IProductConfiguration {

patches/logout.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
88
===================================================================
99
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
1010
+++ code-server/lib/vscode/src/vs/base/common/product.ts
11-
@@ -67,6 +67,7 @@ export interface IProductConfiguration {
11+
@@ -68,6 +68,7 @@ export interface IProductConfiguration {
1212
readonly codeServerVersion?: string
1313
readonly rootEndpoint?: string
1414
readonly updateEndpoint?: string
@@ -20,15 +20,15 @@ Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2020
===================================================================
2121
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
2222
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
23-
@@ -17,6 +17,7 @@ import { join } from '../../base/common/
23+
@@ -18,6 +18,7 @@ import { ProtocolConstants } from '../..
2424
export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
2525
/* ----- code-server ----- */
2626
'disable-update-check': { type: 'boolean' },
2727
+ 'auth': { type: 'string' },
2828

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

31-
@@ -102,6 +103,7 @@ export const serverOptions: OptionDescri
31+
@@ -105,6 +106,7 @@ export const serverOptions: OptionDescri
3232
export interface ServerParsedArgs {
3333
/* ----- code-server ----- */
3434
'disable-update-check'?: boolean;

patches/proxy-uri.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
3030
===================================================================
3131
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
3232
+++ code-server/lib/vscode/src/vs/base/common/product.ts
33-
@@ -68,6 +68,7 @@ export interface IProductConfiguration {
33+
@@ -69,6 +69,7 @@ export interface IProductConfiguration {
3434
readonly rootEndpoint?: string
3535
readonly updateEndpoint?: string
3636
readonly logoutEndpoint?: string

0 commit comments

Comments
 (0)