TheLanc3/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-04 19:45:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Code to 1.116.0 (#7754)

Browse Source 
* Update Code to 1.116.0

* Add copilot extension build

Seems the vscode build requires this separately now.

* Disable welcome popup

A giant modal window asking you to sign in for AI features is blocking
the tests.  Rather than have to click through it, disable it.  It looks like
this has to be a user setting, so switch to that instead of machine (we
used machine because user settings were in the browser, but they have
been since moved back to disk).

---------

Co-authored-by: Asher <ash@coder.com>
This commit is contained in:
Olivier Benz
2026-04-16 01:05:17 +02:00
committed by GitHub
parent 34ac5f47de
commit 7cc2270228
7 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci/build/build-vscode.sh
View File

@@ -107,6 +107,9 @@ main() {
EOF
) > product.json
VSCODE_QUALITY=stable npm run gulp compile-copilot-extension-build
npm run gulp core-ci
npm run gulp "vscode-reh-web-$VSCODE_TARGET${MINIFY:+-min}-ci"

2
lib/vscode

Submodule lib/vscode updated: 41dd792b5e...560a9dba96

2
patches/disable-builtin-ext-update.diff
View File

@@ -8,7 +8,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
@@ -342,6 +342,10 @@ export class Extension implements IExten
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) {
return false;
}
+ // Do not update builtin extensions.

6
patches/display-language.diff
View File

@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
}
// Prefers to run on UI
@@ -2072,17 +2069,6 @@ export class SetLanguageAction extends E
@@ -2242,17 +2239,6 @@ export class SetLanguageAction extends E
update(): void {
this.enabled = false;
this.class = SetLanguageAction.DisabledClass;
@@ -309,7 +309,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
}
override async run(): Promise<any> {
@@ -2099,7 +2085,6 @@ export class ClearLanguageAction extends
@@ -2269,7 +2255,6 @@ export class ClearLanguageAction extends
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
constructor(
@@ -317,7 +317,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);
@@ -2109,17 +2094,6 @@ export class ClearLanguageAction extends
@@ -2279,17 +2264,6 @@ export class ClearLanguageAction extends
update(): void {
this.enabled = false;
this.class = ClearLanguageAction.DisabledClass;

2
patches/sourcemaps.diff
View File

@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts
let version = packageJson.version;
const quality = (product as typeof product & { quality?: string }).quality;
@@ -501,7 +500,7 @@ function tweakProductForServerWeb(produc
@@ -505,7 +504,7 @@ function tweakProductForServerWeb(produc
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
bundleTask,
util.rimraf(`out-vscode-${type}-min`),

2
patches/update-check.diff
View File

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
readonly version: string;
readonly date?: string;
@@ -117,6 +118,7 @@ export interface IProductConfiguration {
@@ -118,6 +119,7 @@ export interface IProductConfiguration {
readonly resourceUrlTemplate: string;
readonly nlsBaseUrl: string;
readonly accessSKUs?: string[];

7
test/e2e/models/CodeServer.ts
View File

@@ -77,11 +77,14 @@ export class CodeServer {
*/
private async createWorkspace(): Promise<string> {
const dir = await this.workspaceDir
await fs.mkdir(path.join(dir, "Machine"), { recursive: true })
await fs.mkdir(path.join(dir, "User"), { recursive: true })
await fs.writeFile(
path.join(dir, "Machine/settings.json"),
path.join(dir, "User/settings.json"),
JSON.stringify({
"workbench.startupEditor": "none",
// Disable the welcome popup so we can avoid having to click through it
// on every test.
"workbench.welcomePage.experimentalOnboarding": false,
}),
"utf8",
)