diff options
Diffstat (limited to 'editors/vscode/files')
11 files changed, 79 insertions, 24 deletions
diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js index ba67c3735ca2..a48b75cb117a 100644 --- a/editors/vscode/files/patch-build_gulpfile.vscode.js +++ b/editors/vscode/files/patch-build_gulpfile.vscode.js @@ -1,9 +1,9 @@ ---- build/gulpfile.vscode.js.orig 2021-02-03 15:33:23 UTC +--- build/gulpfile.vscode.js.orig 2021-03-04 22:21:59 UTC +++ build/gulpfile.vscode.js -@@ -284,7 +284,7 @@ function packageTask(platform, arch, sourceFolderName, - let result = all +@@ -285,7 +285,7 @@ function packageTask(platform, arch, sourceFolderName, .pipe(util.skipDirectories()) .pipe(util.fixWin32DirectoryPermissions()) + .pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 - .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: true }))) + .pipe(electron(_.extend({}, config, { platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))) .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true })); diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js index daef5ba282ec..8cfd5b6d58f7 100644 --- a/editors/vscode/files/patch-src_main.js +++ b/editors/vscode/files/patch-src_main.js @@ -1,6 +1,6 @@ ---- src/main.js.orig 2021-02-03 15:33:23 UTC +--- src/main.js.orig 2021-03-04 22:21:59 UTC +++ src/main.js -@@ -227,7 +227,7 @@ function configureCommandlineSwitchesSync(cliArgs) { +@@ -150,7 +150,7 @@ function configureCommandlineSwitchesSync(cliArgs) { 'force-color-profile' ]; diff --git a/editors/vscode/files/patch-src_paths.js b/editors/vscode/files/patch-src_paths.js deleted file mode 100644 index e139c632a8e8..000000000000 --- a/editors/vscode/files/patch-src_paths.js +++ /dev/null @@ -1,11 +0,0 @@ ---- src/paths.js.orig 2020-12-16 14:57:12 UTC -+++ src/paths.js -@@ -34,7 +34,7 @@ function getDefaultUserDataPath() { - case 'darwin': - appDataPath = path.join(os.homedir(), 'Library', 'Application Support'); - break; -- case 'linux': -+ case 'linux': case 'freebsd': - appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config'); - break; - default: diff --git a/editors/vscode/files/patch-src_vs_base_common_process.ts b/editors/vscode/files/patch-src_vs_base_common_process.ts new file mode 100644 index 000000000000..75a4b65bd839 --- /dev/null +++ b/editors/vscode/files/patch-src_vs_base_common_process.ts @@ -0,0 +1,11 @@ +--- src/vs/base/common/process.ts.orig 2021-03-11 08:30:51 UTC ++++ src/vs/base/common/process.ts +@@ -19,7 +19,7 @@ else if (typeof globals.vscode !== 'undefined') { + safeProcess = { + + // Supported +- get platform(): 'win32' | 'linux' | 'darwin' { return globals.vscode.process.platform; }, ++ get platform(): 'win32' | 'linux' | 'freebsd' | 'darwin' { return globals.vscode.process.platform; }, + get env() { return globals.vscode.process.env; }, + nextTick(callback: (...args: any[]) => void): void { return setImmediate(callback); }, + diff --git a/editors/vscode/files/patch-src_vs_base_node_userDataPath.js b/editors/vscode/files/patch-src_vs_base_node_userDataPath.js new file mode 100644 index 000000000000..c72878ba13c2 --- /dev/null +++ b/editors/vscode/files/patch-src_vs_base_node_userDataPath.js @@ -0,0 +1,11 @@ +--- src/vs/base/node/userDataPath.js.orig 2021-03-11 08:31:52 UTC ++++ src/vs/base/node/userDataPath.js +@@ -37,7 +37,7 @@ + case 'darwin': + appDataPath = path.join(os.homedir(), 'Library', 'Application Support'); + break; +- case 'linux': ++ case 'linux': case 'freebsd': + appDataPath = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config'); + break; + default: 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 4a3baa06c678..d391fed90eaa 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 2021-02-03 15:33:23 UTC +--- src/vs/code/electron-main/app.ts.orig 2021-03-04 22:21:59 UTC +++ src/vs/code/electron-main/app.ts -@@ -509,7 +509,7 @@ export class CodeApplication extends Disposable { +@@ -525,7 +525,7 @@ export class CodeApplication extends Disposable { services.set(IUpdateService, new SyncDescriptor(Win32UpdateService)); break; diff --git a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts index 89f1e03ce490..14c54d1501f0 100644 --- a/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts +++ b/editors/vscode/files/patch-src_vs_workbench_contrib_extensions_browser_extensionEditor.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-02-03 15:33:23 UTC +--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2021-03-04 22:21:59 UTC +++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts -@@ -1467,7 +1467,8 @@ export class ExtensionEditor extends EditorPane { +@@ -1478,7 +1478,8 @@ export class ExtensionEditor extends EditorPane { switch (platform) { case 'win32': key = rawKeyBinding.win; break; diff --git a/editors/vscode/files/patch-src_vs_workbench_services_extensions_node_proxyResolver.ts b/editors/vscode/files/patch-src_vs_workbench_services_extensions_node_proxyResolver.ts index 820ad5771ec0..0f5cd0a1ed63 100644 --- a/editors/vscode/files/patch-src_vs_workbench_services_extensions_node_proxyResolver.ts +++ b/editors/vscode/files/patch-src_vs_workbench_services_extensions_node_proxyResolver.ts @@ -1,6 +1,6 @@ ---- src/vs/workbench/services/extensions/node/proxyResolver.ts.orig 2020-12-16 14:57:12 UTC +--- src/vs/workbench/services/extensions/node/proxyResolver.ts.orig 2021-03-04 22:21:59 UTC +++ src/vs/workbench/services/extensions/node/proxyResolver.ts -@@ -487,7 +487,7 @@ async function readCaCertificates() { +@@ -488,7 +488,7 @@ async function readCaCertificates() { if (process.platform === 'darwin') { return readMacCaCertificates(); } @@ -9,7 +9,7 @@ return readLinuxCaCertificates(); } return undefined; -@@ -535,6 +535,8 @@ async function readMacCaCertificates() { +@@ -536,6 +536,8 @@ async function readMacCaCertificates() { const linuxCaCertificatePaths = [ '/etc/ssl/certs/ca-certificates.crt', '/etc/ssl/certs/ca-bundle.crt', diff --git a/editors/vscode/files/patch-test_automation_src_code.ts b/editors/vscode/files/patch-test_automation_src_code.ts index 75067ca29d46..d5b9aea83a22 100644 --- a/editors/vscode/files/patch-test_automation_src_code.ts +++ b/editors/vscode/files/patch-test_automation_src_code.ts @@ -1,4 +1,4 @@ ---- test/automation/src/code.ts.orig 2019-12-10 21:16:00 UTC +--- test/automation/src/code.ts.orig 2021-03-04 22:21:59 UTC +++ test/automation/src/code.ts @@ -24,7 +24,7 @@ function getDevElectronPath(): string { switch (process.platform) { @@ -18,3 +18,12 @@ const product = require(path.join(root, 'resources', 'app', 'product.json')); return path.join(root, product.applicationName); } +@@ -145,7 +145,7 @@ export async function spawn(options: SpawnOptions): Pr + '--driver', handle + ]; + +- if (process.platform === 'linux') { ++ if (process.platform === 'linux' || process.platform === 'freebsd') { + args.push('--disable-gpu'); // Linux has trouble in VMs to render properly with GPU enabled + } + diff --git a/editors/vscode/files/patch-test_unit_browser_index.js b/editors/vscode/files/patch-test_unit_browser_index.js new file mode 100644 index 000000000000..6efbdf44537b --- /dev/null +++ b/editors/vscode/files/patch-test_unit_browser_index.js @@ -0,0 +1,11 @@ +--- test/unit/browser/index.js.orig 2021-03-11 08:29:15 UTC ++++ test/unit/browser/index.js +@@ -146,7 +146,7 @@ function consoleLogFn(msg) { + } + + async function runTestsInBrowser(testModules, browserType) { +- const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros ++ const args = (process.platform === 'linux' || process.platform === 'freebsd') && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros + const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug), args }); + const context = await browser.newContext(); + const page = await context.newPage(); diff --git a/editors/vscode/files/patch-yarn.lock b/editors/vscode/files/patch-yarn.lock new file mode 100644 index 000000000000..ef0abfd01712 --- /dev/null +++ b/editors/vscode/files/patch-yarn.lock @@ -0,0 +1,24 @@ +--- yarn.lock.orig 2021-03-07 07:59:05 UTC ++++ yarn.lock +@@ -1430,8 +1430,8 @@ bcrypt-pbkdf@^1.0.0: + + before-after-hook@^2.1.0: + version "2.1.0" +- resolved "https://pkgs.dev.azure.com/terrapin-prod/Terrapin/_packaging/open-source-packages-2/npm/registry/before-after-hook/-/before-after-hook-2.1.0.tgz#0bb562539c98af6479c3e423df1880d022bd9c76" +- integrity sha1-C7ViU5yYr2R5w+Qj3xiA0CK9nHY= ++ resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" ++ integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== + + big.js@^3.1.3: + version "3.2.0" +@@ -6624,8 +6624,8 @@ node-addon-api@^3.0.0, node-addon-api@^3.0.2: + + node-fetch@^2.6.1: + version "2.6.1" +- resolved "https://pkgs.dev.azure.com/terrapin-prod/Terrapin/_packaging/open-source-packages-2/npm/registry/node-fetch/-/node-fetch-2.6.1.tgz#71da3def292fc21adc5670825461ea36c316643c" +- integrity sha1-cdo97ykvwhrcVnCCVGHqNsMWZDw= ++ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" ++ integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + + node-gyp@^7.1.0: + version "7.1.0" |