git: afefe672ba07 - main - editors/vscode: update to 1.67.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 May 2022 02:30:49 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=afefe672ba07d8c58a19a161c7d552b5356ac182
commit afefe672ba07d8c58a19a161c7d552b5356ac182
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2022-05-19 02:28:51 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2022-05-19 02:30:41 +0000
editors/vscode: update to 1.67.2
Changelog:
- https://code.visualstudio.com/updates/v1_66
- https://code.visualstudio.com/updates/v1_67
---
editors/vscode/Makefile | 13 +++---
editors/vscode/distinfo | 18 ++++----
.../files/patch-build_gulpfile.extensions.js | 8 ++--
.../vscode/files/patch-build_gulpfile.vscode.js | 4 +-
.../vscode/files/patch-build_lib_layersChecker.ts | 4 +-
.../vscode/files/patch-build_npm_postinstall.js | 14 +++---
...ions_vscode-test-resolver_src_util_processes.ts | 4 +-
editors/vscode/files/patch-product.json | 10 ++--
editors/vscode/files/patch-src_main.js | 4 +-
.../files/patch-src_vs_base_common_platform.ts | 6 +--
editors/vscode/files/patch-src_vs_base_node_ps.ts | 6 +--
.../files/patch-src_vs_code_electron-main_app.ts | 4 +-
...h_contrib_extensions_browser_extensionEditor.ts | 4 +-
.../files/patch-test_automation_src_electron.ts | 29 ++++++++++++
.../patch-test_automation_src_electronDriver.ts | 29 ------------
editors/vscode/files/patch-test_smoke_src_main.ts | 20 --------
editors/vscode/pkg-plist | 53 +++++++++++++++++-----
17 files changed, 119 insertions(+), 111 deletions(-)
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 0fd48ee4de57..234006286a4d 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,5 +1,5 @@
PORTNAME= vscode
-DISTVERSION= 1.65.2
+DISTVERSION= 1.67.2
CATEGORIES= editors
MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
https://nodejs.org/dist/v${NODE_VER}/:node_headers \
@@ -45,7 +45,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \
libdrm.so:graphics/libdrm \
libpng.so:graphics/png \
libwebp.so:graphics/webp \
- libavcodec.so:multimedia/ffmpeg \
libvpx.so:multimedia/libvpx \
libopenh264.so:multimedia/openh264 \
libcups.so:print/cups \
@@ -63,13 +62,13 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
TEST_DEPENDS= electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \
bash:shells/bash
-USES= desktop-file-utils gl gmake gnome jpeg pkgconfig \
+USES= desktop-file-utils gl gmake gnome iconv jpeg pkgconfig \
python:build shebangfix xorg
USE_GITHUB= yes
GH_ACCOUNT= microsoft
-SOURCE_COMMIT_HASH= c722ca6c7eed3d7987c0d5c3df5c45f6b15e77d1
+SOURCE_COMMIT_HASH= c3511e6c69bb39013c4a4b7b9566ec1ca73fc4d5
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -81,7 +80,7 @@ USE_GNOME= atk cairo pango gdkpixbuf2 gtk30 libxml2 libxslt
USE_LDCONFIG= ${DATADIR}
# See ${WRKSRC}/remote/.yarnrc for NODE_VER
-NODE_VER= 14.16.0
+NODE_VER= 16.13.0
NODE_VER_MAJOR= ${NODE_VER:C/\..*$//}
# See ${WRKSRC}/build/package.json for ESBUILD_VER_BUILD
ESBUILD_VER_BUILD= 0.14.2
@@ -104,7 +103,7 @@ MAKE_ENV+= PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/pw-browsers \
# This is a workaround to avoid filesystem violations during poudriere build
MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1
-ELECTRON_DIR= ${.CURDIR}/../../devel/electron13
+ELECTRON_DIR= ${.CURDIR}/../../devel/electron17
.include "${ELECTRON_DIR}/Makefile.version"
ELECTRON_DOWNLOAD_URL= https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
@@ -201,7 +200,7 @@ do-build:
${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
${SED} -e 's/ / */' > SHASUMS256.txt
# build and package vscode
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.json
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn run tsc -p build/tsconfig.build.json
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-linux-x64-min
# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-linux-x64-min
# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} yarn gulp vscode-reh-web-linux-x64-min
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 63a38b04e560..68ec1634e32f 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1651648451
+TIMESTAMP = 1652921429
SHA256 (vscode/esbuild-freebsd-64-0.14.2.tgz) = 9e5669e0afa0bdccdce9ab5c07eeec45cc3116ebdeb2739ff7f11e27c6ab6c34
SIZE (vscode/esbuild-freebsd-64-0.14.2.tgz) = 3228893
SHA256 (vscode/esbuild-freebsd-64-0.11.23.tgz) = 976dc94c9aa92d7ef029c1f5e246883986fa92626aba8c8a37876a6929c64c30
SIZE (vscode/esbuild-freebsd-64-0.11.23.tgz) = 3108323
-SHA256 (vscode/node-v14.16.0-headers.tar.gz) = 4b44b92903a61c29af20550f9d25bfc3029657df6b5f0a12072a70360f7eedee
-SIZE (vscode/node-v14.16.0-headers.tar.gz) = 597013
-SHA256 (vscode/yarn-offline-cache-1.65.2.tar.gz) = 821cd12c98a3d0ab8ea2a6560062262a9b54c54eb75ca1d8a5c06bf70b8d87b9
-SIZE (vscode/yarn-offline-cache-1.65.2.tar.gz) = 156805523
-SHA256 (vscode/vscode-marketplace-exts-1.65.2.tar.gz) = 6209687ecb74bc4507de6e2aa5c270ea5d4673fffa9698eedd5898ddb0313a03
-SIZE (vscode/vscode-marketplace-exts-1.65.2.tar.gz) = 1538413
-SHA256 (vscode/microsoft-vscode-1.65.2_GH0.tar.gz) = bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
-SIZE (vscode/microsoft-vscode-1.65.2_GH0.tar.gz) = 14424135
+SHA256 (vscode/node-v16.13.0-headers.tar.gz) = 9abfc6dcd32bce3b9a978b8c23b8bb48a562c94919feba489f9bb9d4bbeeae66
+SIZE (vscode/node-v16.13.0-headers.tar.gz) = 561593
+SHA256 (vscode/yarn-offline-cache-1.67.2.tar.gz) = 256e42fa3a937715e3cf8b70e684de767adbeff662769be23e30a9d455d9831c
+SIZE (vscode/yarn-offline-cache-1.67.2.tar.gz) = 155547818
+SHA256 (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 0c79dcc3891da8720965bb1e37bf5b06d6ff468de3591a6467d0ff4c35b4894c
+SIZE (vscode/vscode-marketplace-exts-1.67.2.tar.gz) = 1557167
+SHA256 (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 3edf6b340a9d49721d170ac14884a73502091122aac8c3a6190047d3ef9b15c8
+SIZE (vscode/microsoft-vscode-1.67.2_GH0.tar.gz) = 14731169
diff --git a/editors/vscode/files/patch-build_gulpfile.extensions.js b/editors/vscode/files/patch-build_gulpfile.extensions.js
index fb348fe16a9b..1b49af99d5b1 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 2022-02-02 16:57:24 UTC
+--- build/gulpfile.extensions.js.orig 2022-05-16 17:42:35 UTC
+++ build/gulpfile.extensions.js
-@@ -221,7 +221,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
+@@ -222,7 +222,7 @@ const cleanExtensionsBuildTask = task.define('clean-ex
const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
cleanExtensionsBuildTask,
task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
-- task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
-+// task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+- task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
++// task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
));
gulp.task(compileExtensionsBuildTask);
diff --git a/editors/vscode/files/patch-build_gulpfile.vscode.js b/editors/vscode/files/patch-build_gulpfile.vscode.js
index b027aa6e943f..e6a1e71718e9 100644
--- a/editors/vscode/files/patch-build_gulpfile.vscode.js
+++ b/editors/vscode/files/patch-build_gulpfile.vscode.js
@@ -1,6 +1,6 @@
---- build/gulpfile.vscode.js.orig 2022-03-10 14:14:09 UTC
+--- build/gulpfile.vscode.js.orig 2022-05-16 17:42:35 UTC
+++ build/gulpfile.vscode.js
-@@ -299,7 +299,7 @@ function packageTask(platform, arch, sourceFolderName,
+@@ -298,7 +298,7 @@ function packageTask(platform, arch, sourceFolderName,
.pipe(util.skipDirectories())
.pipe(util.fixWin32DirectoryPermissions())
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index 30c9f773faf0..e1a552ca87d9 100644
--- a/editors/vscode/files/patch-build_lib_layersChecker.ts
+++ b/editors/vscode/files/patch-build_lib_layersChecker.ts
@@ -1,6 +1,6 @@
---- build/lib/layersChecker.ts.orig 2022-03-10 14:14:09 UTC
+--- build/lib/layersChecker.ts.orig 2022-05-16 17:42:35 UTC
+++ build/lib/layersChecker.ts
-@@ -302,7 +302,7 @@ function checkFile(program: ts.Program, sourceFile: ts
+@@ -307,7 +307,7 @@ function checkFile(program: ts.Program, sourceFile: ts
function createProgram(tsconfigPath: string): ts.Program {
const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js
index 8961fc41dbc0..ba263fc339d8 100644
--- a/editors/vscode/files/patch-build_npm_postinstall.js
+++ b/editors/vscode/files/patch-build_npm_postinstall.js
@@ -1,18 +1,16 @@
---- build/npm/postinstall.js.orig 2021-09-22 11:45:58 UTC
+--- build/npm/postinstall.js.orig 2022-04-11 07:30:00 UTC
+++ build/npm/postinstall.js
-@@ -21,8 +21,9 @@ function yarnInstall(location, opts) {
+@@ -20,7 +20,8 @@ function yarnInstall(location, opts) {
const raw = process.env['npm_config_argv'] || '{}';
const argv = JSON.parse(raw);
const original = argv.original || [];
-- const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile');
-- if (opts.ignoreEngines) {
-+ const passargs = ['--ignore-optional', '--frozen-lockfile', '--offline', '--no-progress', '--verbose'];
+- const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files');
++ const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose'];
+ const args = original.filter(arg => passargs.includes(arg));
-+ if (opts.ignoreEngines) {
+ if (opts.ignoreEngines) {
args.push('--ignore-engines');
delete opts.ignoreEngines;
- }
-@@ -90,5 +91,5 @@ runtime "${runtime}"`;
+@@ -91,5 +92,5 @@ runtime "${runtime}"`;
yarnInstall(watchPath);
}
diff --git a/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts b/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts
index 56c167603664..bf58a3741ff0 100644
--- a/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts
+++ b/editors/vscode/files/patch-extensions_vscode-test-resolver_src_util_processes.ts
@@ -1,4 +1,4 @@
---- extensions/vscode-test-resolver/src/util/processes.ts.orig 2021-02-03 15:33:23 UTC
+--- extensions/vscode-test-resolver/src/util/processes.ts.orig 2022-04-11 07:30:00 UTC
+++ extensions/vscode-test-resolver/src/util/processes.ts
@@ -20,7 +20,7 @@ export function terminateProcess(p: cp.ChildProcess, e
} catch (err) {
@@ -8,4 +8,4 @@
+ } else if (process.platform === 'darwin' || process.platform === 'linux' || process.platform === 'freebsd') {
try {
const cmd = path.join(extensionPath, 'scripts', 'terminateProcess.sh');
- const result = cp.spawnSync(cmd, [p.pid.toString()]);
+ const result = cp.spawnSync(cmd, [p.pid!.toString()]);
diff --git a/editors/vscode/files/patch-product.json b/editors/vscode/files/patch-product.json
index 3ad34eea370d..e998d9776de9 100644
--- a/editors/vscode/files/patch-product.json
+++ b/editors/vscode/files/patch-product.json
@@ -1,9 +1,9 @@
---- product.json.orig 2022-02-02 16:57:24 UTC
+--- product.json.orig 2022-05-16 17:42:35 UTC
+++ product.json
-@@ -34,6 +34,17 @@
- "GitHub.remotehub",
- "GitHub.remotehub-insiders"
- ],
+@@ -28,6 +28,17 @@
+ "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
+ "urlProtocol": "code-oss",
+ "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
+ "documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484",
+ "extensionsGallery": {
+ "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.js
index 981f8adb760d..6ad41829acd0 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 2022-03-10 14:14:09 UTC
+--- src/main.js.orig 2022-04-11 07:30:00 UTC
+++ src/main.js
-@@ -162,7 +162,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+@@ -160,7 +160,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
'force-color-profile'
];
diff --git a/editors/vscode/files/patch-src_vs_base_common_platform.ts b/editors/vscode/files/patch-src_vs_base_common_platform.ts
index 750b478146b4..455f161e984a 100644
--- a/editors/vscode/files/patch-src_vs_base_common_platform.ts
+++ b/editors/vscode/files/patch-src_vs_base_common_platform.ts
@@ -1,6 +1,6 @@
---- src/vs/base/common/platform.ts.orig 2022-03-10 14:14:09 UTC
+--- src/vs/base/common/platform.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/base/common/platform.ts
-@@ -80,7 +80,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -78,7 +78,7 @@ if (typeof navigator === 'object' && !isElectronRender
_isWindows = _userAgent.indexOf('Windows') >= 0;
_isMacintosh = _userAgent.indexOf('Macintosh') >= 0;
_isIOS = (_userAgent.indexOf('Macintosh') >= 0 || _userAgent.indexOf('iPad') >= 0 || _userAgent.indexOf('iPhone') >= 0) && !!navigator.maxTouchPoints && navigator.maxTouchPoints > 0;
@@ -9,7 +9,7 @@
_isWeb = true;
_locale = navigator.language;
_language = _locale;
-@@ -90,7 +90,7 @@ if (typeof navigator === 'object' && !isElectronRender
+@@ -88,7 +88,7 @@ if (typeof navigator === 'object' && !isElectronRender
else if (typeof nodeProcess === 'object') {
_isWindows = (nodeProcess.platform === 'win32');
_isMacintosh = (nodeProcess.platform === 'darwin');
diff --git a/editors/vscode/files/patch-src_vs_base_node_ps.ts b/editors/vscode/files/patch-src_vs_base_node_ps.ts
index 228b4599fc04..1c83995c7228 100644
--- a/editors/vscode/files/patch-src_vs_base_node_ps.ts
+++ b/editors/vscode/files/patch-src_vs_base_node_ps.ts
@@ -1,6 +1,6 @@
---- src/vs/base/node/ps.ts.orig 2021-12-06 21:35:50 UTC
+--- src/vs/base/node/ps.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/base/node/ps.ts
-@@ -214,7 +214,7 @@ export function listProcesses(rootPid: number): Promis
+@@ -218,7 +218,7 @@ export function listProcesses(rootPid: number): Promis
exec('which ps', {}, (err, stdout, stderr) => {
if (err || stderr) {
@@ -9,7 +9,7 @@
reject(err || new Error(stderr.toString()));
} else {
const cmd = JSON.stringify(FileAccess.asFileUri('vs/base/node/ps.sh', require).fsPath);
-@@ -229,7 +229,8 @@ export function listProcesses(rootPid: number): Promis
+@@ -233,7 +233,8 @@ export function listProcesses(rootPid: number): Promis
}
} else {
const ps = stdout.toString().trim();
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 fec4b69b4651..2ad34862bec8 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 2022-03-10 14:14:09 UTC
+--- src/vs/code/electron-main/app.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/code/electron-main/app.ts
-@@ -554,7 +554,7 @@ export class CodeApplication extends Disposable {
+@@ -585,7 +585,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 ab809307305f..6e7c3d0b3967 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 2022-02-02 16:57:24 UTC
+--- src/vs/workbench/contrib/extensions/browser/extensionEditor.ts.orig 2022-05-16 17:42:35 UTC
+++ src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
-@@ -1759,7 +1759,8 @@ export class ExtensionEditor extends EditorPane {
+@@ -1752,7 +1752,8 @@ export class ExtensionEditor extends EditorPane {
switch (platform) {
case 'win32': key = rawKeyBinding.win; break;
diff --git a/editors/vscode/files/patch-test_automation_src_electron.ts b/editors/vscode/files/patch-test_automation_src_electron.ts
new file mode 100644
index 000000000000..0c9896d3bb5d
--- /dev/null
+++ b/editors/vscode/files/patch-test_automation_src_electron.ts
@@ -0,0 +1,29 @@
+--- test/automation/src/electron.ts.orig 2022-05-19 00:38:13 UTC
++++ test/automation/src/electron.ts
+@@ -41,7 +41,7 @@ export async function resolveElectronConfiguration(opt
+ args.push('--verbose');
+ }
+
+- 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
+ }
+
+@@ -97,7 +97,7 @@ export function getDevElectronPath(): string {
+ switch (process.platform) {
+ case 'darwin':
+ return join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
+- case 'linux':
++ case 'linux': case 'freebsd':
+ return join(buildPath, 'electron', `${product.applicationName}`);
+ case 'win32':
+ return join(buildPath, 'electron', `${product.nameShort}.exe`);
+@@ -110,7 +110,7 @@ export function getBuildElectronPath(root: string): st
+ switch (process.platform) {
+ case 'darwin':
+ return join(root, 'Contents', 'MacOS', 'Electron');
+- case 'linux': {
++ case 'linux': case 'freebsd': {
+ const product = require(join(root, 'resources', 'app', 'product.json'));
+ return join(root, product.applicationName);
+ }
diff --git a/editors/vscode/files/patch-test_automation_src_electronDriver.ts b/editors/vscode/files/patch-test_automation_src_electronDriver.ts
deleted file mode 100644
index f280e310cfed..000000000000
--- a/editors/vscode/files/patch-test_automation_src_electronDriver.ts
+++ /dev/null
@@ -1,29 +0,0 @@
---- test/automation/src/electronDriver.ts.orig 2022-02-02 16:57:24 UTC
-+++ test/automation/src/electronDriver.ts
-@@ -42,7 +42,7 @@ export async function launch(options: LaunchOptions):
- '--driver', driverIPCHandle
- ];
-
-- 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
- }
-
-@@ -157,7 +157,7 @@ function getDevElectronPath(): string {
- switch (process.platform) {
- case 'darwin':
- return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
-- case 'linux':
-+ case 'linux': case 'freebsd':
- return path.join(buildPath, 'electron', `${product.applicationName}`);
- case 'win32':
- return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
-@@ -170,7 +170,7 @@ function getBuildElectronPath(root: string): string {
- switch (process.platform) {
- case 'darwin':
- return path.join(root, 'Contents', 'MacOS', 'Electron');
-- case 'linux': {
-+ case 'linux': case 'freebsd': {
- const product = require(path.join(root, 'resources', 'app', 'product.json'));
- return path.join(root, product.applicationName);
- }
diff --git a/editors/vscode/files/patch-test_smoke_src_main.ts b/editors/vscode/files/patch-test_smoke_src_main.ts
deleted file mode 100644
index f610c44436d3..000000000000
--- a/editors/vscode/files/patch-test_smoke_src_main.ts
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/smoke/src/main.ts.orig 2022-02-02 16:57:24 UTC
-+++ test/smoke/src/main.ts
-@@ -130,7 +130,7 @@ if (!opts.web) {
- switch (process.platform) {
- case 'darwin':
- return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
-- case 'linux':
-+ case 'linux': case 'freebsd':
- return path.join(buildPath, 'electron', `${product.applicationName}`);
- case 'win32':
- return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
-@@ -143,7 +143,7 @@ if (!opts.web) {
- switch (process.platform) {
- case 'darwin':
- return path.join(root, 'Contents', 'MacOS', 'Electron');
-- case 'linux': {
-+ case 'linux': case 'freebsd': {
- const product = require(path.join(root, 'resources', 'app', 'product.json'));
- return path.join(root, product.applicationName);
- }
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index 04847e0c4f32..7eee210ba8ec 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -11,6 +11,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/icudtl.dat
%%DATADIR%%/libEGL.so
%%DATADIR%%/libGLESv2.so
+%%DATADIR%%/libffmpeg.so
%%DATADIR%%/libvk_swiftshader.so
%%DATADIR%%/libvulkan.so.1
%%DATADIR%%/locales/am.pak
@@ -209,6 +210,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/github-authentication/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/github-authentication/images/icon.png
+%%DATADIR%%/resources/app/extensions/github-authentication/media/auth.css
+%%DATADIR%%/resources/app/extensions/github-authentication/media/favicon.ico
+%%DATADIR%%/resources/app/extensions/github-authentication/media/icon.png
+%%DATADIR%%/resources/app/extensions/github-authentication/media/index.html
%%DATADIR%%/resources/app/extensions/github-authentication/package.json
%%DATADIR%%/resources/app/extensions/github-authentication/package.nls.json
%%DATADIR%%/resources/app/extensions/github/README.md
@@ -220,6 +225,16 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/github/markdown.css
%%DATADIR%%/resources/app/extensions/github/package.json
%%DATADIR%%/resources/app/extensions/github/package.nls.json
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/a.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/b.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/PULL_REQUEST_TEMPLATE/x.txt
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/a.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/b.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/docs/PULL_REQUEST_TEMPLATE/x.txt
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/some-markdown.md
+%%DATADIR%%/resources/app/extensions/github/testWorkspace/x.txt
%%DATADIR%%/resources/app/extensions/go/language-configuration.json
%%DATADIR%%/resources/app/extensions/go/package.json
%%DATADIR%%/resources/app/extensions/go/package.nls.json
@@ -362,6 +377,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/markdown-language-features/dist/nls.metadata.json
+%%DATADIR%%/resources/app/extensions/markdown-language-features/esbuild-notebook.js
+%%DATADIR%%/resources/app/extensions/markdown-language-features/esbuild-preview.js
%%DATADIR%%/resources/app/extensions/markdown-language-features/icon.png
%%DATADIR%%/resources/app/extensions/markdown-language-features/media/highlight.css
%%DATADIR%%/resources/app/extensions/markdown-language-features/media/index.js
@@ -414,6 +431,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/microsoft-authentication/dist/nls.metadata.json
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/auth.css
+%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/favicon.ico
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/icon.png
%%DATADIR%%/resources/app/extensions/microsoft-authentication/media/index.html
%%DATADIR%%/resources/app/extensions/microsoft-authentication/package.json
@@ -421,8 +439,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/LICENSE.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/SECURITY.md
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/ThirdPartyNotices.txt
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/ci.yml
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/out/extension.js
-%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/out/extension.js.LICENSE.txt
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug-companion/resources/logo.png
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/LICENSE.txt
@@ -478,6 +497,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/customBreakpoints.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/debugAdapter.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/basicCpuProfiler.nls.metadata.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/basicHeapProfiler.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/profiling/heapDumpProfiler.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/sources.nls.metadata.json
%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/src/adapter/stackTrace.nls.metadata.json
@@ -524,19 +544,23 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/README.md
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/SECURITY.md
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/ThirdPartyNotices.txt
-%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/azure-pipelines.yml
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/dist/extension.js.map
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/media/icon.png
%%DATADIR%%/resources/app/extensions/ms-vscode.references-view/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/README.md
-%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/client.bundle.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ThirdPartyNotices.txt
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/ci.yml
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/cpu-client.bundle.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/extension.web.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/out/heap-client.bundle.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/package.json
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/resources/icon.png
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/tsconfig.browser.json
-%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.client.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.cpu-client.js
%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.extension.js
+%%DATADIR%%/resources/app/extensions/ms-vscode.vscode-js-profile-table/webpack.heap-client.js
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/README.md
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cancellationToken.js
%%DATADIR%%/resources/app/extensions/node_modules/typescript/lib/cs/diagnosticMessages.generated.json
@@ -668,7 +692,6 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/powershell/language-configuration.json
%%DATADIR%%/resources/app/extensions/powershell/package.json
%%DATADIR%%/resources/app/extensions/powershell/package.nls.json
-%%DATADIR%%/resources/app/extensions/powershell/snippets/powershell.code-snippets
%%DATADIR%%/resources/app/extensions/powershell/syntaxes/powershell.tmLanguage.json
%%DATADIR%%/resources/app/extensions/pug/language-configuration.json
%%DATADIR%%/resources/app/extensions/pug/package.json
@@ -687,6 +710,10 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/razor/package.json
%%DATADIR%%/resources/app/extensions/razor/package.nls.json
%%DATADIR%%/resources/app/extensions/razor/syntaxes/cshtml.tmLanguage.json
+%%DATADIR%%/resources/app/extensions/restructuredtext/language-configuration.json
+%%DATADIR%%/resources/app/extensions/restructuredtext/package.json
+%%DATADIR%%/resources/app/extensions/restructuredtext/package.nls.json
+%%DATADIR%%/resources/app/extensions/restructuredtext/syntaxes/rst.tmLanguage.json
%%DATADIR%%/resources/app/extensions/ruby/language-configuration.json
%%DATADIR%%/resources/app/extensions/ruby/package.json
%%DATADIR%%/resources/app/extensions/ruby/package.nls.json
@@ -720,6 +747,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/extensions/simple-browser/dist/extension.js
%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.header.json
%%DATADIR%%/resources/app/extensions/simple-browser/dist/nls.metadata.json
+%%DATADIR%%/resources/app/extensions/simple-browser/esbuild-preview.js
%%DATADIR%%/resources/app/extensions/simple-browser/media/codicon.css
%%DATADIR%%/resources/app/extensions/simple-browser/media/codicon.ttf
%%DATADIR%%/resources/app/extensions/simple-browser/media/icon.png
@@ -828,7 +856,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/node_modules.asar
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@parcel/watcher/build/Release/watcher.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
-%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/sqlite3/build/Release/sqlite.node
+%%DATADIR%%/resources/app/node_modules.asar.unpacked/@vscode/sqlite3/build/Release/vscode-sqlite3.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/keytar/build/Release/keytar.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/keytar/build/Release/obj.target/keytar.node
%%DATADIR%%/resources/app/node_modules.asar.unpacked/native-is-elevated/build/Release/iselevated.node
@@ -885,9 +913,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js
%%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.nls.js
%%DATADIR%%/resources/app/out/vs/loader.js
-%%DATADIR%%/resources/app/out/vs/platform/driver/node/driver.js
%%DATADIR%%/resources/app/out/vs/platform/environment/node/userDataPath.js
-%%DATADIR%%/resources/app/out/vs/platform/extensionManagement/common/media/defaultIcon.png
%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorker.js
%%DATADIR%%/resources/app/out/vs/platform/extensions/node/extensionHostStarterWorkerMain.js
%%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
@@ -903,8 +929,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/back-tb.png
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/forward-tb.png
%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
-%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hc.svg
-%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress.svg
+%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hcDark.svg
+%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-hcLight.svg
+%%DATADIR%%/resources/app/out/vs/workbench/browser/parts/editor/media/letterpress-light.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/break.opus
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/error.opus
%%DATADIR%%/resources/app/out/vs/workbench/contrib/audioCues/browser/media/foldedAreas.opus
@@ -931,6 +958,8 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputer.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-env.zsh
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration-profile.zsh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
%%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/browser/media/shellIntegration.zsh
%%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/fake.html
@@ -940,6 +969,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/webview/browser/pre/service-worker.js
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/colorTheme.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/commandPalette.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/dark-hc.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/dark.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/debug.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/extensions-web.svg
@@ -949,9 +979,9 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/interactivePlayground.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/languages.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/learn.svg
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/light-hc.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/light.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/menuBar.svg
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/monokai.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/more.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/colab.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookThemes/default.png
@@ -971,6 +1001,7 @@ share/applications/code-oss.desktop
%%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeOverlay/browser/media/commandpalette.svg
%%DATADIR%%/resources/app/out/vs/workbench/contrib/workspace/browser/media/trusted-badge.png
%%DATADIR%%/resources/app/out/vs/workbench/contrib/workspace/browser/media/untrusted-status.png
+%%DATADIR%%/resources/app/out/vs/workbench/services/extensionManagement/common/media/defaultIcon.png
%%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
%%DATADIR%%/resources/app/out/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.js
%%DATADIR%%/resources/app/out/vs/workbench/services/search/worker/localFileSearch.js