Skip to content

Commit dbd25c9

Browse files
authored
Update Code to 1.118.0 (#7768)
1 parent 02f4d6e commit dbd25c9

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

lib/vscode

Submodule vscode updated 1562 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-
@@ -145,6 +145,7 @@ export interface NativeParsedArgs {
81+
@@ -149,6 +149,7 @@ export interface NativeParsedArgs {
8282
'disable-chromium-sandbox'?: boolean;
8383
sandbox?: boolean;
8484
'enable-coi'?: boolean;

patches/copilot.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Index: code-server/lib/vscode/build/gulpfile.extensions.ts
22
===================================================================
33
--- code-server.orig/lib/vscode/build/gulpfile.extensions.ts
44
+++ code-server/lib/vscode/build/gulpfile.extensions.ts
5-
@@ -287,6 +287,29 @@ export const compileCopilotExtensionBuil
5+
@@ -293,6 +293,29 @@ export const compileCopilotExtensionBuil
66
gulp.task(compileCopilotExtensionBuildTask);
77

88
/**
@@ -40,7 +40,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
4040
import { type IExtensionDefinition, getExtensionStream } from './builtInExtensions.ts';
4141
import { fetchUrls, fetchGithub } from './fetch.ts';
4242
import { createTsgoStream, spawnTsgo } from './tsgo.ts';
43-
+import { prepareBuiltInCopilotExtensionShims } from './copilot.ts';
43+
+import { prepareBuiltInCopilotRipgrepShim } from './copilot.ts';
4444
import vzip from 'gulp-vinyl-zip';
4545

4646
import { createRequire } from 'module';
@@ -148,7 +148,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
148148
+ }
149149
+
150150
+ try {
151-
+ prepareBuiltInCopilotExtensionShims(platform, arch, outputDir, appNodeModulesDir);
151+
+ prepareBuiltInCopilotRipgrepShim(platform, arch, outputDir, appNodeModulesDir);
152152
+ fancyLog(`[prepareCopilotExtensionNativeShims] Materialized native shims for ${platform}-${arch}`);
153153
+ } catch (err) {
154154
+ // Downgrade to a warning for local builds since the extension

patches/unique-db.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/storage/browser/storageS
2121

2222
export class BrowserStorageService extends AbstractStorageService {
2323

24-
@@ -300,7 +301,11 @@ export class IndexedDBStorageDatabase ex
24+
@@ -328,7 +329,11 @@ export class IndexedDBStorageDatabase ex
2525
}
2626

2727
static async createWorkspaceStorage(workspaceId: string, logService: ILogService): Promise<IIndexedDBStorageDatabase> {

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-
@@ -118,6 +119,7 @@ export interface IProductConfiguration {
104+
@@ -119,6 +120,7 @@ export interface IProductConfiguration {
105105
readonly resourceUrlTemplate: string;
106106
readonly nlsBaseUrl: string;
107107
readonly accessSKUs?: string[];

patches/webview.diff

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
7070
<meta charset="UTF-8">
7171

7272
<meta http-equiv="Content-Security-Policy"
73-
- content="default-src 'none'; script-src 'sha256-TaWGDzV7c9rUH2q/5ygOyYUHSyHIqBMYfucPh3lnKvU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74-
+ content="default-src 'none'; script-src 'sha256-nQZh+9dHKZP2cHbhYlCbWDtqxxJtGjRGBx57zNP2DZM=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
73+
- content="default-src 'none'; script-src 'sha256-q+WTr+fBXpLLE3++yWNaxT6BTWQtsKscoeIlynBRk4E=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
74+
+ content="default-src 'none'; script-src 'sha256-m1DlJtsIJd46QuWYNcsaYIG1xI+9FyjKQu+cfp+zq5Q=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
7575

7676
<!-- Disable pinch zooming -->
7777
<meta name="viewport"
78-
@@ -256,7 +256,7 @@
78+
@@ -253,7 +253,7 @@
7979
}
8080

8181
const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
82-
- navigator.serviceWorker.register(swPath, { type: 'module' })
82+
- navigator.serviceWorker.register(swPath, { type: 'module', updateViaCache: 'none' })
8383
+ navigator.serviceWorker.register(swPath)
8484
.then(async registration => {
85-
/**
86-
* @param {MessageEvent} event
87-
@@ -370,6 +370,12 @@
85+
if (navigator.serviceWorker.controller) {
86+
// A previous SW is already controlling. Force an update
87+
@@ -332,6 +332,12 @@
8888

8989
const hostname = location.hostname;
9090

0 commit comments

Comments
 (0)