Skip to content

Commit 7cc2270

Browse files
benz0licode-asher
andauthored
Update Code to 1.116.0 (#7754)
* 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>
1 parent 34ac5f4 commit 7cc2270

7 files changed

Lines changed: 15 additions & 9 deletions

File tree

ci/build/build-vscode.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ main() {
107107
EOF
108108
) > product.json
109109

110+
111+
VSCODE_QUALITY=stable npm run gulp compile-copilot-extension-build
112+
110113
npm run gulp core-ci
111114
npm run gulp "vscode-reh-web-$VSCODE_TARGET${MINIFY:+-min}-ci"
112115

lib/vscode

Submodule vscode updated 5463 files

patches/disable-builtin-ext-update.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
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
1010
@@ -342,6 +342,10 @@ export class Extension implements IExten
11-
if (this.type === ExtensionType.System && this.productService.quality === 'stable') {
11+
if (this.type === ExtensionType.System && this.productService.quality === 'stable' && !this.productService.builtInExtensionsEnabledWithAutoUpdates?.some(id => id.toLowerCase() === this.identifier.id.toLowerCase())) {
1212
return false;
1313
}
1414
+ // Do not update builtin extensions.

patches/display-language.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
291291
}
292292

293293
// Prefers to run on UI
294-
@@ -2072,17 +2069,6 @@ export class SetLanguageAction extends E
294+
@@ -2242,17 +2239,6 @@ export class SetLanguageAction extends E
295295
update(): void {
296296
this.enabled = false;
297297
this.class = SetLanguageAction.DisabledClass;
@@ -309,15 +309,15 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/extensions/browser/extens
309309
}
310310

311311
override async run(): Promise<any> {
312-
@@ -2099,7 +2085,6 @@ export class ClearLanguageAction extends
312+
@@ -2269,7 +2255,6 @@ export class ClearLanguageAction extends
313313
private static readonly DisabledClass = `${this.EnabledClass} disabled`;
314314

315315
constructor(
316316
- @IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
317317
@ILocaleService private readonly localeService: ILocaleService,
318318
) {
319319
super(ClearLanguageAction.ID, ClearLanguageAction.TITLE.value, ClearLanguageAction.DisabledClass, false);
320-
@@ -2109,17 +2094,6 @@ export class ClearLanguageAction extends
320+
@@ -2279,17 +2264,6 @@ export class ClearLanguageAction extends
321321
update(): void {
322322
this.enabled = false;
323323
this.class = ClearLanguageAction.DisabledClass;

patches/sourcemaps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts
3232

3333
let version = packageJson.version;
3434
const quality = (product as typeof product & { quality?: string }).quality;
35-
@@ -501,7 +500,7 @@ function tweakProductForServerWeb(produc
35+
@@ -505,7 +504,7 @@ function tweakProductForServerWeb(produc
3636
const minifyTask = task.define(`minify-vscode-${type}`, task.series(
3737
bundleTask,
3838
util.rimraf(`out-vscode-${type}-min`),

patches/update-check.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts
101101

102102
readonly version: string;
103103
readonly date?: string;
104-
@@ -117,6 +118,7 @@ export interface IProductConfiguration {
104+
@@ -118,6 +119,7 @@ export interface IProductConfiguration {
105105
readonly resourceUrlTemplate: string;
106106
readonly nlsBaseUrl: string;
107107
readonly accessSKUs?: string[];

test/e2e/models/CodeServer.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,14 @@ export class CodeServer {
7777
*/
7878
private async createWorkspace(): Promise<string> {
7979
const dir = await this.workspaceDir
80-
await fs.mkdir(path.join(dir, "Machine"), { recursive: true })
80+
await fs.mkdir(path.join(dir, "User"), { recursive: true })
8181
await fs.writeFile(
82-
path.join(dir, "Machine/settings.json"),
82+
path.join(dir, "User/settings.json"),
8383
JSON.stringify({
8484
"workbench.startupEditor": "none",
85+
// Disable the welcome popup so we can avoid having to click through it
86+
// on every test.
87+
"workbench.welcomePage.experimentalOnboarding": false,
8588
}),
8689
"utf8",
8790
)

0 commit comments

Comments
 (0)