Skip to content

Commit 3dbff65

Browse files
azmkercsoazmkercso
committed
Rebase patches for all targets
1 parent daac5dc commit 3dbff65

82 files changed

Lines changed: 1268 additions & 1208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎patches/common/allow-unused-vars.diff‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Relax TypeScript strict checks for unused locals and suppress ts-expect-error wa
33
Disables noUnusedLocals in tsconfig and replaces @ts-expect-error with @ts-ignore
44
to prevent build failures caused by variables introduced by other patches.
55

6-
Index: third-party-src/src/tsconfig.base.json
6+
Index: code-editor-src/src/tsconfig.base.json
77
===================================================================
8-
--- third-party-src.orig/src/tsconfig.base.json
9-
+++ third-party-src/src/tsconfig.base.json
8+
--- code-editor-src.orig/src/tsconfig.base.json
9+
+++ code-editor-src/src/tsconfig.base.json
1010
@@ -6,7 +6,7 @@
1111
"experimentalDecorators": true,
1212
"noImplicitReturns": true,
@@ -16,11 +16,11 @@ Index: third-party-src/src/tsconfig.base.json
1616
"noUncheckedSideEffectImports": true,
1717
"allowUnreachableCode": false,
1818
"strict": true,
19-
Index: third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
19+
Index: code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
2020
===================================================================
21-
--- third-party-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
22-
+++ third-party-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
23-
@@ -762,7 +762,7 @@ export class TunnelPanel extends ViewPan
21+
--- code-editor-src.orig/src/vs/workbench/contrib/remote/browser/tunnelView.ts
22+
+++ code-editor-src/src/vs/workbench/contrib/remote/browser/tunnelView.ts
23+
@@ -761,7 +761,7 @@ export class TunnelPanel extends ViewPan
2424
private protocolChangableContextKey: IContextKey<boolean>;
2525
private isEditing: boolean = false;
2626
// TODO: Should this be removed?

‎patches/common/build.diff‎

Lines changed: 35 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,49 @@
1-
Update dependency versions and npm overrides for the build
1+
Update dependency versions, npm overrides, and gulp command for the build
22

3-
Bumps @vscode/proxy-agent, @vscode/sqlite3, and Electron versions. Removes
4-
kerberos dependency and adds npm overrides for security and compatibility fixes
5-
including braces, postcss, playwright, and @tootallnate/once.
3+
Bumps Electron from 39.x to 40.6.0. Removes kerberos dependency and adds
4+
npm overrides for security and compatibility fixes including braces, postcss,
5+
playwright, form-data, tar-fs, koa, and serialize-javascript. Also updates
6+
the gulp command to allow NODE_OPTIONS override for memory allocation.
67

