Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 31c211a

Browse files
benz0licode-asher
andauthored
Update Code to 1.98.0 (#7249)
* Update Code to 1.98.0 * Avoid sudo when launching caddy It is erroring about needing a password, but also do we even need to run this as root considering we are not binding to privileged ports? --------- Co-authored-by: Asher <ash@coder.com>
1 parent 6f8493e commit 31c211a

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,12 +377,12 @@ jobs:
377377
mkdir -p ~/.cache/caddy
378378
tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
379379
380-
- run: sudo ~/.cache/caddy/caddy start --config ./ci/Caddyfile
380+
- run: ~/.cache/caddy/caddy start --config ./ci/Caddyfile
381381

382382
- run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e:proxy
383383

384384
- if: always()
385-
run: sudo ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
385+
run: ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
386386

387387
- if: always()
388388
uses: actions/upload-artifact@v4

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.18.1
1+
20.18.2

‎lib/vscode‎

Submodule vscode updated 1212 files

‎patches/clipboard.diff‎

Lines changed: 1 addition & 1 deletion
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-
@@ -121,6 +121,7 @@ export interface NativeParsedArgs {
81+
@@ -122,6 +122,7 @@ export interface NativeParsedArgs {
8282
sandbox?: boolean;
8383

8484
'enable-coi'?: boolean;

‎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-
@@ -321,6 +321,10 @@ export class Extension implements IExten
10+
@@ -319,6 +319,10 @@ export class Extension implements IExten
1111
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
1212
return false;
1313
}

‎patches/display-language.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/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-
@@ -245,6 +245,9 @@ export async function setupServerService
21+
@@ -246,6 +246,9 @@ export async function setupServerService
2222
const channel = new ExtensionManagementChannel(extensionManagementService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority));
2323
socketServer.registerChannel('extensions', channel);
2424

‎patches/external-file-actions.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
208208
===================================================================
209209
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
210210
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
211-
@@ -41,6 +41,9 @@ export const HasWebFileSystemAccess = ne
211+
@@ -39,6 +39,9 @@ export const HasWebFileSystemAccess = ne
212212

213213
export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('embedderIdentifier', undefined, localize('embedderIdentifier', 'The identifier of the embedder according to the product service, if one is defined'));
214214

@@ -231,7 +231,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
231231
import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
232232
import { IContextKeyService, IContextKey, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
233233
import { equalsIgnoreCase, format, startsWithIgnoreCase } from '../../../../base/common/strings.js';
234-
@@ -139,7 +139,7 @@ export class SimpleFileDialog extends Di
234+
@@ -144,7 +144,7 @@ export class SimpleFileDialog extends Di
235235
@IFileDialogService private readonly fileDialogService: IFileDialogService,
236236
@IModelService private readonly modelService: IModelService,
237237
@ILanguageService private readonly languageService: ILanguageService,
@@ -240,7 +240,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/dialogs/browser/simpleFi
240240
@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
241241
@IPathService protected readonly pathService: IPathService,
242242
@IKeybindingService private readonly keybindingService: IKeybindingService,
243-
@@ -284,20 +284,22 @@ export class SimpleFileDialog extends Di
243+
@@ -310,20 +310,22 @@ export class SimpleFileDialog extends Di
244244
this.filePickBox.ignoreFocusOut = true;
245245
this.filePickBox.ok = true;
246246
this.filePickBox.okLabel = typeof this.options.openLabel === 'string' ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;

‎patches/getting-started.diff‎

Lines changed: 3 additions & 3 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-
@@ -869,6 +869,72 @@ export class GettingStartedPage extends
31+
@@ -870,6 +870,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-
@@ -904,6 +970,9 @@ export class GettingStartedPage extends
104+
@@ -905,6 +971,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}
@@ -234,7 +234,7 @@ Index: code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
234234
===================================================================
235235
--- code-server.orig/lib/vscode/src/vs/workbench/common/contextkeys.ts
236236
+++ code-server/lib/vscode/src/vs/workbench/common/contextkeys.ts
237-
@@ -43,6 +43,7 @@ export const EmbedderIdentifierContext =
237+
@@ -41,6 +41,7 @@ export const EmbedderIdentifierContext =
238238

239239
export const IsEnabledFileDownloads = new RawContextKey<boolean>('isEnabledFileDownloads', true, true);
240240
export const IsEnabledFileUploads = new RawContextKey<boolean>('isEnabledFileUploads', true, true);

‎patches/integration.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandl
113113
===================================================================
114114
--- code-server.orig/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
115115
+++ code-server/lib/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
116-
@@ -77,8 +77,11 @@ export class BrowserDialogHandler extend
116+
@@ -79,8 +79,11 @@ export class BrowserDialogHandler extend
117117

118118
async about(): Promise<void> {
119119
const detailString = (useAgo: boolean): string => {

‎patches/telemetry.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/serverServices.ts
2828
import { NullPolicyService } from '../../platform/policy/common/policy.js';
2929
import { OneDataSystemAppender } from '../../platform/telemetry/node/1dsAppender.js';
3030
import { LoggerService } from '../../platform/log/node/loggerService.js';
31-
@@ -152,11 +154,23 @@ export async function setupServerService
31+
@@ -153,11 +155,23 @@ export async function setupServerService
3232
const requestService = new RequestService('remote', configurationService, environmentService, logService);
3333
services.set(IRequestService, requestService);
3434

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /