Skip to content

Commit 9f6a0b4

Browse files
author
Feiyang Liu
committed
update patches so update to 1.102.0 can be performed
1 parent 528356d commit 9f6a0b4

19 files changed

+160
-203
lines changed

‎patches/common/build.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Index: third-party-src/package.json
77
"https-proxy-agent": "^7.0.2",
88
"jschardet": "3.1.4",
99
- "kerberos": "2.1.1",
10-
"minimist": "^1.2.6",
10+
"minimist": "^1.2.8",
1111
"native-is-elevated": "0.7.0",
1212
"native-keymap": "^3.3.5",
1313
@@ -115,7 +114,7 @@
@@ -32,7 +32,7 @@ Index: third-party-src/package.json
3232
"css-loader": "^6.9.1",
3333
"debounce": "^1.0.0",
3434
"deemon": "^1.13.4",
35-
- "electron": "35.5.1",
35+
- "electron": "35.6.0",
3636
+ "electron": "38.7.1",
3737
"eslint": "^9.11.1",
3838
"eslint-formatter-compact": "^8.40.0",
@@ -70,6 +70,6 @@ Index: third-party-src/remote/package.json
7070
"https-proxy-agent": "^7.0.2",
7171
"jschardet": "3.1.4",
7272
- "kerberos": "2.1.1",
73-
"minimist": "^1.2.6",
73+
"minimist": "^1.2.8",
7474
"native-watchdog": "^1.4.1",
7575
"node-pty": "^1.1.0-beta33",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ Index: third-party-src/src/vs/platform/telemetry/common/telemetryService.ts
3333
'restricted': true,
3434
'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}#\``),
3535
'scope': ConfigurationScope.APPLICATION,
36-
Index: third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
36+
Index: third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
3737
===================================================================
38-
--- third-party-src.orig/src/vs/workbench/electron-sandbox/desktop.contribution.ts
39-
+++ third-party-src/src/vs/workbench/electron-sandbox/desktop.contribution.ts
40-
@@ -322,7 +322,7 @@ import { registerWorkbenchContribution2,
38+
--- third-party-src.orig/src/vs/workbench/electron-browser/desktop.contribution.ts
39+
+++ third-party-src/src/vs/workbench/electron-browser/desktop.contribution.ts
40+
@@ -330,7 +330,7 @@ import { registerWorkbenchContribution2,
4141
'telemetry.enableCrashReporter': {
4242
'type': 'boolean',
4343
'description': localize('telemetry.enableCrashReporting', "Enable crash reports to be collected. This helps us improve stability. \nThis option requires restart to take effect."),

‎patches/common/integration.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Index: third-party-src/src/vs/platform/product/common/product.ts
7878
@@ -61,8 +61,8 @@ else {
7979
if (Object.keys(product).length === 0) {
8080
Object.assign(product, {
81-
version: '1.95.0-dev',
81+
version: '1.102.0-dev',
8282
- nameShort: 'Code - OSS Dev',
8383
- nameLong: 'Code - OSS Dev',
8484
+ nameShort: 'Code Editor',

‎patches/common/remove-builtin-extensions.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Index: third-party-src/product.json
2424
- },
2525
- {
2626
- "name": "ms-vscode.js-debug",
27-
- "version": "1.100.1",
28-
- "sha256": "8c2218df3422d45b95e96d9d28cdc4aa4426a2799aaaedd862d3f60ecab03844",
27+
- "version": "1.102.0",
28+
- "sha256": "0e8ed27ba2d707bcfb008e89e490c2d287d9537d84893b0792a4ee418274fa0b",
2929
- "repo": "https://github.com/microsoft/vscode-js-debug",
3030
- "metadata": {
3131
- "id": "25629058-ddac-4e17-abba-74678e126c5d",

‎patches/common/remove-cloud-changes-feature.diff‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ Index: third-party-src/src/vs/workbench/workbench.common.main.ts
22
===================================================================
33
--- third-party-src.orig/src/vs/workbench/workbench.common.main.ts
44
+++ third-party-src/src/vs/workbench/workbench.common.main.ts
5-
@@ -368,9 +368,6 @@ import './contrib/userDataSync/browser/u
5+
@@ -368,12 +368,6 @@ import './contrib/userDataSync/browser/u
66
// User Data Profiles
77
import './contrib/userDataProfile/browser/userDataProfile.contribution.js';
88

99
-// Continue Edit Session
1010
-import './contrib/editSessions/browser/editSessions.contribution.js';
11+
-
12+
-// Remote Coding Agents
13+
-import './contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js';
1114
-
1215
// Code Actions
1316
import './contrib/codeActions/browser/codeActions.contribution.js';

‎patches/internal/build.diff‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,21 @@ Index: third-party-src/package.json
155155
"@vscode/iconv-lite-umd": "0.7.0",
156156
"@vscode/policy-watcher": "^1.3.2",
157157
"@vscode/proxy-agent": "^0.32.0",
158-
- "@vscode/ripgrep": "^1.15.11",
158+
- "@vscode/ripgrep": "^1.15.13",
159159
"@vscode/spdlog": "^0.15.2",
160160
"@vscode/sqlite3": "5.1.8-vscode",
161161
"@vscode/sudo-prompt": "9.3.1",
162162
@@ -102,7 +101,6 @@
163163
"jschardet": "3.1.4",
164-
"minimist": "^1.2.6",
164+
"minimist": "^1.2.8",
165165
"native-is-elevated": "0.7.0",
166166
- "native-keymap": "^3.3.5",
167167
"native-watchdog": "^1.4.1",
168168
"node-pty": "^1.1.0-beta33",
169-
"open": "^8.4.2",
170-
@@ -140,7 +137,6 @@
169+
"open": "^10.1.2",
170+
@@ -140,7 +138,6 @@
171171
"@typescript-eslint/utils": "^8.8.0",
172-
"@vscode/gulp-electron": "^1.36.0",
172+
"@vscode/gulp-electron": "^1.37.1",
173173
"@vscode/l10n-dev": "0.0.35",
174174
- "@vscode/telemetry-extractor": "^1.10.2",
175175
"@vscode/test-cli": "^0.0.6",
@@ -183,7 +183,7 @@ Index: third-party-src/remote/package.json
183183
"@vscode/deviceid": "^0.1.1",
184184
"@vscode/iconv-lite-umd": "0.7.0",
185185
"@vscode/proxy-agent": "^0.32.0",
186-
- "@vscode/ripgrep": "^1.15.11",
186+
- "@vscode/ripgrep": "^1.15.13",
187187
"@vscode/spdlog": "^0.15.2",
188188
"@vscode/tree-sitter-wasm": "^0.1.4",
189189
"@vscode/vscode-languagedetection": "1.0.21",
@@ -195,7 +195,7 @@ Index: third-party-src/build/package.json
195195
"@types/workerpool": "^6.4.0",
196196
"@types/xml2js": "0.0.33",
197197
"@vscode/iconv-lite-umd": "0.7.0",
198-
- "@vscode/ripgrep": "^1.15.10",
198+
- "@vscode/ripgrep": "^1.15.13",
199199
"@vscode/vsce": "2.20.1",
200200
"byline": "^5.0.0",
201201
"cssnano": "^7.0.7",

‎patches/internal/package-overrides.diff‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Index: third-party-src/package.json
55
--- third-party-src.orig/package.json
66
+++ third-party-src/package.json
77
@@ -102,7 +102,7 @@
8-
"minimist": "^1.2.6",
8+
"minimist": "^1.2.8",
99
"native-is-elevated": "0.7.0",
1010
"native-watchdog": "^1.4.1",
1111
- "node-pty": "^1.1.0-beta33",
1212
+ "node-pty": "1.1.0-beta33",
13-
"open": "^8.4.2",
13+
"open": "^10.1.2",
1414
"tas-client-umd": "0.2.0",
1515
"v8-inspect-profiler": "^0.1.1",
1616
Index: third-party-src/extensions/emmet/package.json
@@ -34,7 +34,7 @@ Index: third-party-src/extensions/css-language-features/package.json
3434
]
3535
},
3636
"dependencies": {
37-
- "vscode-languageclient": "^10.0.0-next.15",
37+
- "vscode-languageclient": "^10.0.0-next.16",
3838
+ "vscode-languageclient": "10.0.0-next.9",
3939
"vscode-uri": "^3.1.0"
4040
},
@@ -61,7 +61,7 @@ Index: third-party-src/extensions/html-language-features/package.json
6161
},
6262
"dependencies": {
6363
"@vscode/extension-telemetry": "^0.9.8",
64-
- "vscode-languageclient": "^10.0.0-next.15",
64+
- "vscode-languageclient": "^10.0.0-next.16",
6565
+ "vscode-languageclient": "10.0.0-next.9",
6666
"vscode-uri": "^3.1.0"
6767
},
@@ -88,7 +88,7 @@ Index: third-party-src/extensions/json-language-features/package.json
8888
"dependencies": {
8989
"@vscode/extension-telemetry": "^0.9.8",
9090
"request-light": "^0.8.0",
91-
- "vscode-languageclient": "^10.0.0-next.15"
91+
- "vscode-languageclient": "^10.0.0-next.16"
9292
+ "vscode-languageclient": "10.0.0-next.9"
9393
},
9494
"devDependencies": {
@@ -111,16 +111,16 @@ Index: third-party-src/extensions/css-language-features/server/package.json
111111
===================================================================
112112
--- third-party-src.orig/extensions/css-language-features/server/package.json
113113
+++ third-party-src/extensions/css-language-features/server/package.json
114-
@@ -12,7 +12,7 @@
114+
@@ -11,7 +11,7 @@
115115
"dependencies": {
116116
"@vscode/l10n": "^0.0.18",
117-
"vscode-css-languageservice": "^6.3.6",
117+
"vscode-css-languageservice": "^6.3.7",
118118
- "vscode-languageserver": "^10.0.0-next.13",
119119
+ "vscode-languageserver": "10.0.0-next.7",
120120
"vscode-uri": "^3.1.0"
121121
},
122122
"devDependencies": {
123-
@@ -27,5 +27,13 @@
123+
@@ -26,5 +26,13 @@
124124
"install-server-next": "npm install vscode-languageserver@next",
125125
"install-server-local": "npm install vscode-languageserver",
126126
"test": "node ./test/index.js"
@@ -138,18 +138,18 @@ Index: third-party-src/extensions/html-language-features/server/package.json
138138
===================================================================
139139
--- third-party-src.orig/extensions/html-language-features/server/package.json
140140
+++ third-party-src/extensions/html-language-features/server/package.json
141-
@@ -12,8 +12,8 @@
141+
@@ -11,8 +11,8 @@
142142
"@vscode/l10n": "^0.0.18",
143-
"vscode-css-languageservice": "^6.3.6",
144-
"vscode-html-languageservice": "^5.5.0",
143+
"vscode-css-languageservice": "^6.3.7",
144+
"vscode-html-languageservice": "^5.5.1",
145145
- "vscode-languageserver": "^10.0.0-next.13",
146146
- "vscode-languageserver-textdocument": "^1.0.12",
147147
+ "vscode-languageserver": "10.0.0-next.7",
148148
+ "vscode-languageserver-textdocument": "1.0.12",
149149
"vscode-uri": "^3.1.0"
150150
},
151151
"devDependencies": {
152-
@@ -28,5 +28,13 @@
152+
@@ -27,5 +27,13 @@
153153
"install-server-next": "npm install vscode-languageserver@next",
154154
"install-server-local": "npm install vscode-languageserver",
155155
"test": "npm run compile && node ./test/index.js"
@@ -167,16 +167,16 @@ Index: third-party-src/extensions/json-language-features/server/package.json
167167
===================================================================
168168
--- third-party-src.orig/extensions/json-language-features/server/package.json
169169
+++ third-party-src/extensions/json-language-features/server/package.json
170-
@@ -16,7 +16,7 @@
170+
@@ -15,7 +15,7 @@
171171
"jsonc-parser": "^3.3.1",
172172
"request-light": "^0.8.0",
173-
"vscode-json-languageservice": "^5.6.0",
173+
"vscode-json-languageservice": "^5.6.1",
174174
- "vscode-languageserver": "^10.0.0-next.13",
175175
+ "vscode-languageserver": "10.0.0-next.7",
176176
"vscode-uri": "^3.1.0"
177177
},
178178
"devDependencies": {
179-
@@ -34,5 +34,13 @@
179+
@@ -33,5 +33,13 @@
180180
"install-server-next": "npm install vscode-languageserver@next",
181181
"install-server-local": "npm link vscode-languageserver-server",
182182
"version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"

‎patches/sagemaker/sagemaker-integration.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ Index: third-party-src/src/vs/platform/product/common/product.ts
106106
===================================================================
107107
--- third-party-src.orig/src/vs/platform/product/common/product.ts
108108
+++ third-party-src/src/vs/platform/product/common/product.ts
109-
@@ -69,15 +69,17 @@ else {
109+
@@ -69,12 +69,14 @@ else {
110110
if (Object.keys(product).length === 0) {
111111
Object.assign(product, {
112-
version: '1.95.0-dev',
112+
version: '1.102.0-dev',
113113
- nameShort: 'Code Editor',
114114
- nameLong: 'Code Editor',
115115
+ nameShort: 'SageMaker Code Editor',

‎patches/web-embedded/add-a-much-simpler-workbench.diff‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ workbench HTML file at compile time.
77
src/vs/code/browser/workbench/workbench.ts | 634 ++-------------------
88
1 file changed, 52 insertions(+), 582 deletions(-)
99

10-
Index: third-party-src/src/vs/code/browser/workbench/workbench.ts
10+
Index: AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
1111
===================================================================
12-
--- third-party-src.orig/src/vs/code/browser/workbench/workbench.ts
13-
+++ third-party-src/src/vs/code/browser/workbench/workbench.ts
14-
@@ -3,594 +3,14 @@
12+
--- AWSCodeOSS.orig/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
13+
+++ AWSCodeOSS/build/private/code-editor-src/src/vs/code/browser/workbench/workbench.ts
14+
@@ -3,593 +3,14 @@
1515
* Licensed under the MIT License. See License.txt in the project root for license information.
1616
*--------------------------------------------------------------------------------------------*/
1717

1818
-import { isStandalone } from '../../../base/browser/browser.js';
19+
-import { addDisposableListener } from '../../../base/browser/dom.js';
1920
import { mainWindow } from '../../../base/browser/window.js';
2021
-import { VSBuffer, decodeBase64, encodeBase64 } from '../../../base/common/buffer.js';
2122
-import { Emitter } from '../../../base/common/event.js';
@@ -354,9 +355,7 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench.ts
354355
- return;
355356
- }
356357
-
357-
- const fn = () => this.onDidChangeLocalStorage();
358-
- mainWindow.addEventListener('storage', fn);
359-
- this.onDidChangeLocalStorageDisposable = { dispose: () => mainWindow.removeEventListener('storage', fn) };
358+
- this.onDidChangeLocalStorageDisposable = addDisposableListener(mainWindow, 'storage', () => this.onDidChangeLocalStorage());
360359
- }
361360
-
362361
- private stopListening(): void {
@@ -607,8 +606,8 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench.ts
607606

608607
(async function () {
609608
const start = Date.now();
610-
@@ -600,14 +20,21 @@ function readCookie(name: string): strin
611-
const vsCodeCdn = urlSearch.get('vsCodeCdn');
609+
@@ -599,14 +20,21 @@ function readCookie(name: string): strin
610+
const vsCodeCdn = urlSearch.get('vsCodeCdn') ?? mainWindow.location.origin;
612611
const isDevo = urlSearch.get('isDevo') === 'true';
613612
// Find config by checking for DOM
614613
+ let config: IWorkbenchConstructionOptions & {
@@ -634,7 +633,7 @@ Index: third-party-src/src/vs/code/browser/workbench/workbench.ts
634633
}
635634

636635
if(!isDevo) {
637-
@@ -618,21 +45,43 @@ function readCookie(name: string): strin
636+
@@ -617,21 +45,43 @@ function readCookie(name: string): strin
638637
};
639638
}
640639

0 commit comments

Comments
 (0)