7-
Index: third-party-src/package.json
8+
Index: code-editor-src/package.json
89
===================================================================
9-
--- third-party-src.orig/package.json
10-
+++ third-party-src/package.json
11-
@@ -78,10 +78,10 @@
12-
"@vscode/deviceid": "^0.1.1",
13-
"@vscode/iconv-lite-umd": "0.7.1",
14-
"@vscode/policy-watcher": "^1.3.2",
15-
- "@vscode/proxy-agent": "^0.36.0",
16-
+ "@vscode/proxy-agent": "^0.37.0",
17-
"@vscode/ripgrep": "^1.15.13",
18-
"@vscode/spdlog": "^0.15.2",
19-
- "@vscode/sqlite3": "5.1.10-vscode",
20-
+ "@vscode/sqlite3": "5.1.12-vscode",
21-
"@vscode/sudo-prompt": "9.3.1",
22-
"@vscode/tree-sitter-wasm": "^0.3.0",
23-
"@vscode/vscode-languagedetection": "1.0.21",
24-
@@ -103,7 +103,6 @@
10+
--- code-editor-src.orig/package.json
11+
+++ code-editor-src/package.json
12+
@@ -39,7 +39,7 @@
13+
"watch-extensionsd": "deemon npm run watch-extensions",
14+
"kill-watch-extensionsd": "deemon --kill npm run watch-extensions",
15+
"precommit": "node --experimental-strip-types build/hygiene.ts",
16+
- "gulp": "node --max-old-space-size=8192 ./node_modules/gulp/bin/gulp.js",
17+
+ "gulp": "NODE_OPTIONS=\"${NODE_OPTIONS:---max-old-space-size=8192}\" node ./node_modules/gulp/bin/gulp.js",
18+
"electron": "node build/lib/electron.ts",
19+
"7z": "7z",
20+
"update-grammars": "node build/npm/update-all-grammars.ts",
21+
@@ -114,7 +114,6 @@
2522
"https-proxy-agent": "^7.0.2",
2623
"jschardet": "3.1.4",
2724
"katex": "^0.16.22",
2825
- "kerberos": "2.1.1",
2926
"minimist": "^1.2.8",
30-
"native-is-elevated": "0.8.0",
27+
"native-is-elevated": "0.9.0",
3128
"native-keymap": "^3.3.5",
32-
@@ -160,7 +159,7 @@
29+
@@ -174,7 +173,7 @@
3330
"css-loader": "^6.9.1",
3431
"debounce": "^1.0.0",
3532
"deemon": "^1.13.6",
36-
- "electron": "39.2.7",
33+
- "electron": "39.6.0",
3734
+ "electron": "40.6.0",
3835
"eslint": "^9.36.0",
3936
"eslint-formatter-compact": "^8.40.0",
4037
"eslint-plugin-header": "3.1.1",
41-
@@ -225,9 +224,19 @@
38+
@@ -238,9 +237,19 @@
4239
},
4340
"overrides": {
4441
"node-gyp-build": "4.8.1",
4542
- "kerberos@2.1.1": {
4643
- "node-addon-api": "7.1.0"
47-
- }
4844
+ "@types/node-fetch@^2.5.12": {
4945
+ "form-data": "^3.0.4"
50-
+ },
46+
},
5147
+ "@azure/core-http@^2.3.2": {
5248
+ "form-data": "^4.0.4"
5349
+ },
@@ -57,37 +53,27 @@ Index: third-party-src/package.json
5753
+ "koa": "^3.0.3"
5854
+ },
5955
+ "postcss": "^8.4.31",
60-
+ "playwright": "^1.55.1"
56+
+ "playwright": "^1.55.1",
57+
"serialize-javascript": "^7.0.3"
6158
},
6259
"repository": {
63-
"type": "git",
64-
Index: third-party-src/remote/package.json
60+
Index: code-editor-src/remote/package.json
6561
===================================================================
66-
--- third-party-src.orig/remote/package.json
67-
+++ third-party-src/remote/package.json
68-
@@ -7,7 +7,7 @@
69-
"@microsoft/1ds-post-js": "^3.2.13",
70-
"@vscode/deviceid": "^0.1.1",
71-
"@vscode/iconv-lite-umd": "0.7.1",
72-
- "@vscode/proxy-agent": "^0.36.0",
73-
+ "@vscode/proxy-agent": "^0.37.0",
74-
"@vscode/ripgrep": "^1.15.13",
75-
"@vscode/spdlog": "^0.15.2",
76-
"@vscode/tree-sitter-wasm": "^0.3.0",
77-
@@ -30,11 +30,11 @@
62+
--- code-editor-src.orig/remote/package.json
63+
+++ code-editor-src/remote/package.json
64+
@@ -32,10 +32,10 @@
7865
"https-proxy-agent": "^7.0.2",
7966
"jschardet": "3.1.4",
8067
"katex": "^0.16.22",
8168
- "kerberos": "2.1.1",
8269
"minimist": "^1.2.8",
83-
"native-watchdog": "^1.4.1",
84-
"node-pty": "^1.1.0-beta43",
70+
"node-pty": "^1.2.0-beta.10",
8571
"tas-client": "0.3.1",
8672
+ "undici": "^7.18.2",
8773
"vscode-oniguruma": "1.7.0",
8874
"vscode-regexpp": "^3.1.0",
89-
"vscode-textmate": "^9.3.0",
90-
@@ -42,9 +42,6 @@
75+
"vscode-textmate": "^9.3.2",
76+
@@ -43,9 +43,6 @@
9177
"yazl": "^2.4.3"
9278
},
9379
"overrides": {
@@ -98,10 +84,10 @@ Index: third-party-src/remote/package.json
9884
+ "node-gyp-build": "4.8.1"
9985
}
10086
}
101-
Index: third-party-src/build/lib/mangle/index.ts
87+
Index: code-editor-src/build/lib/mangle/index.ts
10288
===================================================================
103-
--- third-party-src.orig/build/lib/mangle/index.ts
104-
+++ third-party-src/build/lib/mangle/index.ts
89+
--- code-editor-src.orig/build/lib/mangle/index.ts
90+
+++ code-editor-src/build/lib/mangle/index.ts
10591
@@ -430,7 +430,7 @@ export class Mangler {
10692
this.config = config;
10793

‎patches/common/disable-online-services.diff‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Sets update mode to 'none', disables background updates, release notes,
44
natural language settings search, and experiments. Prevents the editor
55
from contacting Microsoft online services out of the box.
66

7-
Index: third-party-src/src/vs/platform/update/common/update.config.contribution.ts
7+
Index: code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
88
===================================================================
9-
--- third-party-src.orig/src/vs/platform/update/common/update.config.contribution.ts
10-
+++ third-party-src/src/vs/platform/update/common/update.config.contribution.ts
11-
@@ -18,7 +18,7 @@ configurationRegistry.registerConfigurat
9+
--- code-editor-src.orig/src/vs/platform/update/common/update.config.contribution.ts
10+
+++ code-editor-src/src/vs/platform/update/common/update.config.contribution.ts
11+
@@ -19,7 +19,7 @@ configurationRegistry.registerConfigurat
1212
'update.mode': {
1313
type: 'string',
1414
enum: ['none', 'manual', 'start', 'default'],
@@ -17,16 +17,16 @@ Index: third-party-src/src/vs/platform/update/common/update.config.contribution.
1717
scope: ConfigurationScope.APPLICATION,
1818
description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
1919
tags: ['usesOnlineServices'],
20-
@@ -42,7 +42,7 @@ configurationRegistry.registerConfigurat
20+
@@ -65,7 +65,7 @@ configurationRegistry.registerConfigurat
2121
},
2222
'update.enableWindowsBackgroundUpdates': {
2323
type: 'boolean',
2424
- default: true,
2525
+ default: false,
2626
scope: ConfigurationScope.APPLICATION,
27-
title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates on Windows"),
28-
description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background on Windows."),
29-
@@ -50,7 +50,7 @@ configurationRegistry.registerConfigurat
27+
title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates"),
28+
description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background."),
29+
@@ -73,7 +73,7 @@ configurationRegistry.registerConfigurat
3030
},
3131
'update.showReleaseNotes': {
3232
type: 'boolean',
@@ -35,10 +35,10 @@ Index: third-party-src/src/vs/platform/update/common/update.config.contribution.
3535
scope: ConfigurationScope.APPLICATION,
3636
description: localize('showReleaseNotes', "Show Release Notes after an update. The Release Notes are fetched from a Microsoft online service."),
3737
tags: ['usesOnlineServices']
38-
Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
38+
Index: code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
3939
===================================================================
40-
--- third-party-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
41-
+++ third-party-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
40+
--- code-editor-src.orig/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
41+
+++ code-editor-src/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
4242
@@ -111,7 +111,7 @@ registry.registerConfiguration({
4343
'workbench.settings.enableNaturalLanguageSearch': {
4444
'type': 'boolean',
@@ -48,11 +48,11 @@ Index: third-party-src/src/vs/workbench/contrib/preferences/common/preferencesCo
4848
'scope': ConfigurationScope.WINDOW,
4949
'tags': ['usesOnlineServices']
5050
},
51-
Index: third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
51+
Index: code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
5252
===================================================================
53-
--- third-party-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
54-
+++ third-party-src/src/vs/workbench/services/assignment/common/assignmentService.ts
55-
@@ -146,7 +146,7 @@ registry.registerConfiguration({
53+
--- code-editor-src.orig/src/vs/workbench/services/assignment/common/assignmentService.ts
54+
+++ code-editor-src/src/vs/workbench/services/assignment/common/assignmentService.ts
55+
@@ -329,7 +329,7 @@ registry.registerConfiguration({
5656
'workbench.enableExperiments': {
5757
'type': 'boolean',
5858
'description': localize('workbench.enableExperiments', "Fetches experiments to run from a Microsoft online service."),

‎patches/common/disable-telemetry-service.diff‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Note: when pulling a new change from upstream, make sure to replace all
99
Microsoft, even if the telemetry is set to OFF.
1010
See: https://github.com/VSCodium/vscodium/issues/26
1111

12-
Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
12+
Index: code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
1313
===================================================================
14-
--- third-party-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
15-
+++ third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
16-
@@ -274,7 +274,7 @@ configurationRegistry.registerConfigurat
14+
--- code-editor-src.orig/src/vs/platform/telemetry/common/telemetryService.ts
15+
+++ code-editor-src/src/vs/platform/telemetry/common/telemetryService.ts
16+
@@ -287,7 +287,7 @@ configurationRegistry.registerConfigurat
1717
'properties': {
1818
[TELEMETRY_SETTING_ID]: {
1919
'type': 'string',
@@ -22,7 +22,7 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
2222
'enumDescriptions': [
2323
localize('telemetry.telemetryLevel.default', "Sends usage data, errors, and crash reports."),
2424
localize('telemetry.telemetryLevel.error', "Sends general error telemetry and crash reports."),
25-
@@ -282,7 +282,7 @@ configurationRegistry.registerConfigurat
25+
@@ -295,7 +295,7 @@ configurationRegistry.registerConfigurat
2626
localize('telemetry.telemetryLevel.off', "Disables all product telemetry.")
2727
],
2828
'markdownDescription': getTelemetryLevelSettingDescription(),
@@ -31,7 +31,7 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
3131
'restricted': true,
3232
'scope': ConfigurationScope.APPLICATION,
3333
'tags': ['usesOnlineServices', 'telemetry'],
34-
@@ -334,7 +334,7 @@ configurationRegistry.registerConfigurat
34+
@@ -347,7 +347,7 @@ configurationRegistry.registerConfigurat
3535
!product.privacyStatementUrl ?
3636
localize('telemetry.enableTelemetry', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.", product.nameLong) :
3737
localize('telemetry.enableTelemetryMd', "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.", product.nameLong, product.privacyStatementUrl),
@@ -40,10 +40,10 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
4040
'restricted': true,
4141
'markdownDeprecationMessage': localize('enableTelemetryDeprecated', "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.", `\`#${TELEMETRY_SETTING_ID}#\``),
4242
'scope': ConfigurationScope.APPLICATION,
43-
Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
43+
Index: code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
4444
===================================================================
45-
--- third-party-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
46-
+++ third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
45+
--- code-editor-src.orig/src/vs/platform/telemetry/common/1dsAppender.ts
46+
+++ code-editor-src/src/vs/platform/telemetry/common/1dsAppender.ts
4747
@@ -19,8 +19,8 @@ export interface IAppInsightsCore {
4848
unload(isAsync: boolean, unloadComplete: (unloadState: ITelemetryUnloadState) => void): void;
4949
}
@@ -55,11 +55,11 @@ Index: third-party-src/src/vs/platform/telemetry/common/1dsAppender.ts
5555

5656
async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
5757
// eslint-disable-next-line local/code-amd-node-module
58-
Index: third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
58+
Index: code-editor-src/src/vs/workbench/electron-browser/desktop.contribution.ts
5959
===================================================================
60-
--- third-party-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts
61-
+++ third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
62-
@@ -340,7 +340,7 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL
60+
--- code-editor-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts
61+
+++ code-editor-src/src/vs/workbench/electron-browser/desktop.contribution.ts
62+
@@ -341,7 +341,7 @@ import product from '../../platform/prod
6363
'telemetry.enableCrashReporter': {
6464
'type': 'boolean',
6565
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),

0 commit comments

Comments
 (0)