From 090e0fad76152d6a0c10903a3bbf8a83d09e93d0 Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 8 Jul 2024 22:10:34 +0000 Subject: [PATCH] Update to Code 1.91.0 (#6885) --- CHANGELOG.md | 8 ++++++++ lib/vscode | 2 +- patches/disable-builtin-ext-update.diff | 2 +- patches/display-language.diff | 16 ++++++++-------- patches/getting-started.diff | 4 ++-- patches/proposed-api.diff | 2 +- patches/sourcemaps.diff | 8 ++++---- patches/store-socket.diff | 4 ++-- patches/webview.diff | 12 ++++++------ 9 files changed, 33 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e90fa09..17da5c769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,14 @@ Code v99.99.999 ## Unreleased +## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-08 + +Code v1.91.0 + +### Changed + +- Updated to Code 1.91.0. + ## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21 Code v1.90.2 diff --git a/lib/vscode b/lib/vscode index 5437499fe..ea1445cc7 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 5437499feb04f7a586f677b155b039bc2b3669eb +Subproject commit ea1445cc7016315d0f5728f8e8b12a45dc0a7286 diff --git a/patches/disable-builtin-ext-update.diff b/patches/disable-builtin-ext-update.diff index c251a49a2..d1f844868 100644 --- a/patches/disable-builtin-ext-update.diff +++ b/patches/disable-builtin-ext-update.diff @@ -7,7 +7,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -285,6 +285,10 @@ export class Extension implements IExten +@@ -287,6 +287,10 @@ export class Extension implements IExten if (this.type === ExtensionType.System && this.productService.quality === 'stable') { return false; } diff --git a/patches/display-language.diff b/patches/display-language.diff index c64efe8c5..0a223c746 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -348,17 +348,17 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -341,9 +341,6 @@ export class InstallAction extends Exten +@@ -411,9 +411,6 @@ export class InstallAction extends Exten if (this.extension.isBuiltin) { return; } - if (this.extensionsWorkbenchService.canSetLanguage(this.extension)) { - return; - } - if (this.extension.state === ExtensionState.Uninstalled && await this.extensionsWorkbenchService.canInstall(this.extension)) { - this.enabled = this.options.installPreReleaseVersion ? this.extension.hasPreReleaseVersion : this.extension.hasReleaseVersion; - this.updateLabel(); -@@ -614,7 +611,7 @@ export abstract class InstallInOtherServ + if (this.extension.state !== ExtensionState.Uninstalled) { + return; + } +@@ -695,7 +692,7 @@ export abstract class InstallInOtherServ } if (isLanguagePackExtension(this.extension.local.manifest)) { @@ -367,7 +367,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } // Prefers to run on UI -@@ -1848,17 +1845,6 @@ export class SetLanguageAction extends E +@@ -1928,17 +1925,6 @@ export class SetLanguageAction extends E update(): void { this.enabled = false; this.class = SetLanguageAction.DisabledClass; @@ -385,7 +385,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens } override async run(): Promise { -@@ -1875,7 +1861,6 @@ export class ClearLanguageAction extends +@@ -1955,7 +1941,6 @@ export class ClearLanguageAction extends private static readonly DisabledClass = `${ClearLanguageAction.EnabledClass} disabled`; constructor( @@ -393,7 +393,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens @ILocaleService private readonly localeService: ILocaleService, ) { super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false); -@@ -1885,17 +1870,6 @@ export class ClearLanguageAction extends +@@ -1965,17 +1950,6 @@ export class ClearLanguageAction extends update(): void { this.enabled = false; this.class = ClearLanguageAction.DisabledClass; diff --git a/patches/getting-started.diff b/patches/getting-started.diff index cb9568ef9..302052693 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from 'vs/workbench/common/editor'; import { IWebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedColors'; -@@ -816,6 +816,72 @@ export class GettingStartedPage extends +@@ -804,6 +804,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -887,6 +953,9 @@ export class GettingStartedPage extends +@@ -839,6 +905,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } diff --git a/patches/proposed-api.diff b/patches/proposed-api.diff index f81bccbff..78eda7572 100644 --- a/patches/proposed-api.diff +++ b/patches/proposed-api.diff @@ -26,7 +26,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/extensions/common/extens =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts +++ code-server/lib/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.ts -@@ -24,7 +24,7 @@ export class ExtensionsProposedApi { +@@ -31,7 +31,7 @@ export class ExtensionsProposedApi { this._envEnabledExtensions = new Set((_environmentService.extensionEnabledProposedApi ?? []).map(id => ExtensionIdentifier.toKey(id))); diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 366566f17..04787784b 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.js +++ code-server/lib/vscode/build/gulpfile.reh.js -@@ -236,8 +236,7 @@ function packageTask(type, platform, arc +@@ -237,8 +237,7 @@ function packageTask(type, platform, arc const src = gulp.src(sourceFolderName + '/**', { base: '.' }) .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 const workspaceExtensionPoints = ['debuggers', 'jsonValidation']; const isUIExtension = (manifest) => { -@@ -276,9 +275,9 @@ function packageTask(type, platform, arc +@@ -277,9 +276,9 @@ function packageTask(type, platform, arc .map(name => `.build/extensions/${name}/**`); const extensions = gulp.src(extensionPaths, { base: '.build', dot: true }); @@ -32,11 +32,11 @@ Index: code-server/lib/vscode/build/gulpfile.reh.js let version = packageJson.version; const quality = product.quality; -@@ -439,7 +438,7 @@ function tweakProductForServerWeb(produc +@@ -440,7 +439,7 @@ function tweakProductForServerWeb(produc const minifyTask = task.define(`minify-vscode-${type}`, task.series( optimizeTask, util.rimraf(`out-vscode-${type}-min`), -- optimize.minifyTask(`out-vscode-${type}`, `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`) +- optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`) + optimize.minifyTask(`out-vscode-${type}`, ``) )); gulp.task(minifyTask); diff --git a/patches/store-socket.diff b/patches/store-socket.diff index e91a3bcae..236aae276 100644 --- a/patches/store-socket.diff +++ b/patches/store-socket.diff @@ -94,10 +94,10 @@ Index: code-server/lib/vscode/src/vs/workbench/api/node/extensionHostProcess.ts *--------------------------------------------------------------------------------------------*/ +import * as _http from 'http'; + import minimist from 'minimist'; import * as nativeWatchdog from 'native-watchdog'; import * as net from 'net'; - import * as minimist from 'minimist'; -@@ -418,7 +419,28 @@ async function startExtensionHostProcess +@@ -421,7 +422,28 @@ async function startExtensionHostProcess ); // rewrite onTerminate-function to be a proper shutdown diff --git a/patches/webview.diff b/patches/webview.diff index 4c324ce25..2616db81f 100644 --- a/patches/webview.diff +++ b/patches/webview.diff @@ -66,16 +66,16 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index.html -@@ -5,7 +5,7 @@ - +@@ -6,7 +6,7 @@ -+ content="default-src 'none'; script-src 'sha256-R3BsSkqy7qFbvWSmwr7WqT1eg6Sq4zSe0uIlrUQ4EKE=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + +- content="default-src 'none'; script-src 'sha256-ikaxwm2UFoiIKkEZTEU4mnSxpYf3lmsrhy5KqqJZfek=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> ++ content="default-src 'none'; script-src 'sha256-ytymamOof3TtOHdw4JlwzF1Z5E8nGRH8AmlcwgCHTFQ=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + -