git: 259e6da8bff9 - main - editors/vscode: update to 1.95.1

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Thu, 07 Nov 2024 07:51:28 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=259e6da8bff911b4c426959c668f90719fa24c57

commit 259e6da8bff911b4c426959c668f90719fa24c57
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2024-11-07 07:49:26 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2024-11-07 07:51:12 +0000

    editors/vscode: update to 1.95.1
    
    Changelog: https://code.visualstudio.com/updates/v1_95
    
    Reported by:    GitHub (watch releases)
---
 editors/vscode/Makefile                            | 26 ++++++------
 editors/vscode/distinfo                            | 14 +++----
 .../vscode/files/patch-build_lib_layersChecker.ts  |  4 +-
 .../patch-node__modules_node-pty_src_unix_pty.cc   | 14 -------
 ...h-remote_node__modules_node-pty_src_unix_pty.cc | 14 -------
 ...otstrap-node.js => patch-src_bootstrap-node.ts} |  8 ++--
 .../files/{patch-src_main.js => patch-src_main.ts} |  8 ++--
 .../files/patch-src_vs_code_electron-main_app.ts   |  4 +-
 ...rc_vs_platform_environment_node_userDataPath.js | 11 ------
 ...rc_vs_platform_environment_node_userDataPath.ts | 11 ++++++
 ...-src_vs_workbench_api_browser_mainThreadTask.ts |  4 +-
 ..._services_actions_common_menusExtensionPoint.ts | 11 ++++++
 editors/vscode/pkg-plist                           | 46 +++++++++++++---------
 13 files changed, 83 insertions(+), 92 deletions(-)

diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 04e1246cf446..3c06994bf7e2 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	vscode
-DISTVERSION=	1.94.2
-PORTREVISION=	1
+DISTVERSION=	1.95.1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules
 DISTFILES=	vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \
@@ -25,6 +24,7 @@ BUILD_DEPENDS=	zip:archivers/zip \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
+		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libsndio.so:audio/sndio \
@@ -70,7 +70,7 @@ USES=		desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \
 USE_GITHUB=	yes
 GH_ACCOUNT=	microsoft
 
-SOURCE_COMMIT_HASH=	384ff7382de624fb94dbaf6da11977bba1ecd427
+SOURCE_COMMIT_HASH=	65edc4939843c90c34d61f4ce11704f09d3e5cb6
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
@@ -99,7 +99,7 @@ MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 NODEJS_DIR=	${.CURDIR:H:H}/www/node20
 .include "${NODEJS_DIR}/Makefile.version"
-ELECTRON_DIR=	${.CURDIR:H:H}/devel/electron30
+ELECTRON_DIR=	${.CURDIR:H:H}/devel/electron32
 .include "${ELECTRON_DIR}/Makefile.version"
 
 ELECTRON_DOWNLOAD_URL=	https://github.com/electron/electron/releases/download/v${ELECTRON_VER}
@@ -220,6 +220,8 @@ do-build:
 	@cd ${WRKDIR}/.cache/electron/${ELECTRON_DOWNLOAD_URL_HASH} && \
 		${SHA256} -r *-v${ELECTRON_VER}-linux-*.zip | \
 		${SED} -e 's/ / */' >> ${WRKSRC}/build/checksums/electron.txt
+# remove backup files so that they are not included in the package
+	@${FIND} ${WRKSRC} -type f \( -name '*.orig' -o -name '*~' \) -delete
 # build and package vscode
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx tsc -p build/tsconfig.build.json
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
@@ -249,8 +251,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/linux/code.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/com.visualstudio.code.oss.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} && \
-		${TAR} -cf - . | ${TAR} -xf - -C ${STAGEDIR}${DATADIR}
+	${TAR} -cf - -C ${WRKDIR}/VSCode-linux-${ELECTRON_ARCH} . | \
+		${TAR} -xf - -C ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR}/resources/app -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
 .for f in chromedriver mksnapshot v8_context_snapshot_generator
@@ -265,8 +267,8 @@ do-install:
 pre-test:
 # setup electron dependency for unit tests
 	@${MKDIR} ${WRKSRC}/.build/electron
-	@cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
-		${TAR} -cf - . | ${TAR} -xf - -C ${WRKSRC}/.build/electron
+	@${TAR} -cf - -C ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} . | \
+		${TAR} -xf - -C ${WRKSRC}/.build/electron
 	@cd ${WRKSRC}/.build/electron && ${MV} -f electron code-oss
 
 do-test:
@@ -287,12 +289,11 @@ build-remote-extension-host: configure pre-build
 		npm_config_nodedir=${LOCALBASE} \
 		npm --userconfig=${WRKSRC}/remote/.npmrc run gulp vscode-reh-linux-${ELECTRON_ARCH}-min
 	@${MKDIR} ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
-	cd ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} && ${TAR} -cf - . | \
+	${TAR} -cf - -C ${WRKDIR}/vscode-reh-linux-${ELECTRON_ARCH} . | \
 		${TAR} -xf - -C ${WRKDIR}/vscode-reh/bin/${SOURCE_COMMIT_HASH}
 	@${FIND} ${WRKDIR}/vscode-reh -type f -exec ${FILE} {} ';' | \
 		${GREP} 'ELF.*FreeBSD' | ${AWK} -F ': ' '{print $$1}' | ${XARGS} ${STRIP_CMD}
-	cd ${WRKDIR}/vscode-reh && \
-		${TAR} -czf ../vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz .
+	${TAR} -czf ${WRKDIR}/vscode-reh-${DISTVERSION}-${OPSYS:tl}${OSREL:R}-${ARCH}.tar.gz -C ${WRKDIR}/vscode-reh .
 	# cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npm run gulp vscode-reh-web-linux-${ELECTRON_ARCH}-min
 
 ### targets for port maintainer(s)
@@ -316,7 +317,6 @@ make-marketplace-exts-archive: extract
 	@${RM} -r ${WRKSRC}/.build/builtInExtensions
 	@cd ${WRKSRC} && \
 	${SETENV} ${MAKE_ENV} npm run download-builtin-extensions
-	@cd ${WRKSRC}/.build && \
-	${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} builtInExtensions
+	@${TAR} -czf ${WRKDIR}/vscode-marketplace-exts-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/.build builtInExtensions
 
 .include <bsd.port.mk>
diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo
index 210286a52695..4e91d19fd392 100644
--- a/editors/vscode/distinfo
+++ b/editors/vscode/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1728633458
-SHA256 (vscode/vscode-node-modules-1.94.2.tar.gz) = b2aa9b456680c543a1a664bf3e1d6f78c0f2221bd965ac68dd74c2c6107da535
-SIZE (vscode/vscode-node-modules-1.94.2.tar.gz) = 407150173
-SHA256 (vscode/vscode-marketplace-exts-1.94.2.tar.gz) = 35b4f9f7946871b1227a4e67822693c84c02f419c93b5b213aa9e33f102fcd32
-SIZE (vscode/vscode-marketplace-exts-1.94.2.tar.gz) = 1614018
-SHA256 (vscode/microsoft-vscode-1.94.2_GH0.tar.gz) = 398a73d3d1ff1b9e962b461518ac4506c7970aa8a99030060287651e16a804e2
-SIZE (vscode/microsoft-vscode-1.94.2_GH0.tar.gz) = 20297397
+TIMESTAMP = 1730807347
+SHA256 (vscode/vscode-node-modules-1.95.1.tar.gz) = ce7e2f9edc29c924c709f9225acdcdf5b7f8f4a2a143b68182e1e2b728d3ba3d
+SIZE (vscode/vscode-node-modules-1.95.1.tar.gz) = 398179623
+SHA256 (vscode/vscode-marketplace-exts-1.95.1.tar.gz) = 44bdd685d9a5470a8a1bc4b33cc796cd7dbd7a469070c74287732fc610d0396c
+SIZE (vscode/vscode-marketplace-exts-1.95.1.tar.gz) = 1617401
+SHA256 (vscode/microsoft-vscode-1.95.1_GH0.tar.gz) = 89c280e9d84cdd41f0acec0b2cfc900bb46af5ef323c1f5f1073d506935f324e
+SIZE (vscode/microsoft-vscode-1.95.1_GH0.tar.gz) = 20332995
diff --git a/editors/vscode/files/patch-build_lib_layersChecker.ts b/editors/vscode/files/patch-build_lib_layersChecker.ts
index 54032352ad24..061c8ce6362e 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	2024-09-27 21:08:28 UTC
+--- build/lib/layersChecker.ts.orig	2024-10-31 05:10:14 UTC
 +++ build/lib/layersChecker.ts
