diff options
Diffstat (limited to 'editors/vscode/files')
8 files changed, 77 insertions, 16 deletions
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js index 52eeae9415d4..7ed6ec5a8421 100644 --- a/editors/vscode/files/patch-build_gulpfile.extensions.js +++ b/editors/vscode/files/patch-build_gulpfile.extensions.js @@ -1,11 +1,11 @@ ---- build/gulpfile.extensions.js.orig 2024-12-10 22:22:47 UTC +--- build/gulpfile.extensions.js.orig 2025-10-08 13:50:39 UTC +++ build/gulpfile.extensions.js -@@ -247,7 +247,7 @@ const compileNonNativeExtensionsBuildTask = task.defin +@@ -236,7 +236,7 @@ const compileNonNativeExtensionsBuildTask = task.defin * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that. */ const compileNonNativeExtensionsBuildTask = task.define('compile-non-native-extensions-build', task.series( - bundleMarketplaceExtensionsBuildTask, + // bundleMarketplaceExtensionsBuildTask, - task.define('bundle-non-native-extensions-build', () => ext.packageNonNativeLocalExtensionsStream().pipe(gulp.dest('.build'))) + task.define('bundle-non-native-extensions-build', () => ext.packageNonNativeLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))) )); gulp.task(compileNonNativeExtensionsBuildTask); diff --git a/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts b/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts index 1d3e446974f1..b595a907f5d8 100644 --- a/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts +++ b/editors/vscode/files/patch-build_lib_propertyInitOrderChecker.ts @@ -1,6 +1,6 @@ ---- build/lib/propertyInitOrderChecker.ts.orig 2025-06-11 13:47:56 UTC +--- build/lib/propertyInitOrderChecker.ts.orig 2025-09-09 22:02:15 UTC +++ build/lib/propertyInitOrderChecker.ts -@@ -36,7 +36,7 @@ function createProgram(tsconfigPath: string): ts.Progr +@@ -43,7 +43,7 @@ function createProgram(tsconfigPath: string): ts.Progr function createProgram(tsconfigPath: string): ts.Program { const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile); diff --git a/editors/vscode/files/patch-package.json b/editors/vscode/files/patch-package.json new file mode 100644 index 000000000000..ba771c020e55 --- /dev/null +++ b/editors/vscode/files/patch-package.json @@ -0,0 +1,14 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- package.json.orig 2025-10-08 13:50:39 UTC ++++ package.json +@@ -107,6 +107,7 @@ + "native-is-elevated": "0.7.0", + "native-keymap": "^3.3.5", + "native-watchdog": "^1.4.1", ++ "node-ovsx-sign": "^1.2.0", + "node-pty": "1.1.0-beta35", + "open": "^10.1.2", + "tas-client-umd": "0.2.0", diff --git a/editors/vscode/files/patch-src_bootstrap-node.ts b/editors/vscode/files/patch-src_bootstrap-node.ts index c378be1c577c..555c2a2f8f3b 100644 --- a/editors/vscode/files/patch-src_bootstrap-node.ts +++ b/editors/vscode/files/patch-src_bootstrap-node.ts @@ -1,6 +1,6 @@ ---- src/bootstrap-node.ts.orig 2025-02-10 13:07:56 UTC +--- src/bootstrap-node.ts.orig 2025-09-09 22:02:15 UTC +++ src/bootstrap-node.ts -@@ -152,7 +152,7 @@ export function configurePortable(product: Partial<IPr +@@ -150,7 +150,7 @@ export function configurePortable(product: Partial<IPr return process.env['VSCODE_PORTABLE']; } diff --git a/editors/vscode/files/patch-src_main.ts b/editors/vscode/files/patch-src_main.ts index c756bdf63132..c96f1793950b 100644 --- a/editors/vscode/files/patch-src_main.ts +++ b/editors/vscode/files/patch-src_main.ts @@ -1,6 +1,6 @@ ---- src/main.ts.orig 2025-03-12 13:24:52 UTC +--- src/main.ts.orig 2025-09-09 22:02:15 UTC +++ src/main.ts -@@ -141,7 +141,7 @@ if (userLocale) { +@@ -138,7 +138,7 @@ if (userLocale) { // Pseudo Language Language Pack is being used. // In that case, use `en` as the Electron locale. @@ -9,8 +9,8 @@ const electronLocale = (!userLocale || userLocale === 'qps-ploc') ? 'en' : userLocale; app.commandLine.appendSwitch('lang', electronLocale); } -@@ -231,7 +231,7 @@ function configureCommandlineSwitchesSync(cliArgs: Nat - 'proxy-bypass-list' +@@ -230,7 +230,7 @@ function configureCommandlineSwitchesSync(cliArgs: Nat + 'remote-debugging-port' ]; - if (process.platform === 'linux') { diff --git a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts index 023e708012a8..219b265b358b 100644 --- a/editors/vscode/files/patch-src_vs_code_electron-main_app.ts +++ b/editors/vscode/files/patch-src_vs_code_electron-main_app.ts @@ -1,6 +1,6 @@ ---- src/vs/code/electron-main/app.ts.orig 2025-06-23 07:50:00 UTC +--- src/vs/code/electron-main/app.ts.orig 2025-09-09 22:02:15 UTC +++ src/vs/code/electron-main/app.ts -@@ -990,6 +990,7 @@ export class CodeApplication extends Disposable { +@@ -988,6 +988,7 @@ export class CodeApplication extends Disposable { break; case 'linux': diff --git a/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts new file mode 100644 index 000000000000..b10a1adb8f06 --- /dev/null +++ b/editors/vscode/files/patch-src_vs_platform_extensionManagement_node_extensionSignatureVerificationService.ts @@ -0,0 +1,47 @@ +https://github.com/eclipse/openvsx/issues/543 +https://github.com/termux/termux-packages/issues/24739 +https://github.com/termux/termux-packages/pull/24757 + +--- src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts.orig 2025-08-20 15:13:53 UTC ++++ src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts +@@ -35,7 +35,7 @@ declare module vsceSign { + } + + declare module vsceSign { +- export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<ExtensionSignatureVerificationResult>; ++ export function verify(vsixFilePath: string, signatureArchiveFilePath: string, verbose: boolean): Promise<boolean>; + } + + /** +@@ -67,7 +67,7 @@ export class ExtensionSignatureVerificationService imp + } + + private async resolveVsceSign(): Promise<typeof vsceSign> { +- const mod = '@vscode/vsce-sign'; ++ const mod = 'node-ovsx-sign'; + return import(mod); + } + +@@ -87,7 +87,21 @@ export class ExtensionSignatureVerificationService imp + + try { + this.logService.trace(`Verifying extension signature for ${extensionId}...`); +- result = await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ let isSignatureValid = ++ await module.verify(vsixFilePath, signatureArchiveFilePath, this.logService.getLevel() === LogLevel.Trace); ++ if (isSignatureValid) { ++ result = { ++ code: ExtensionSignatureVerificationCode.Success, ++ didExecute: true, ++ output: "The extension signature is valid." ++ }; ++ } else { ++ result = { ++ code: ExtensionSignatureVerificationCode.SignatureIsNotValid, ++ didExecute: true, ++ output: "The extension signature is invalid." ++ }; ++ } + } catch (e) { + result = { + code: ExtensionSignatureVerificationCode.UnknownError, diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts index e3e4afbe21d0..0c4d05bf22f0 100644 --- a/editors/vscode/files/patch-test_automation_src_electron.ts +++ b/editors/vscode/files/patch-test_automation_src_electron.ts @@ -1,6 +1,6 @@ ---- test/automation/src/electron.ts.orig 2025-08-06 20:09:28 UTC +--- test/automation/src/electron.ts.orig 2025-09-09 22:02:15 UTC +++ test/automation/src/electron.ts -@@ -86,6 +86,7 @@ export function getDevElectronPath(): string { +@@ -95,6 +95,7 @@ export function getDevElectronPath(): string { case 'darwin': return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron'); case 'linux': @@ -8,7 +8,7 @@ return join(buildPath, 'electron', `${product.applicationName}`); case 'win32': return join(buildPath, 'electron', `${product.nameShort}.exe`); -@@ -98,7 +99,8 @@ export function getBuildElectronPath(root: string): st +@@ -107,7 +108,8 @@ export function getBuildElectronPath(root: string): st switch (process.platform) { case 'darwin': return join(root, 'Contents', 'MacOS', 'Electron'); |