Skip to content

Commit 090e0fa

Browse files
code-ashercode-asher
authored
Update to Code 1.91.0 (#6885)
1 parent 6514ba4 commit 090e0fa

File tree

9 files changed

+33
-25
lines changed

9 files changed

+33
-25
lines changed

‎CHANGELOG.md

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

2323
## Unreleased
2424

25+
## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08
26+
27+
Code v1.91.0
28+
29+
### Changed
30+
31+
- Updated to Code 1.91.0.
32+
2533
## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21
2634

2735
Code v1.90.2

‎lib/vscode

Submodule vscode updated 1573 files

‎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-
@@ -285,6 +285,10 @@ export class Extension implements IExten
10+
@@ -287,6 +287,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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -348,17 +348,17 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
348348
===================================================================
349349
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
350350
+++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
351-
@@ -341,9 +341,6 @@ export class InstallAction extends Exten
351+
@@ -411,9 +411,6 @@ export class InstallAction extends Exten
352352
if (this.extension.isBuiltin) {
353353
return;
354354
}
355355
- if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) {
356356
- return;
357357
- }
358-
if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) {
359-
this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion;
360-
this.updateLabel();
361-
@@ -614,7 +611,7 @@ export abstract class InstallInOtherServ
358+
if (this.extension.state !== ExtensionState.Uninstalled) {
359+
return;
360+
}
361+
@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ
362362
}
363363

364364
if (isLanguagePackExtension(this.extension.local.manifest)) {
@@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
367367
}
368368

369369
// Prefers to run on UI
370-
@@ -1848,17 +1845,6 @@ export class SetLanguageAction extends E
370+
@@ -1928,17 +1925,6 @@ export class SetLanguageAction extends E
371371
update(): void {
372372
this.enabled = false;
373373
this.class = SetLanguageAction.DisabledClass;
@@ -385,15 +385,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
385385
}
386386

387387
override async run(): Promise<any> {
388-
@@ -1875,7 +1861,6 @@ export class ClearLanguageAction extends
388+
@@ -1955,7 +1941,6 @@ export class ClearLanguageAction extends
389389
private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`;
390390

391391
constructor(
392392
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
393393
@ILocaleService private readonly localeService: ILocaleService,
394394
) {
395395
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
396-
@@ -1885,17 +1870,6 @@ export class ClearLanguageAction extends
396+
@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends
397397
update(): void {
398398
this.enabled = false;
399399
this.class = ClearLanguageAction.DisabledClass;

‎patches/getting-started.diff

Lines changed: 2 additions & 2 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 'vs/workbench/common/editor';
2929
import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
3030
import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors';
31-
@@ -816,6 +816,72 @@ export class GettingStartedPage extends
31+
@@ -804,6 +804,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-
@@ -887,6 +953,9 @@ export class GettingStartedPage extends
104+
@@ -839,6 +905,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

‎patches/proposed-api.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens
2626
===================================================================
2727
--- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
2828
+++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts
29-
@@ -24,7 +24,7 @@ export class ExtensionsProposedApi {
29+
@@ -31,7 +31,7 @@ export class ExtensionsProposedApi {
3030

3131
this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id)));
3232

‎patches/sourcemaps.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
1010
===================================================================
1111
--- code-server.orig/lib/vscode/build/gulpfile.reh.js
1212
+++ code-server/lib/vscode/build/gulpfile.reh.js
13-
@@ -236,8 +236,7 @@ function packageTask(type, platform, arc
13+
@@ -237,8 +237,7 @@ function packageTask(type, platform, arc
1414

1515
const src = gulp.src(sourceFolderName + '/**', { base: '.' })
1616
.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
2020

2121
const workspaceExtensionPoints = ['debuggers', 'jsonValidation'];
2222
const isUIExtension = (manifest) => {
23-
@@ -276,9 +275,9 @@ function packageTask(type, platform, arc
23+
@@ -277,9 +276,9 @@ function packageTask(type, platform, arc
2424
.map(name => `.build/extensions/${name}/**`);
2525

2626
const extensions = gulp.src(extensionPaths, { base: '.build', dot: true });
@@ -32,11 +32,11 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js
3232

3333
let version = packageJson.version;
3434
const quality = product.quality;
35-
@@ -439,7 +438,7 @@ function tweakProductForServerWeb(produc
35+
@@ -440,7 +439,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
optimizeTask,
3838
util.rimraf(`out-vscode-${type}-min`),
39-
- optimize.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
39+
- optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
4040
+ optimize.minifyTask(`out-vscode-${type}`, ``)
4141
));
4242
gulp.task(minifyTask);

‎patches/store-socket.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts
9494
*--------------------------------------------------------------------------------------------*/
9595

9696
+import * as _http from 'http';
97+
import minimist from 'minimist';
9798
import * as nativeWatchdog from 'native-watchdog';
9899
import * as net from 'net';
99-
import * as minimist from 'minimist';
100-
@@ -418,7 +419,28 @@ async function startExtensionHostProcess
100+
@@ -421,7 +422,28 @@ async function startExtensionHostProcess
101101
);
102102

103103
// rewrite onTerminate-function to be a proper shutdown

‎patches/webview.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
6666
===================================================================
6767
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
6868
+++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html
69-
@@ -5,7 +5,7 @@
70-
<meta charset="UTF-8">
69+
@@ -6,7 +6,7 @@
7170

7271
<meta http-equiv="Content-Security-Policy"
73-
- content="default-src 'none'; script-src 'sha256-bQPwjO6bLiyf6v9eDVtAI67LrfonA1w49aFkRXBy4/g=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74-
+ content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
72+
73+
- content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74+
+ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
75+
7576

7677
<!-- Disable pinch zooming -->
77-
<meta name="viewport"
78-
@@ -344,6 +344,12 @@
78+
@@ -350,6 +350,12 @@
7979

8080
const hostname = location.hostname;
8181

0 commit comments

Comments
 (0)