-@@ -382,7 +382,7 @@ function createProgram(tsconfigPath: string): ts.Progr
+@@ -403,7 +403,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-node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/patch-node__modules_node-pty_src_unix_pty.cc
deleted file mode 100644
index f812be7e032f..000000000000
--- a/editors/vscode/files/patch-node__modules_node-pty_src_unix_pty.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- node_modules/node-pty/src/unix/pty.cc.orig	2024-09-09 06:45:53 UTC
-+++ node_modules/node-pty/src/unix/pty.cc
-@@ -66,6 +66,11 @@
- #include <termios.h>
- #endif
- 
-+/* for termios */
-+#if defined(__FreeBSD__)
-+#include <termios.h>
-+#endif
-+
- /* NSIG - macro for highest signal + 1, should be defined */
- #ifndef NSIG
- #define NSIG 32
diff --git a/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc b/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc
deleted file mode 100644
index ea5b97790aff..000000000000
--- a/editors/vscode/files/patch-remote_node__modules_node-pty_src_unix_pty.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- remote/node_modules/node-pty/src/unix/pty.cc.orig	2024-09-09 06:45:53 UTC
-+++ remote/node_modules/node-pty/src/unix/pty.cc
-@@ -66,6 +66,11 @@
- #include <termios.h>
- #endif
- 
-+/* for termios */
-+#if defined(__FreeBSD__)
-+#include <termios.h>
-+#endif
-+
- /* NSIG - macro for highest signal + 1, should be defined */
- #ifndef NSIG
- #define NSIG 32
diff --git a/editors/vscode/files/patch-src_bootstrap-node.js b/editors/vscode/files/patch-src_bootstrap-node.ts
similarity index 52%
rename from editors/vscode/files/patch-src_bootstrap-node.js
rename to editors/vscode/files/patch-src_bootstrap-node.ts
index 0b2bfafcb055..022b1269478d 100644
--- a/editors/vscode/files/patch-src_bootstrap-node.js
+++ b/editors/vscode/files/patch-src_bootstrap-node.ts
@@ -1,11 +1,11 @@
---- src/bootstrap-node.js.orig	2024-09-27 21:08:28 UTC
-+++ src/bootstrap-node.js
-@@ -169,7 +169,7 @@ module.exports.configurePortable = function (product) 
+--- src/bootstrap-node.ts.orig	2024-10-31 05:10:14 UTC
++++ src/bootstrap-node.ts
+@@ -122,7 +122,7 @@ export function configurePortable(product: Partial<IPr
  			return process.env['VSCODE_PORTABLE'];
  		}
  
 -		if (process.platform === 'win32' || process.platform === 'linux') {
 +		if (process.platform === 'win32' || process.platform === 'linux' || process.platform === 'freebsd') {
- 			return path.join(getApplicationPath(path), 'data');
+ 			return path.join(getApplicationPath(), 'data');
  		}
  
diff --git a/editors/vscode/files/patch-src_main.js b/editors/vscode/files/patch-src_main.ts
similarity index 79%
rename from editors/vscode/files/patch-src_main.js
rename to editors/vscode/files/patch-src_main.ts
index f0de627d99da..c36a77ca5efd 100644
--- a/editors/vscode/files/patch-src_main.js
+++ b/editors/vscode/files/patch-src_main.ts
@@ -1,6 +1,6 @@
---- src/main.js.orig	2024-09-04 12:53:09 UTC
-+++ src/main.js
-@@ -163,7 +163,7 @@ if (userLocale) {
+--- src/main.ts.orig	2024-10-31 05:10:14 UTC
++++ src/main.ts
+@@ -141,7 +141,7 @@ if (userLocale) {
  // Pseudo Language Language Pack is being used.
  // In that case, use `en` as the Electron locale.
  
@@ -9,7 +9,7 @@
  	const electronLocale = (!userLocale || userLocale === 'qps-ploc') ? 'en' : userLocale;
  	app.commandLine.appendSwitch('lang', electronLocale);
  }
-@@ -233,7 +233,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
+@@ -206,7 +206,7 @@ function configureCommandlineSwitchesSync(cliArgs: Nat
  		'proxy-bypass-list'
  	];
  
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 7b77bfe5a175..bd1ac1e4135a 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	2024-09-27 21:08:28 UTC
+--- src/vs/code/electron-main/app.ts.orig	2024-10-31 05:10:14 UTC
 +++ src/vs/code/electron-main/app.ts
-@@ -985,7 +985,7 @@ export class CodeApplication extends Disposable {
+@@ -996,7 +996,7 @@ export class CodeApplication extends Disposable {
  				services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
  				break;
  
diff --git a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
deleted file mode 100644
index 5c3b2f70e672..000000000000
--- a/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.js
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/vs/platform/environment/node/userDataPath.js.orig	2024-09-27 21:08:28 UTC
-+++ src/vs/platform/environment/node/userDataPath.js
-@@ -108,7 +108,7 @@ const module = { exports: {} };
- 				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_platform_environment_node_userDataPath.ts b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts
new file mode 100644
index 000000000000..32e1d5fc0f4e
--- /dev/null
+++ b/editors/vscode/files/patch-src_vs_platform_environment_node_userDataPath.ts
@@ -0,0 +1,11 @@
+--- src/vs/platform/environment/node/userDataPath.ts.orig	2024-11-05 12:18:19 UTC
++++ src/vs/platform/environment/node/userDataPath.ts
+@@ -76,7 +76,7 @@ function doGetUserDataPath(cliArgs: NativeParsedArgs, 
+ 		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_workbench_api_browser_mainThreadTask.ts b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
index 1e774b998806..4ddd376426ee 100644
--- a/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
+++ b/editors/vscode/files/patch-src_vs_workbench_api_browser_mainThreadTask.ts
@@ -1,6 +1,6 @@
---- src/vs/workbench/api/browser/mainThreadTask.ts.orig	2024-05-01 01:08:03 UTC
+--- src/vs/workbench/api/browser/mainThreadTask.ts.orig	2024-10-31 05:10:14 UTC
 +++ src/vs/workbench/api/browser/mainThreadTask.ts
-@@ -673,7 +673,7 @@ export class MainThreadTask extends Disposable impleme
+@@ -678,7 +678,7 @@ export class MainThreadTask extends Disposable impleme
  			case 'darwin':
  				platform = Platform.Platform.Mac;
  				break;
diff --git a/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
new file mode 100644
index 000000000000..86e2035ee8b3
--- /dev/null
+++ b/editors/vscode/files/patch-src_vs_workbench_services_actions_common_menusExtensionPoint.ts
@@ -0,0 +1,11 @@
+--- src/vs/workbench/services/actions/common/menusExtensionPoint.ts.orig	2024-11-05 12:20:16 UTC
++++ src/vs/workbench/services/actions/common/menusExtensionPoint.ts
+@@ -1122,7 +1122,7 @@ class CommandsTableRenderer extends Disposable impleme
+ 
+ 		switch (platform) {
+ 			case 'win32': key = rawKeyBinding.win; break;
+-			case 'linux': key = rawKeyBinding.linux; break;
++			case 'linux': case 'freebsd': key = rawKeyBinding.linux; break;
+ 			case 'darwin': key = rawKeyBinding.mac; break;
+ 		}
+ 
diff --git a/editors/vscode/pkg-plist b/editors/vscode/pkg-plist
index ac326a4038c7..0f710c0a6252 100644
--- a/editors/vscode/pkg-plist
+++ b/editors/vscode/pkg-plist
@@ -113,6 +113,9 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/css-language-features/package.json
 %%DATADIR%%/resources/app/extensions/css-language-features/package.nls.json
 %%DATADIR%%/resources/app/extensions/css-language-features/schemas/package.schema.json
+%%DATADIR%%/resources/app/extensions/css-language-features/server/.npmrc
+%%DATADIR%%/resources/app/extensions/css-language-features/server/dist/node/85.cssServerMain.js
+%%DATADIR%%/resources/app/extensions/css-language-features/server/dist/node/920.cssServerMain.js
 %%DATADIR%%/resources/app/extensions/css-language-features/server/dist/node/cssServerMain.js
 %%DATADIR%%/resources/app/extensions/css-language-features/server/package.json
 %%DATADIR%%/resources/app/extensions/css/language-configuration.json
@@ -257,6 +260,10 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/html-language-features/package.json
 %%DATADIR%%/resources/app/extensions/html-language-features/package.nls.json
 %%DATADIR%%/resources/app/extensions/html-language-features/schemas/package.schema.json
+%%DATADIR%%/resources/app/extensions/html-language-features/server/.npmrc
+%%DATADIR%%/resources/app/extensions/html-language-features/server/dist/node/421.htmlServerMain.js
+%%DATADIR%%/resources/app/extensions/html-language-features/server/dist/node/490.htmlServerMain.js
+%%DATADIR%%/resources/app/extensions/html-language-features/server/dist/node/769.htmlServerMain.js
 %%DATADIR%%/resources/app/extensions/html-language-features/server/dist/node/htmlServerMain.js
 %%DATADIR%%/resources/app/extensions/html-language-features/server/lib/jquery.d.ts
 %%DATADIR%%/resources/app/extensions/html-language-features/server/package.json
@@ -301,6 +308,9 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/json-language-features/icons/json.png
 %%DATADIR%%/resources/app/extensions/json-language-features/package.json
 %%DATADIR%%/resources/app/extensions/json-language-features/package.nls.json
+%%DATADIR%%/resources/app/extensions/json-language-features/server/.npmrc
+%%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/774.jsonServerMain.js
+%%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/875.jsonServerMain.js
 %%DATADIR%%/resources/app/extensions/json-language-features/server/dist/node/jsonServerMain.js
 %%DATADIR%%/resources/app/extensions/json-language-features/server/package.json
 %%DATADIR%%/resources/app/extensions/json/language-configuration.json
@@ -347,7 +357,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/extensions/markdown-basics/package.nls.json
 %%DATADIR%%/resources/app/extensions/markdown-basics/snippets/markdown.code-snippets
 %%DATADIR%%/resources/app/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
-%%DATADIR%%/resources/app/extensions/markdown-language-features/.eslintignore
 %%DATADIR%%/resources/app/extensions/markdown-language-features/README.md
 %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/extension.js
 %%DATADIR%%/resources/app/extensions/markdown-language-features/dist/serverWorkerMain.js
@@ -433,10 +442,10 @@ share/applications/code-oss.desktop
 %%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
-%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/README.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/ThirdPartyNotices.txt
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/package.json
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/package.nls.json
+%%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/readme.md
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/dark/configure.svg
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/dark/connect.svg
 %%DATADIR%%/resources/app/extensions/ms-vscode.js-debug/resources/dark/disconnect.svg
@@ -1002,7 +1011,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/@microsoft/dynamicproto-js/tools/rollup/node/removedynamic.js
 %%DATADIR%%/resources/app/node_modules/@parcel/node-addon-api/node_api.Makefile
 %%DATADIR%%/resources/app/node_modules/@parcel/watcher/LICENSE
-%%DATADIR%%/resources/app/node_modules/@parcel/watcher/binding.gyp.orig
 %%DATADIR%%/resources/app/node_modules/@parcel/watcher/build/Release/watcher.node
 %%DATADIR%%/resources/app/node_modules/@parcel/watcher/index.js
 %%DATADIR%%/resources/app/node_modules/@parcel/watcher/index.js.flow
@@ -1012,6 +1020,8 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/@tootallnate/once/dist/overloaded-parameters.js
 %%DATADIR%%/resources/app/node_modules/@tootallnate/once/dist/types.js
 %%DATADIR%%/resources/app/node_modules/@tootallnate/once/package.json
+%%DATADIR%%/resources/app/node_modules/@types/semver/LICENSE
+%%DATADIR%%/resources/app/node_modules/@types/semver/package.json
 %%DATADIR%%/resources/app/node_modules/@vscode/deviceid/LICENSE.txt
 %%DATADIR%%/resources/app/node_modules/@vscode/deviceid/SECURITY.md
 %%DATADIR%%/resources/app/node_modules/@vscode/deviceid/azure-pipelines/azure-pipeline.yml
@@ -1025,6 +1035,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/LICENSE
 %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js
 %%DATADIR%%/resources/app/node_modules/@vscode/iconv-lite-umd/package.json
+%%DATADIR%%/resources/app/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
 %%DATADIR%%/resources/app/node_modules/@vscode/policy-watcher/LICENSE
 %%DATADIR%%/resources/app/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
 %%DATADIR%%/resources/app/node_modules/@vscode/policy-watcher/index.js
@@ -1361,7 +1372,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/jsbn/package.json
 %%DATADIR%%/resources/app/node_modules/jschardet/CONTRIBUTORS
 %%DATADIR%%/resources/app/node_modules/jschardet/LICENSE
-%%DATADIR%%/resources/app/node_modules/jschardet/dist/jschardet.js
 %%DATADIR%%/resources/app/node_modules/jschardet/dist/jschardet.min.js
 %%DATADIR%%/resources/app/node_modules/jschardet/package.json
 %%DATADIR%%/resources/app/node_modules/jschardet/scripts/run-workflow.sh
@@ -1372,7 +1382,6 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/jsonfile/utils.js
 %%DATADIR%%/resources/app/node_modules/kerberos/HISTORY.md
 %%DATADIR%%/resources/app/node_modules/kerberos/LICENSE
-%%DATADIR%%/resources/app/node_modules/kerberos/binding.gyp.orig
 %%DATADIR%%/resources/app/node_modules/kerberos/build/Release/kerberos.node
 %%DATADIR%%/resources/app/node_modules/kerberos/build/Release/obj.target/kerberos.node
 %%DATADIR%%/resources/app/node_modules/kerberos/lib/auth_processes/mongodb.js
@@ -1466,6 +1475,7 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/node_modules/node-pty/lib/windowsPtyAgent.js
 %%DATADIR%%/resources/app/node_modules/node-pty/lib/windowsTerminal.js
 %%DATADIR%%/resources/app/node_modules/node-pty/lib/worker/conoutSocketWorker.js
+%%DATADIR%%/resources/app/node_modules/node-pty/node-addon-api/node_addon_api.Makefile
 %%DATADIR%%/resources/app/node_modules/node-pty/package.json
 %%DATADIR%%/resources/app/node_modules/once/LICENSE
 %%DATADIR%%/resources/app/node_modules/once/once.js
@@ -1796,18 +1806,16 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/base/node/terminateProcess.sh
 %%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload-aux.js
 %%DATADIR%%/resources/app/out/vs/base/parts/sandbox/electron-sandbox/preload.js
-%%DATADIR%%/resources/app/out/vs/code/electron-main/main.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html
+%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorer.html
 %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorer.js
 %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.css
 %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/processExplorer/processExplorerMain.js
-%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.esm.html
+%%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.html
 %%DATADIR%%/resources/app/out/vs/code/electron-sandbox/workbench/workbench.js
 %%DATADIR%%/resources/app/out/vs/code/electron-utility/sharedProcess/sharedProcessMain.js
-%%DATADIR%%/resources/app/out/vs/code/node/cli.js
 %%DATADIR%%/resources/app/out/vs/code/node/cliProcessMain.js
 %%DATADIR%%/resources/app/out/vs/editor/common/languages/highlights/typescript.scm
-%%DATADIR%%/resources/app/out/vs/editor/common/services/editorSimpleWorker.esm.js
+%%DATADIR%%/resources/app/out/vs/editor/common/services/editorSimpleWorkerMain.js
 %%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/break.mp3
 %%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatRequestSent.mp3
 %%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/chatResponseReceived1.mp3
@@ -1832,10 +1840,10 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/voiceRecordingStopped.mp3
 %%DATADIR%%/resources/app/out/vs/platform/accessibilitySignal/browser/media/warning.mp3
 %%DATADIR%%/resources/app/out/vs/platform/files/node/watcher/watcherMain.js
-%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.esm.js
+%%DATADIR%%/resources/app/out/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.js
 %%DATADIR%%/resources/app/out/vs/platform/terminal/node/ptyHostMain.js
 %%DATADIR%%/resources/app/out/vs/workbench/api/node/extensionHostProcess.js
-%%DATADIR%%/resources/app/out/vs/workbench/api/worker/extensionHostWorker.esm.js
+%%DATADIR%%/resources/app/out/vs/workbench/api/worker/extensionHostWorkerMain.js
 %%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/contrib/debug/browser/media/continue-tb.png
@@ -1851,12 +1859,12 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/extensions/browser/media/theme-icon.png
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/externalTerminal/node/TerminalHelper.scpt
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/externalTerminal/node/iTermHelper.scpt
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporter.esm.html
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporter.html
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.css
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/issue/electron-sandbox/issueReporterMain.js
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.esm.js
-%%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputer.esm.js
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/notebook/common/services/notebookSimpleWorkerMain.js
+%%DATADIR%%/resources/app/out/vs/workbench/contrib/output/common/outputLinkComputerMain.js
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/common/scripts/GitTabExpansion.psm1
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/terminal/common/scripts/fish_xdg_data/fish/vendor_conf.d/shellIntegration.fish
@@ -1895,10 +1903,10 @@ share/applications/code-oss.desktop
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/terminal.svg
 %%DATADIR%%/resources/app/out/vs/workbench/contrib/welcomeGettingStarted/common/media/workspaceTrust.svg
 %%DATADIR%%/resources/app/out/vs/workbench/services/extensionManagement/common/media/defaultIcon.png
-%%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html
-%%DATADIR%%/resources/app/out/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorker.esm.js
-%%DATADIR%%/resources/app/out/vs/workbench/services/search/worker/localFileSearch.esm.js
-%%DATADIR%%/resources/app/out/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.worker.esm.js
+%%DATADIR%%/resources/app/out/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+%%DATADIR%%/resources/app/out/vs/workbench/services/languageDetection/browser/languageDetectionSimpleWorkerMain.js
+%%DATADIR%%/resources/app/out/vs/workbench/services/search/worker/localFileSearchMain.js
+%%DATADIR%%/resources/app/out/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain.js
 %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.css
 %%DATADIR%%/resources/app/out/vs/workbench/workbench.desktop.main.js
 %%DATADIR%%/resources/app/out/vscode-dts/vscode.d.ts