From 16654e61265ca89e53612bb7a61f89f4e99aeb3c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 9 Jul 2024 08:08:56 +0200
Subject: [PATCH] esm - reduce diff to branch (#221154)

---
 scripts/code-server.js                        |   1 -
 src/bootstrap-amd.js                          | 152 ++++++++++----
 src/bootstrap-fork.js                         |  15 +-
 src/bootstrap-meta.js                         |  16 +-
 src/bootstrap-node.js                         |  74 ++++---
 src/bootstrap-window.js                       | 188 +++++++++++++-----
 src/bootstrap.js                              |  24 ++-
 src/cli.js                                    |  29 ++-
 src/main.js                                   |  42 ++--
 src/server-cli.js                             |  20 +-
 src/server-main.js                            |  46 +++--
 src/tsec.exemptions.json                      |   3 +
 src/typings/vscode-globals-product.d.ts       |  11 +
 src/vs/base/common/jsonc.js                   |  12 +-
 src/vs/base/common/performance.js             |   9 +
 src/vs/base/common/semver/semver.d.ts         |   7 +-
 src/vs/base/common/semver/semver.js           |  45 +++++
 src/vs/base/node/nls.js                       |  14 ++
 src/vs/base/node/unc.js                       |  12 ++
 .../base/parts/sandbox/common/sandboxTypes.ts |   5 +
 src/vs/base/parts/storage/node/storage.ts     |   8 +-
 .../processExplorer/processExplorer.js        |   3 +-
 .../electron-sandbox/workbench/workbench.js   |   3 +-
 .../platform/environment/node/userDataPath.js |  16 +-
 .../node/nativeModules.integrationTest.ts     |   5 +
 src/vs/platform/request/node/proxy.ts         |  20 +-
 src/vs/platform/terminal/node/ptyService.ts   |   9 +-
 src/vs/server/node/server.cli.ts              |  39 ++--
 .../api/node/extHostExtensionService.ts       |   6 +-
 src/vs/workbench/api/node/proxyResolver.ts    |  11 +
 .../issue/electron-sandbox/issueReporter.js   |   3 +-
 31 files changed, 650 insertions(+), 198 deletions(-)

diff --git a/scripts/code-server.js b/scripts/code-server.js
index c043bf2671b..56945e76ca7 100644
--- a/scripts/code-server.js
+++ b/scripts/code-server.js
@@ -69,4 +69,3 @@ function startServer(programArgs) {
 }
 
 main();
-
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 27d15eb76d5..f8a0c00be95 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -7,10 +7,28 @@
 'use strict';
 
 /**
- * @typedef {import('./vs/nls').INLSConfiguration} INLSConfiguration
+ * @import { INLSConfiguration } from './vs/nls'
  * @import { IProductConfiguration } from './vs/base/common/product'
  */
 
+// ESM-comment-begin
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import * as fs from 'fs';
+// import { fileURLToPath } from 'url';
+// import { createRequire } from 'node:module';
+// import { product, pkg } from './bootstrap-meta.js';
+// import * as bootstrap from './bootstrap.js';
+// import * as performance from './vs/base/common/performance.js';
+//
+// const require = createRequire(import.meta.url);
+// const isESM = true;
+// const module = { exports: {} };
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
+
 // Store the node.js require function in a variable
 // before loading our AMD loader to avoid issues
 // when this file is bundled with other files.
@@ -21,7 +39,12 @@ globalThis._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target
 
 // VSCODE_GLOBALS: package/product.json
 /** @type Partial<IProductConfiguration> */
+// ESM-comment-begin
 globalThis._VSCODE_PRODUCT_JSON = require('./bootstrap-meta').product;
+// ESM-comment-end
+// ESM-uncomment-begin
+// globalThis._VSCODE_PRODUCT_JSON = { ...product };
+// ESM-uncomment-end
 if (process.env['VSCODE_DEV']) {
 	// Patch product overrides when running out of sources
 	try {
@@ -30,29 +53,21 @@ if (process.env['VSCODE_DEV']) {
 		globalThis._VSCODE_PRODUCT_JSON = Object.assign(globalThis._VSCODE_PRODUCT_JSON, overrides);
 	} catch (error) { /* ignore */ }
 }
+// ESM-comment-begin
 globalThis._VSCODE_PACKAGE_JSON = require('./bootstrap-meta').pkg;
+// ESM-comment-end
+// ESM-uncomment-begin
+// globalThis._VSCODE_PACKAGE_JSON = { ...pkg };
+// ESM-uncomment-end
 
-// @ts-ignore
-const loader = require('./vs/loader');
+// VSCODE_GLOBALS: file root of all resources
+globalThis._VSCODE_FILE_ROOT = __dirname;
+
+// ESM-comment-begin
 const bootstrap = require('./bootstrap');
-const performance = require('./vs/base/common/performance');
+const performance = require(`./vs/base/common/performance`);
 const fs = require('fs');
-
-// Bootstrap: Loader
-loader.config({
-	baseUrl: bootstrap.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }),
-	catchError: true,
-	nodeRequire,
-	amdModulesPattern: /^vs\//,
-	recordStats: true
-});
-
-// Running in Electron
-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
-	loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) {
-		return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
-	});
-}
+// ESM-comment-end
 
 //#region NLS helpers
 
@@ -138,31 +153,82 @@ async function doSetupNLS() {
 
 //#endregion
 
-/**
- * @param {string=} entrypoint
- * @param {(value: any) => void=} onLoad
- * @param {(err: Error) => void=} onError
- */
-exports.load = function (entrypoint, onLoad, onError) {
-	if (!entrypoint) {
-		return;
-	}
+//#region Loader Config
 
-	// code cache config
-	if (process.env['VSCODE_CODE_CACHE_PATH']) {
-		loader.config({
-			nodeCachedData: {
-				path: process.env['VSCODE_CODE_CACHE_PATH'],
-				seed: entrypoint
-			}
+if (isESM) {
+
+	/**
+	 * @param {string=} entrypoint
+	 * @param {(value: any) => void} [onLoad]
+	 * @param {(err: Error) => void} [onError]
+	 */
+	module.exports.load = function (entrypoint, onLoad, onError) {
+		if (!entrypoint) {
+			return;
+		}
+
+		entrypoint = `./${entrypoint}.js`;
+
+		onLoad = onLoad || function () { };
+		onError = onError || function (err) { console.error(err); };
+
+		setupNLS().then(() => {
+			performance.mark(`code/fork/willLoadCode`);
+			import(entrypoint).then(onLoad, onError);
+		});
+	};
+} else {
+
+	// @ts-ignore
+	const loader = require('./vs/loader');
+
+	loader.config({
+		baseUrl: bootstrap.fileUriFromPath(__dirname, { isWindows: process.platform === 'win32' }),
+		catchError: true,
+		nodeRequire,
+		amdModulesPattern: /^vs\//,
+		recordStats: true
+	});
+
+	// Running in Electron
+	if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+		loader.define('fs', ['original-fs'], function (/** @type {import('fs')} */originalFS) {
+			return originalFS;  // replace the patched electron fs with the original node fs for all AMD code
 		});
 	}
 
-	onLoad = onLoad || function () { };
-	onError = onError || function (err) { console.error(err); };
+	/**
+	 * @param {string=} entrypoint
+	 * @param {(value: any) => void} [onLoad]
+	 * @param {(err: Error) => void} [onError]
+	 */
+	module.exports.load = function (entrypoint, onLoad, onError) {
+		if (!entrypoint) {
+			return;
+		}
 
-	setupNLS().then(() => {
-		performance.mark('code/fork/willLoadCode');
-		loader([entrypoint], onLoad, onError);
-	});
-};
+		// code cache config
+		if (process.env['VSCODE_CODE_CACHE_PATH']) {
+			loader.config({
+				nodeCachedData: {
+					path: process.env['VSCODE_CODE_CACHE_PATH'],
+					seed: entrypoint
+				}
+			});
+		}
+
+		onLoad = onLoad || function () { };
+		onError = onError || function (err) { console.error(err); };
+
+		setupNLS().then(() => {
+			performance.mark('code/fork/willLoadCode');
+			loader([entrypoint], onLoad, onError);
+		});
+	};
+}
+
+//#endregion
+
+// ESM-uncomment-begin
+// export const load = module.exports.load;
+// ESM-uncomment-end
diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
index 9de1e6f0d15..a95cbf53589 100644
--- a/src/bootstrap-fork.js
+++ b/src/bootstrap-fork.js
@@ -6,11 +6,20 @@
 //@ts-check
 'use strict';
 
+// ESM-comment-begin
 const performance = require('./vs/base/common/performance');
-performance.mark('code/fork/start');
-
 const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
+const bootstrapAmd = require('./bootstrap-amd');
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as performance from './vs/base/common/performance.js';
+// import * as bootstrap from './bootstrap.js';
+// import * as bootstrapNode from './bootstrap-node.js';
+// import * as bootstrapAmd from './bootstrap-amd.js';
+// ESM-uncomment-end
+
+performance.mark('code/fork/start');
 
 // Crash reporter
 configureCrashReporter();
@@ -41,7 +50,7 @@ if (process.env['VSCODE_PARENT_PID']) {
 }
 
 // Load AMD entry point
-require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
+bootstrapAmd.load(process.env['VSCODE_AMD_ENTRYPOINT']);
 
 
 //#region Helpers
diff --git a/src/bootstrap-meta.js b/src/bootstrap-meta.js
index 7924b77eec8..46041d5d91a 100644
--- a/src/bootstrap-meta.js
+++ b/src/bootstrap-meta.js
@@ -10,6 +10,13 @@
  * @import { IProductConfiguration } from './vs/base/common/product'
  */
 
+// ESM-uncomment-begin
+// import { createRequire } from 'node:module';
+//
+// const require = createRequire(import.meta.url);
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 /** @type Partial<IProductConfiguration> & { BUILD_INSERT_PRODUCT_CONFIGURATION?: string } */
 let product = { BUILD_INSERT_PRODUCT_CONFIGURATION: 'BUILD_INSERT_PRODUCT_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
 if (product['BUILD_INSERT_PRODUCT_CONFIGURATION']) {
@@ -24,5 +31,10 @@ if (pkg['BUILD_INSERT_PACKAGE_CONFIGURATION']) {
 	pkg = require('../package.json'); // Running out of sources
 }
 
-exports.product = product;
-exports.pkg = pkg;
+module.exports.product = product;
+module.exports.pkg = pkg;
+
+// ESM-uncomment-begin
+// export const product = module.exports.product;
+// export const pkg = module.exports.pkg;
+// ESM-uncomment-end
diff --git a/src/bootstrap-node.js b/src/bootstrap-node.js
index 914b8290380..4a829557f0d 100644
--- a/src/bootstrap-node.js
+++ b/src/bootstrap-node.js
@@ -6,12 +6,28 @@
 //@ts-check
 'use strict';
 
+// ESM-comment-begin
+const path = require('path');
+const fs = require('fs');
+
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import * as fs from 'fs';
+// import { fileURLToPath } from 'url';
+// import { createRequire } from 'node:module';
+//
+// const require = createRequire(import.meta.url);
+// const isESM = true;
+// const module = { exports: {} };
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
+
 // Setup current working directory in all our node & electron processes
 // - Windows: call `process.chdir()` to always set application folder as cwd
 // -  all OS: store the `process.cwd()` inside `VSCODE_CWD` for consistent lookups
 function setupCurrentWorkingDirectory() {
-	const path = require('path');
-
 	try {
 
 		// Store the `process.cwd()` inside `VSCODE_CWD`
@@ -38,36 +54,41 @@ setupCurrentWorkingDirectory();
  *
  * @param {string} injectPath
  */
-exports.injectNodeModuleLookupPath = function (injectPath) {
+module.exports.injectNodeModuleLookupPath = function (injectPath) {
 	if (!injectPath) {
 		throw new Error('Missing injectPath');
 	}
 
-	const Module = require('module');
-	const path = require('path');
+	const Module = require('node:module');
+	if (isESM) {
+		// register a loader hook
+		// ESM-uncomment-begin
+		// Module.register('./server-loader.mjs', { parentURL: import.meta.url, data: injectPath });
+		// ESM-uncomment-end
+	} else {
+		const nodeModulesPath = path.join(__dirname, '../node_modules');
 
-	const nodeModulesPath = path.join(__dirname, '../node_modules');
+		// @ts-ignore
+		const originalResolveLookupPaths = Module._resolveLookupPaths;
 
-	// @ts-ignore
-	const originalResolveLookupPaths = Module._resolveLookupPaths;
-
-	// @ts-ignore
-	Module._resolveLookupPaths = function (moduleName, parent) {
-		const paths = originalResolveLookupPaths(moduleName, parent);
-		if (Array.isArray(paths)) {
-			for (let i = 0, len = paths.length; i < len; i++) {
-				if (paths[i] === nodeModulesPath) {
-					paths.splice(i, 0, injectPath);
-					break;
+		// @ts-ignore
+		Module._resolveLookupPaths = function (moduleName, parent) {
+			const paths = originalResolveLookupPaths(moduleName, parent);
+			if (Array.isArray(paths)) {
+				for (let i = 0, len = paths.length; i < len; i++) {
+					if (paths[i] === nodeModulesPath) {
+						paths.splice(i, 0, injectPath);
+						break;
+					}
 				}
 			}
-		}
 
-		return paths;
-	};
+			return paths;
+		};
+	}
 };
 
-exports.removeGlobalNodeModuleLookupPaths = function () {
+module.exports.removeGlobalNodeModuleLookupPaths = function () {
 	const Module = require('module');
 	// @ts-ignore
 	const globalPaths = Module.globalPaths;
@@ -95,10 +116,7 @@ exports.removeGlobalNodeModuleLookupPaths = function () {
  * @param {Partial<import('./vs/base/common/product').IProductConfiguration>} product
  * @returns {{ portableDataPath: string; isPortable: boolean; }}
  */
-exports.configurePortable = function (product) {
-	const fs = require('fs');
-	const path = require('path');
-
+module.exports.configurePortable = function (product) {
 	const appRoot = path.dirname(__dirname);
 
 	/**
@@ -158,3 +176,9 @@ exports.configurePortable = function (product) {
 		isPortable
 	};
 };
+
+// ESM-uncomment-begin
+// export const injectNodeModuleLookupPath = module.exports.injectNodeModuleLookupPath;
+// export const removeGlobalNodeModuleLookupPaths = module.exports.removeGlobalNodeModuleLookupPaths;
+// export const configurePortable = module.exports.configurePortable;
+// ESM-uncomment-end
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
index cd859a847f9..59ddc3fdfbf 100644
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -10,12 +10,20 @@
 
 /**
  * @import { ISandboxConfiguration } from './vs/base/parts/sandbox/common/sandboxTypes'
+ * @typedef {any} LoaderConfig
  */
 
-/* eslint-disable no-restricted-globals */
+/* eslint-disable no-restricted-globals,  */
+
+// ESM-comment-begin
+const isESM = false;
+// ESM-comment-end
+// ESM-uncomment-begin
+// const isESM = true;
+// ESM-uncomment-end
 
 // Simple module style to support node.js and browser environments
-(function (globalThis, factory) {
+(function (factory) {
 
 	// Node.js
 	if (typeof exports === 'object') {
@@ -27,7 +35,7 @@
 		// @ts-ignore
 		globalThis.MonacoBootstrapWindow = factory();
 	}
-}(this, function () {
+}(function () {
 	const bootstrapLib = bootstrap();
 	const preloadGlobals = sandboxGlobals();
 	const safeProcess = preloadGlobals.process;
@@ -96,59 +104,137 @@
 
 		window['MonacoEnvironment'] = {};
 
-		/** @type {any} */
-		const loaderConfig = {
-			baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
-			preferScriptTags: true
-		};
+		if (isESM) {
 
-		// use a trusted types policy when loading via script tags
-		loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
-			createScriptURL(value) {
-				if (value.startsWith(window.location.origin)) {
-					return value;
-				}
-				throw new Error(`Invalid script url: ${value}`);
+			// Signal before require()
+			if (typeof options?.beforeRequire === 'function') {
+				options.beforeRequire(configuration);
 			}
-		});
 
-		// Teach the loader the location of the node modules we use in renderers
-		// This will enable to load these modules via <script> tags instead of
-		// using a fallback such as node.js require which does not exist in sandbox
-		const baseNodeModulesPath = isDev ? '../node_modules' : '../node_modules.asar';
-		loaderConfig.paths = {
-			'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
-			'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
-			'vsda': `${baseNodeModulesPath}/vsda/index.js`,
-			'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
-			'@xterm/addon-clipboard': `${baseNodeModulesPath}/@xterm/addon-clipboard/lib/addon-clipboard.js`,
-			'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
-			'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
-			'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
-			'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
-			'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
-			'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
-			'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
-			'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
-			'vscode-regexp-languagedetection': `${baseNodeModulesPath}/vscode-regexp-languagedetection/dist/index.js`,
-			'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
-		};
+			const fileRoot = `${configuration.appRoot}/out`;
+			globalThis._VSCODE_FILE_ROOT = fileRoot;
 
-		// Signal before require.config()
-		if (typeof options?.beforeLoaderConfig === 'function') {
-			options.beforeLoaderConfig(loaderConfig);
+			// DEV ---------------------------------------------------------------------------------------
+			// DEV: This is for development and enables loading CSS via import-statements via import-maps.
+			// DEV: For each CSS modules that we have we defined an entry in the import map that maps to
+			// DEV: a blob URL that loads the CSS via a dynamic @import-rule.
+			// DEV ---------------------------------------------------------------------------------------
+			if (configuration.cssModules) {
+				performance.mark('code/willAddCssLoader');
+
+				const style = document.createElement('style');
+				style.type = 'text/css';
+				style.media = 'screen';
+				style.id = 'vscode-css-loading';
+				document.head.appendChild(style);
+
+				globalThis._VSCODE_CSS_LOAD = function (url) {
+					style.textContent += `@import url(${url});\n`;
+				};
+
+				const baseUrl = new URL(`vscode-file://vscode-app${fileRoot}/`);
+				/**
+				 * @type { { imports: Record<string, string> }}
+				 */
+				const importMap = { imports: {} };
+				for (const cssModule of configuration.cssModules) {
+					const cssUrl = new URL(cssModule, baseUrl).href;
+					const jsSrc = `globalThis._VSCODE_CSS_LOAD('${cssUrl}');\n`;
+					const blob = new Blob([jsSrc], { type: 'application/javascript' });
+					importMap.imports[cssUrl] = URL.createObjectURL(blob);
+				}
+
+				const ttp = window.trustedTypes?.createPolicy('vscode-bootstrapImportMap', { createScript(value) { return value; }, });
+				const importMapSrc = JSON.stringify(importMap, undefined, 2);
+				const importMapScript = document.createElement('script');
+				importMapScript.type = 'importmap';
+				importMapScript.setAttribute('nonce', '0c6a828f1297');
+				// @ts-ignore
+				importMapScript.textContent = ttp?.createScript(importMapSrc) ?? importMapSrc;
+				document.head.appendChild(importMapScript);
+
+				performance.mark('code/didAddCssLoader');
+			}
+
+			const result = Promise.all(modulePaths.map(modulePath => {
+				if (modulePath.includes('vs/css!')) {
+					// ESM/CSS when seeing the old `vs/css!` prefix we use that as a signal to
+					// load CSS via a <link> tag
+					const cssModule = modulePath.replace('vs/css!', '');
+					const link = document.createElement('link');
+					link.rel = 'stylesheet';
+					link.href = `${configuration.appRoot}/out/${cssModule}.css`;
+					document.head.appendChild(link);
+					return Promise.resolve();
+
+				} else {
+					// ESM/JS module loading
+					return import(`${configuration.appRoot}/out/${modulePath}.js`);
+				}
+			}));
+
+			result.then((res) => invokeResult(res[0]), onUnexpectedError);
+		} else {
+
+			/** @type {LoaderConfig} */
+			const loaderConfig = {
+				baseUrl: `${bootstrapLib.fileUriFromPath(configuration.appRoot, { isWindows: safeProcess.platform === 'win32', scheme: 'vscode-file', fallbackAuthority: 'vscode-app' })}/out`,
+				preferScriptTags: true
+			};
+
+			// use a trusted types policy when loading via script tags
+			loaderConfig.trustedTypesPolicy = window.trustedTypes?.createPolicy('amdLoader', {
+				createScriptURL(value) {
+					if (value.startsWith(window.location.origin)) {
+						return value;
+					}
+					throw new Error(`Invalid script url: ${value}`);
+				}
+			});
+
+			// Teach the loader the location of the node modules we use in renderers
+			// This will enable to load these modules via <script> tags instead of
+			// using a fallback such as node.js require which does not exist in sandbox
+			const baseNodeModulesPath = isDev ? '../node_modules' : '../node_modules.asar';
+			loaderConfig.paths = {
+				'vscode-textmate': `${baseNodeModulesPath}/vscode-textmate/release/main.js`,
+				'vscode-oniguruma': `${baseNodeModulesPath}/vscode-oniguruma/release/main.js`,
+				'vsda': `${baseNodeModulesPath}/vsda/index.js`,
+				'@xterm/xterm': `${baseNodeModulesPath}/@xterm/xterm/lib/xterm.js`,
+				'@xterm/addon-clipboard': `${baseNodeModulesPath}/@xterm/addon-clipboard/lib/addon-clipboard.js`,
+				'@xterm/addon-image': `${baseNodeModulesPath}/@xterm/addon-image/lib/addon-image.js`,
+				'@xterm/addon-search': `${baseNodeModulesPath}/@xterm/addon-search/lib/addon-search.js`,
+				'@xterm/addon-serialize': `${baseNodeModulesPath}/@xterm/addon-serialize/lib/addon-serialize.js`,
+				'@xterm/addon-unicode11': `${baseNodeModulesPath}/@xterm/addon-unicode11/lib/addon-unicode11.js`,
+				'@xterm/addon-webgl': `${baseNodeModulesPath}/@xterm/addon-webgl/lib/addon-webgl.js`,
+				'@vscode/iconv-lite-umd': `${baseNodeModulesPath}/@vscode/iconv-lite-umd/lib/iconv-lite-umd.js`,
+				'jschardet': `${baseNodeModulesPath}/jschardet/dist/jschardet.min.js`,
+				'@vscode/vscode-languagedetection': `${baseNodeModulesPath}/@vscode/vscode-languagedetection/dist/lib/index.js`,
+				'vscode-regexp-languagedetection': `${baseNodeModulesPath}/vscode-regexp-languagedetection/dist/index.js`,
+				'tas-client-umd': `${baseNodeModulesPath}/tas-client-umd/lib/tas-client-umd.js`
+			};
+
+			// Signal before require.config()
+			if (typeof options?.beforeLoaderConfig === 'function') {
+				options.beforeLoaderConfig(loaderConfig);
+			}
+
+			// Configure loader
+			require.config(loaderConfig);
+
+			// Signal before require()
+			if (typeof options?.beforeRequire === 'function') {
+				options.beforeRequire(configuration);
+			}
+
+			// Actually require the main module as specified
+			require(modulePaths, invokeResult, onUnexpectedError);
 		}
 
-		// Configure loader
-		require.config(loaderConfig);
-
-		// Signal before require()
-		if (typeof options?.beforeRequire === 'function') {
-			options.beforeRequire(configuration);
-		}
-
-		// Actually require the main module as specified
-		require(modulePaths, async firstModule => {
+		/**
+		 * @param {any} firstModule
+		 */
+		async function invokeResult(firstModule) {
 			try {
 
 				// Callback only after process environment is resolved
@@ -163,7 +249,7 @@
 			} catch (error) {
 				onUnexpectedError(error, enableDeveloperKeybindings);
 			}
-		}, onUnexpectedError);
+		}
 	}
 
 	/**
diff --git a/src/bootstrap.js b/src/bootstrap.js
index 8be098f4199..63e7501a696 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -6,11 +6,24 @@
 //@ts-check
 'use strict';
 
+// TODO@bpasero this file can no longer be used from a non-node.js context and thus should
+// move into bootstrap-node.js and remaining usages (if any) in browser context be replaced.
+
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import { createRequire } from 'node:module';
+// import { fileURLToPath } from 'url';
+//
+// const require = createRequire(import.meta.url);
+// const module = { exports: {} };
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
+
 // Simple module style to support node.js and browser environments
-(function (globalThis, factory) {
+(function (factory) {
 
 	// Node.js
-	if (typeof exports === 'object') {
+	if (typeof module === 'object' && typeof module.exports === 'object') {
 		module.exports = factory();
 	}
 
@@ -19,7 +32,7 @@
 		// @ts-ignore
 		globalThis.MonacoBootstrap = factory();
 	}
-}(this, function () {
+}(function () {
 	const Module = typeof require === 'function' ? require('module') : undefined;
 	const path = typeof require === 'function' ? require('path') : undefined;
 
@@ -121,3 +134,8 @@
 		fileUriFromPath
 	};
 }));
+
+// ESM-uncomment-begin
+// export const enableASARSupport = module.exports.enableASARSupport;
+// export const fileUriFromPath = module.exports.fileUriFromPath;
+// ESM-uncomment-end
diff --git a/src/cli.js b/src/cli.js
index 8191425eff9..898145f2ae3 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -6,19 +6,32 @@
 //@ts-check
 'use strict';
 
-// Delete `VSCODE_CWD` very early even before
-// importing bootstrap files. We have seen
+// ESM-comment-begin
+const bootstrap = require('./bootstrap');
+const bootstrapNode = require('./bootstrap-node');
+const bootstrapAmd = require('./bootstrap-amd');
+const { resolveNLSConfiguration } = require('./vs/base/node/nls');
+const product = require('./bootstrap-meta').product;
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import { fileURLToPath } from 'url';
+// import * as bootstrap from './bootstrap.js';
+// import * as bootstrapNode from './bootstrap-node.js';
+// import * as bootstrapAmd from './bootstrap-amd.js';
+// import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+// import { product } from './bootstrap-meta.js';
+//
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
+
+// Delete `VSCODE_CWD` very early. We have seen
 // reports where `code .` would use the wrong
 // current working directory due to our variable
 // somehow escaping to the parent shell
 // (https://github.com/microsoft/vscode/issues/126399)
 delete process.env['VSCODE_CWD'];
 
-const bootstrap = require('./bootstrap');
-const bootstrapNode = require('./bootstrap-node');
-const product = require('./bootstrap-meta').product;
-const { resolveNLSConfiguration } = require('./vs/base/node/nls');
-
 async function start() {
 
 	// NLS
@@ -36,7 +49,7 @@ async function start() {
 	process.env['VSCODE_CLI'] = '1';
 
 	// Load CLI through AMD loader
-	require('./bootstrap-amd').load('vs/code/node/cli');
+	bootstrapAmd.load('vs/code/node/cli');
 }
 
 start();
diff --git a/src/main.js b/src/main.js
index 7f909f7d633..f9a93b05844 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,19 +11,43 @@
  * @import { NativeParsedArgs } from './vs/platform/environment/common/argv'
  */
 
-const perf = require('./vs/base/common/performance');
-perf.mark('code/didStartMain');
-
+// ESM-comment-begin
 const path = require('path');
 const fs = require('original-fs');
 const os = require('os');
+const minimist = require('minimist');
 const bootstrap = require('./bootstrap');
 const bootstrapNode = require('./bootstrap-node');
-const { getUserDataPath } = require('./vs/platform/environment/node/userDataPath');
+const bootstrapAmd = require('./bootstrap-amd');
+const { getUserDataPath } = require(`./vs/platform/environment/node/userDataPath`);
 const { parse } = require('./vs/base/common/jsonc');
+const perf = require('./vs/base/common/performance');
+const { resolveNLSConfiguration } = require('./vs/base/node/nls');
 const { getUNCHost, addUNCHostToAllowlist } = require('./vs/base/node/unc');
 const product = require('./bootstrap-meta').product;
-const { app, protocol, crashReporter, Menu } = require('electron');
+const { app, protocol, crashReporter, Menu, contentTracing } = require('electron');
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import * as fs from 'original-fs';
+// import * as os from 'os';
+// import { fileURLToPath } from 'url';
+// import { app, protocol, crashReporter, Menu, contentTracing } from 'electron';
+// import minimist from 'minimist';
+// import * as bootstrap from './bootstrap.js';
+// import * as bootstrapNode from './bootstrap-node.js';
+// import * as bootstrapAmd from './bootstrap-amd.js';
+// import { product } from './bootstrap-meta.js';
+// import { parse } from './vs/base/common/jsonc.js';
+// import { getUserDataPath } from './vs/platform/environment/node/userDataPath.js';
+// import * as perf from './vs/base/common/performance.js';
+// import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+// import { getUNCHost, addUNCHostToAllowlist } from './vs/base/node/unc.js';
+//
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
+
+perf.mark('code/didStartMain');
 
 // Enable portable support
 const portable = bootstrapNode.configurePortable(product);
@@ -121,7 +145,6 @@ let nlsConfigurationPromise = undefined;
 const osLocale = processZhLocale((app.getPreferredSystemLanguages()?.[0] ?? 'en').toLowerCase());
 const userLocale = getUserDefinedLocale(argvConfig);
 if (userLocale) {
-	const { resolveNLSConfiguration } = require('./vs/base/node/nls');
 	nlsConfigurationPromise = resolveNLSConfiguration({
 		userLocale,
 		osLocale,
@@ -147,8 +170,6 @@ if (process.platform === 'win32' || process.platform === 'linux') {
 // Load our code once ready
 app.once('ready', function () {
 	if (args['trace']) {
-		const contentTracing = require('electron').contentTracing;
-
 		const traceOptions = {
 			categoryFilter: args['trace-category-filter'] || '*',
 			traceOptions: args['trace-options'] || 'record-until-full,enable-sampling'
@@ -187,7 +208,7 @@ function startup(codeCachePath, nlsConfig) {
 
 	// Load main in AMD
 	perf.mark('code/willLoadMainBundle');
-	require('./bootstrap-amd').load('vs/code/electron-main/main', () => {
+	bootstrapAmd.load('vs/code/electron-main/main', () => {
 		perf.mark('code/didLoadMainBundle');
 	});
 }
@@ -495,8 +516,6 @@ function getJSFlags(cliArgs) {
  * @returns {NativeParsedArgs}
  */
 function parseCLIArgs() {
-	const minimist = require('minimist');
-
 	return minimist(process.argv, {
 		string: [
 			'user-data-dir',
@@ -665,7 +684,6 @@ async function resolveNlsConfiguration() {
 	// See above the comment about the loader and case sensitiveness
 	userLocale = processZhLocale(userLocale.toLowerCase());
 
-	const { resolveNLSConfiguration } = require('./vs/base/node/nls');
 	return resolveNLSConfiguration({
 		userLocale,
 		osLocale,
diff --git a/src/server-cli.js b/src/server-cli.js
index aa041a66251..dc7fa459f03 100644
--- a/src/server-cli.js
+++ b/src/server-cli.js
@@ -6,9 +6,23 @@
 // @ts-check
 'use strict';
 
+// ESM-comment-begin
 const path = require('path');
-const product = require('./bootstrap-meta').product;
+const bootstrapNode = require('./bootstrap-node');
+const bootstrapAmd = require('./bootstrap-amd');
 const { resolveNLSConfiguration } = require('./vs/base/node/nls');
+const product = require('./bootstrap-meta').product;
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import { fileURLToPath } from 'url';
+// import * as bootstrapNode from './bootstrap-node.js';
+// import * as bootstrapAmd from './bootstrap-amd.js';
+// import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+// import { product } from './bootstrap-meta.js';
+//
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
 
 async function start() {
 
@@ -23,11 +37,11 @@ async function start() {
 		// When running out of sources, we need to load node modules from remote/node_modules,
 		// which are compiled against nodejs, not electron
 		process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-		require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
+		bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
 	} else {
 		delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
 	}
-	require('./bootstrap-amd').load('vs/server/node/server.cli');
+	bootstrapAmd.load('vs/server/node/server.cli');
 }
 
 start();
diff --git a/src/server-main.js b/src/server-main.js
index e5a90596962..f8c25856723 100644
--- a/src/server-main.js
+++ b/src/server-main.js
@@ -8,25 +8,46 @@
 
 /**
  * @import { INLSConfiguration } from './vs/nls'
- */
-
-/**
  * @import { IServerAPI } from './vs/server/node/remoteExtensionHostAgentServer'
  */
 
-const perf = require('./vs/base/common/performance');
-const performance = require('perf_hooks').performance;
-const product = require('./bootstrap-meta').product;
-const readline = require('readline');
+// ESM-comment-begin
+const path = require('path');
 const http = require('http');
+const os = require('os');
+const readline = require('readline');
+const performance = require('perf_hooks').performance;
+const bootstrapNode = require('./bootstrap-node');
+const bootstrapAmd = require('./bootstrap-amd');
 const { resolveNLSConfiguration } = require('./vs/base/node/nls');
+const product = require('./bootstrap-meta').product;
+const perf = require(`./vs/base/common/performance`);
+const minimist = require('minimist');
+// ESM-comment-end
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import * as http from 'http';
+// import * as os from 'os';
+// import * as readline from 'readline';
+// import { performance }from 'perf_hooks';
+// import { fileURLToPath } from 'url';
+// import { createRequire } from 'node:module';
+// import * as bootstrapNode from './bootstrap-node.js';
+// import * as bootstrapAmd from './bootstrap-amd.js';
+// import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+// import { product } from './bootstrap-meta.js';
+// import * as perf from './vs/base/common/performance.js';
+// import minimist from 'minimist';
+//
+// const require = createRequire(import.meta.url);
+// const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// ESM-uncomment-end
 
 perf.mark('code/server/start');
 // @ts-ignore
 global.vscodeServerStartTime = performance.now();
 
 async function start() {
-	const minimist = require('minimist');
 
 	// Do a quick parse to determine if a server or the cli needs to be started
 	const parsedArgs = minimist(process.argv.slice(2), {
@@ -73,9 +94,6 @@ async function start() {
 		return _remoteExtensionHostAgentServerPromise;
 	};
 
-	const http = require('http');
-	const os = require('os');
-
 	if (Array.isArray(product.serverLicense) && product.serverLicense.length) {
 		console.log(product.serverLicense.join('\n'));
 		if (product.serverLicensePrompt && parsedArgs['accept-server-license-terms'] !== true) {
@@ -263,8 +281,6 @@ async function findFreePort(host, start, end) {
  */
 function loadCode(nlsConfiguration) {
 	return new Promise((resolve, reject) => {
-		const path = require('path');
-
 		delete process.env['ELECTRON_RUN_AS_NODE']; // Keep bootstrap-amd.js from redefining 'fs'.
 
 		/** @type {INLSConfiguration} */
@@ -280,11 +296,11 @@ function loadCode(nlsConfiguration) {
 			// When running out of sources, we need to load node modules from remote/node_modules,
 			// which are compiled against nodejs, not electron
 			process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
-			require('./bootstrap-node').injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
+			bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
 		} else {
 			delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
 		}
-		require('./bootstrap-amd').load('vs/server/node/server.main', resolve, reject);
+		bootstrapAmd.load('vs/server/node/server.main', resolve, reject);
 	});
 }
 
diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json
index 5fef171569e..dd369477640 100644
--- a/src/tsec.exemptions.json
+++ b/src/tsec.exemptions.json
@@ -39,5 +39,8 @@
 	],
 	"ban-element-insertadjacenthtml": [
 		"**/*.ts"
+	],
+	"ban-script-content-assignments": [
+		"bootstrap-window.js"
 	]
 }
diff --git a/src/typings/vscode-globals-product.d.ts b/src/typings/vscode-globals-product.d.ts
index 780a6477de8..f6aa62bfe94 100644
--- a/src/typings/vscode-globals-product.d.ts
+++ b/src/typings/vscode-globals-product.d.ts
@@ -7,6 +7,17 @@
 
 declare global {
 
+	/**
+	 * Holds the file root for resources.
+	 */
+	var _VSCODE_FILE_ROOT: string;
+
+	/**
+	 * CSS loader that's available during development time.
+	 * DO NOT call directly, instead just import css modules, like `import 'some.css'`
+	 */
+	var _VSCODE_CSS_LOAD: (module: string) => void;
+
 	/**
 	 * @deprecated You MUST use `IProductService` whenever possible.
 	 */
diff --git a/src/vs/base/common/jsonc.js b/src/vs/base/common/jsonc.js
index 7d8eacfdc10..21e3b7eae4f 100644
--- a/src/vs/base/common/jsonc.js
+++ b/src/vs/base/common/jsonc.js
@@ -8,8 +8,13 @@
 //@ts-check
 'use strict';
 
+// ESM-uncomment-begin
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 (function () {
-	function factory(path, os, productName, cwd) {
+
+	function factory() {
 		// First group matches a double quoted string
 		// Second group matches a single quoted string
 		// Third group matches a multi line comment
@@ -77,3 +82,8 @@
 		console.trace('jsonc defined in UNKNOWN context (neither requirejs or commonjs)');
 	}
 })();
+
+// ESM-uncomment-begin
+// export const stripComments = module.exports.stripComments;
+// export const parse = module.exports.parse;
+// ESM-uncomment-end
diff --git a/src/vs/base/common/performance.js b/src/vs/base/common/performance.js
index 2af54743f33..cdea4917772 100644
--- a/src/vs/base/common/performance.js
+++ b/src/vs/base/common/performance.js
@@ -6,6 +6,10 @@
 //@ts-check
 'use strict';
 
+// ESM-uncomment-begin
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 (function () {
 
 	/**
@@ -124,3 +128,8 @@
 	}
 
 })();
+
+// ESM-uncomment-begin
+// export const mark = module.exports.mark;
+// export const getMarks = module.exports.getMarks;
+// ESM-uncomment-end
diff --git a/src/vs/base/common/semver/semver.d.ts b/src/vs/base/common/semver/semver.d.ts
index 61a55bac94f..1c2157f1916 100644
--- a/src/vs/base/common/semver/semver.d.ts
+++ b/src/vs/base/common/semver/semver.d.ts
@@ -3,9 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// ESM-comment-begin
 export as namespace semver;
-
 export = semver;
+// ESM-comment-end
+
+// ESM-uncomment-begin
+// export * from 'semver'
+// ESM-uncomment-end
 
 declare namespace semver {
 
diff --git a/src/vs/base/common/semver/semver.js b/src/vs/base/common/semver/semver.js
index 3eacfb1975f..ce02b4c993a 100644
--- a/src/vs/base/common/semver/semver.js
+++ b/src/vs/base/common/semver/semver.js
@@ -8,4 +8,49 @@
  * DO NOT EDIT THIS FILE
  */
 
+// ESM-uncomment-begin
+// const exports = {};
+// const module = { exports };
+// ESM-uncomment-end
+
 !function(e,r){if("object"==typeof exports&&"object"==typeof module)module.exports=r();else if("function"==typeof define&&define.amd)define([],r);else{var t=r();for(var n in t)("object"==typeof exports?exports:e)[n]=t[n]}}("undefined"!=typeof self?self:this,(function(){return function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=0)}([function(e,r,t){(function(t){var n;r=e.exports=H,n="object"==typeof t&&t.env&&t.env.NODE_DEBUG&&/\bsemver\b/i.test(t.env.NODE_DEBUG)?function(){var e=Array.prototype.slice.call(arguments,0);e.unshift("SEMVER"),console.log.apply(console,e)}:function(){},r.SEMVER_SPEC_VERSION="2.0.0";var o=256,i=Number.MAX_SAFE_INTEGER||9007199254740991,s=r.re=[],a=r.src=[],u=0,c=u++;a[c]="0|[1-9]\\d*";var p=u++;a[p]="[0-9]+";var f=u++;a[f]="\\d*[a-zA-Z-][a-zA-Z0-9-]*";var l=u++;a[l]="("+a[c]+")\\.("+a[c]+")\\.("+a[c]+")";var h=u++;a[h]="("+a[p]+")\\.("+a[p]+")\\.("+a[p]+")";var v=u++;a[v]="(?:"+a[c]+"|"+a[f]+")";var m=u++;a[m]="(?:"+a[p]+"|"+a[f]+")";var w=u++;a[w]="(?:-("+a[v]+"(?:\\."+a[v]+")*))";var g=u++;a[g]="(?:-?("+a[m]+"(?:\\."+a[m]+")*))";var y=u++;a[y]="[0-9A-Za-z-]+";var d=u++;a[d]="(?:\\+("+a[y]+"(?:\\."+a[y]+")*))";var b=u++,j="v?"+a[l]+a[w]+"?"+a[d]+"?";a[b]="^"+j+"$";var E="[v=\\s]*"+a[h]+a[g]+"?"+a[d]+"?",T=u++;a[T]="^"+E+"$";var x=u++;a[x]="((?:<|>)?=?)";var $=u++;a[$]=a[p]+"|x|X|\\*";var k=u++;a[k]=a[c]+"|x|X|\\*";var S=u++;a[S]="[v=\\s]*("+a[k]+")(?:\\.("+a[k]+")(?:\\.("+a[k]+")(?:"+a[w]+")?"+a[d]+"?)?)?";var R=u++;a[R]="[v=\\s]*("+a[$]+")(?:\\.("+a[$]+")(?:\\.("+a[$]+")(?:"+a[g]+")?"+a[d]+"?)?)?";var I=u++;a[I]="^"+a[x]+"\\s*"+a[S]+"$";var _=u++;a[_]="^"+a[x]+"\\s*"+a[R]+"$";var O=u++;a[O]="(?:^|[^\\d])(\\d{1,16})(?:\\.(\\d{1,16}))?(?:\\.(\\d{1,16}))?(?:$|[^\\d])";var A=u++;a[A]="(?:~>?)";var M=u++;a[M]="(\\s*)"+a[A]+"\\s+",s[M]=new RegExp(a[M],"g");var V=u++;a[V]="^"+a[A]+a[S]+"$";var P=u++;a[P]="^"+a[A]+a[R]+"$";var C=u++;a[C]="(?:\\^)";var L=u++;a[L]="(\\s*)"+a[C]+"\\s+",s[L]=new RegExp(a[L],"g");var N=u++;a[N]="^"+a[C]+a[S]+"$";var q=u++;a[q]="^"+a[C]+a[R]+"$";var D=u++;a[D]="^"+a[x]+"\\s*("+E+")$|^$";var X=u++;a[X]="^"+a[x]+"\\s*("+j+")$|^$";var z=u++;a[z]="(\\s*)"+a[x]+"\\s*("+E+"|"+a[S]+")",s[z]=new RegExp(a[z],"g");var G=u++;a[G]="^\\s*("+a[S]+")\\s+-\\s+("+a[S]+")\\s*$";var Z=u++;a[Z]="^\\s*("+a[R]+")\\s+-\\s+("+a[R]+")\\s*$";var B=u++;a[B]="(<|>)?=?\\s*\\*";for(var U=0;U<35;U++)n(U,a[U]),s[U]||(s[U]=new RegExp(a[U]));function F(e,r){if(e instanceof H)return e;if("string"!=typeof e)return null;if(e.length>o)return null;if(!(r?s[T]:s[b]).test(e))return null;try{return new H(e,r)}catch(e){return null}}function H(e,r){if(e instanceof H){if(e.loose===r)return e;e=e.version}else if("string"!=typeof e)throw new TypeError("Invalid Version: "+e);if(e.length>o)throw new TypeError("version is longer than "+o+" characters");if(!(this instanceof H))return new H(e,r);n("SemVer",e,r),this.loose=r;var t=e.trim().match(r?s[T]:s[b]);if(!t)throw new TypeError("Invalid Version: "+e);if(this.raw=e,this.major=+t[1],this.minor=+t[2],this.patch=+t[3],this.major>i||this.major<0)throw new TypeError("Invalid major version");if(this.minor>i||this.minor<0)throw new TypeError("Invalid minor version");if(this.patch>i||this.patch<0)throw new TypeError("Invalid patch version");t[4]?this.prerelease=t[4].split(".").map((function(e){if(/^[0-9]+$/.test(e)){var r=+e;if(r>=0&&r<i)return r}return e})):this.prerelease=[],this.build=t[5]?t[5].split("."):[],this.format()}r.parse=F,r.valid=function(e,r){var t=F(e,r);return t?t.version:null},r.clean=function(e,r){var t=F(e.trim().replace(/^[=v]+/,""),r);return t?t.version:null},r.SemVer=H,H.prototype.format=function(){return this.version=this.major+"."+this.minor+"."+this.patch,this.prerelease.length&&(this.version+="-"+this.prerelease.join(".")),this.version},H.prototype.toString=function(){return this.version},H.prototype.compare=function(e){return n("SemVer.compare",this.version,this.loose,e),e instanceof H||(e=new H(e,this.loose)),this.compareMain(e)||this.comparePre(e)},H.prototype.compareMain=function(e){return e instanceof H||(e=new H(e,this.loose)),K(this.major,e.major)||K(this.minor,e.minor)||K(this.patch,e.patch)},H.prototype.comparePre=function(e){if(e instanceof H||(e=new H(e,this.loose)),this.prerelease.length&&!e.prerelease.length)return-1;if(!this.prerelease.length&&e.prerelease.length)return 1;if(!this.prerelease.length&&!e.prerelease.length)return 0;var r=0;do{var t=this.prerelease[r],o=e.prerelease[r];if(n("prerelease compare",r,t,o),void 0===t&&void 0===o)return 0;if(void 0===o)return 1;if(void 0===t)return-1;if(t!==o)return K(t,o)}while(++r)},H.prototype.inc=function(e,r){switch(e){case"premajor":this.prerelease.length=0,this.patch=0,this.minor=0,this.major++,this.inc("pre",r);break;case"preminor":this.prerelease.length=0,this.patch=0,this.minor++,this.inc("pre",r);break;case"prepatch":this.prerelease.length=0,this.inc("patch",r),this.inc("pre",r);break;case"prerelease":0===this.prerelease.length&&this.inc("patch",r),this.inc("pre",r);break;case"major":0===this.minor&&0===this.patch&&0!==this.prerelease.length||this.major++,this.minor=0,this.patch=0,this.prerelease=[];break;case"minor":0===this.patch&&0!==this.prerelease.length||this.minor++,this.patch=0,this.prerelease=[];break;case"patch":0===this.prerelease.length&&this.patch++,this.prerelease=[];break;case"pre":if(0===this.prerelease.length)this.prerelease=[0];else{for(var t=this.prerelease.length;--t>=0;)"number"==typeof this.prerelease[t]&&(this.prerelease[t]++,t=-2);-1===t&&this.prerelease.push(0)}r&&(this.prerelease[0]===r?isNaN(this.prerelease[1])&&(this.prerelease=[r,0]):this.prerelease=[r,0]);break;default:throw new Error("invalid increment argument: "+e)}return this.format(),this.raw=this.version,this},r.inc=function(e,r,t,n){"string"==typeof t&&(n=t,t=void 0);try{return new H(e,t).inc(r,n).version}catch(e){return null}},r.diff=function(e,r){if(ee(e,r))return null;var t=F(e),n=F(r);if(t.prerelease.length||n.prerelease.length){for(var o in t)if(("major"===o||"minor"===o||"patch"===o)&&t[o]!==n[o])return"pre"+o;return"prerelease"}for(var o in t)if(("major"===o||"minor"===o||"patch"===o)&&t[o]!==n[o])return o},r.compareIdentifiers=K;var J=/^[0-9]+$/;function K(e,r){var t=J.test(e),n=J.test(r);return t&&n&&(e=+e,r=+r),t&&!n?-1:n&&!t?1:e<r?-1:e>r?1:0}function Q(e,r,t){return new H(e,t).compare(new H(r,t))}function W(e,r,t){return Q(e,r,t)>0}function Y(e,r,t){return Q(e,r,t)<0}function ee(e,r,t){return 0===Q(e,r,t)}function re(e,r,t){return 0!==Q(e,r,t)}function te(e,r,t){return Q(e,r,t)>=0}function ne(e,r,t){return Q(e,r,t)<=0}function oe(e,r,t,n){var o;switch(r){case"===":"object"==typeof e&&(e=e.version),"object"==typeof t&&(t=t.version),o=e===t;break;case"!==":"object"==typeof e&&(e=e.version),"object"==typeof t&&(t=t.version),o=e!==t;break;case"":case"=":case"==":o=ee(e,t,n);break;case"!=":o=re(e,t,n);break;case">":o=W(e,t,n);break;case">=":o=te(e,t,n);break;case"<":o=Y(e,t,n);break;case"<=":o=ne(e,t,n);break;default:throw new TypeError("Invalid operator: "+r)}return o}function ie(e,r){if(e instanceof ie){if(e.loose===r)return e;e=e.value}if(!(this instanceof ie))return new ie(e,r);n("comparator",e,r),this.loose=r,this.parse(e),this.semver===se?this.value="":this.value=this.operator+this.semver.version,n("comp",this)}r.rcompareIdentifiers=function(e,r){return K(r,e)},r.major=function(e,r){return new H(e,r).major},r.minor=function(e,r){return new H(e,r).minor},r.patch=function(e,r){return new H(e,r).patch},r.compare=Q,r.compareLoose=function(e,r){return Q(e,r,!0)},r.rcompare=function(e,r,t){return Q(r,e,t)},r.sort=function(e,t){return e.sort((function(e,n){return r.compare(e,n,t)}))},r.rsort=function(e,t){return e.sort((function(e,n){return r.rcompare(e,n,t)}))},r.gt=W,r.lt=Y,r.eq=ee,r.neq=re,r.gte=te,r.lte=ne,r.cmp=oe,r.Comparator=ie;var se={};function ae(e,r){if(e instanceof ae)return e.loose===r?e:new ae(e.raw,r);if(e instanceof ie)return new ae(e.value,r);if(!(this instanceof ae))return new ae(e,r);if(this.loose=r,this.raw=e,this.set=e.split(/\s*\|\|\s*/).map((function(e){return this.parseRange(e.trim())}),this).filter((function(e){return e.length})),!this.set.length)throw new TypeError("Invalid SemVer Range: "+e);this.format()}function ue(e){return!e||"x"===e.toLowerCase()||"*"===e}function ce(e,r,t,n,o,i,s,a,u,c,p,f,l){return((r=ue(t)?"":ue(n)?">="+t+".0.0":ue(o)?">="+t+"."+n+".0":">="+r)+" "+(a=ue(u)?"":ue(c)?"<"+(+u+1)+".0.0":ue(p)?"<"+u+"."+(+c+1)+".0":f?"<="+u+"."+c+"."+p+"-"+f:"<="+a)).trim()}function pe(e,r){for(var t=0;t<e.length;t++)if(!e[t].test(r))return!1;if(r.prerelease.length){for(t=0;t<e.length;t++)if(n(e[t].semver),e[t].semver!==se&&e[t].semver.prerelease.length>0){var o=e[t].semver;if(o.major===r.major&&o.minor===r.minor&&o.patch===r.patch)return!0}return!1}return!0}function fe(e,r,t){try{r=new ae(r,t)}catch(e){return!1}return r.test(e)}function le(e,r,t,n){var o,i,s,a,u;switch(e=new H(e,n),r=new ae(r,n),t){case">":o=W,i=ne,s=Y,a=">",u=">=";break;case"<":o=Y,i=te,s=W,a="<",u="<=";break;default:throw new TypeError('Must provide a hilo val of "<" or ">"')}if(fe(e,r,n))return!1;for(var c=0;c<r.set.length;++c){var p=r.set[c],f=null,l=null;if(p.forEach((function(e){e.semver===se&&(e=new ie(">=0.0.0")),f=f||e,l=l||e,o(e.semver,f.semver,n)?f=e:s(e.semver,l.semver,n)&&(l=e)})),f.operator===a||f.operator===u)return!1;if((!l.operator||l.operator===a)&&i(e,l.semver))return!1;if(l.operator===u&&s(e,l.semver))return!1}return!0}ie.prototype.parse=function(e){var r=this.loose?s[D]:s[X],t=e.match(r);if(!t)throw new TypeError("Invalid comparator: "+e);this.operator=t[1],"="===this.operator&&(this.operator=""),t[2]?this.semver=new H(t[2],this.loose):this.semver=se},ie.prototype.toString=function(){return this.value},ie.prototype.test=function(e){return n("Comparator.test",e,this.loose),this.semver===se||("string"==typeof e&&(e=new H(e,this.loose)),oe(e,this.operator,this.semver,this.loose))},ie.prototype.intersects=function(e,r){if(!(e instanceof ie))throw new TypeError("a Comparator is required");var t;if(""===this.operator)return t=new ae(e.value,r),fe(this.value,t,r);if(""===e.operator)return t=new ae(this.value,r),fe(e.semver,t,r);var n=!(">="!==this.operator&&">"!==this.operator||">="!==e.operator&&">"!==e.operator),o=!("<="!==this.operator&&"<"!==this.operator||"<="!==e.operator&&"<"!==e.operator),i=this.semver.version===e.semver.version,s=!(">="!==this.operator&&"<="!==this.operator||">="!==e.operator&&"<="!==e.operator),a=oe(this.semver,"<",e.semver,r)&&(">="===this.operator||">"===this.operator)&&("<="===e.operator||"<"===e.operator),u=oe(this.semver,">",e.semver,r)&&("<="===this.operator||"<"===this.operator)&&(">="===e.operator||">"===e.operator);return n||o||i&&s||a||u},r.Range=ae,ae.prototype.format=function(){return this.range=this.set.map((function(e){return e.join(" ").trim()})).join("||").trim(),this.range},ae.prototype.toString=function(){return this.range},ae.prototype.parseRange=function(e){var r=this.loose;e=e.trim(),n("range",e,r);var t=r?s[Z]:s[G];e=e.replace(t,ce),n("hyphen replace",e),e=e.replace(s[z],"$1$2$3"),n("comparator trim",e,s[z]),e=(e=(e=e.replace(s[M],"$1~")).replace(s[L],"$1^")).split(/\s+/).join(" ");var o=r?s[D]:s[X],i=e.split(" ").map((function(e){return function(e,r){return n("comp",e),e=function(e,r){return e.trim().split(/\s+/).map((function(e){return function(e,r){n("caret",e,r);var t=r?s[q]:s[N];return e.replace(t,(function(r,t,o,i,s){var a;return n("caret",e,r,t,o,i,s),ue(t)?a="":ue(o)?a=">="+t+".0.0 <"+(+t+1)+".0.0":ue(i)?a="0"===t?">="+t+"."+o+".0 <"+t+"."+(+o+1)+".0":">="+t+"."+o+".0 <"+(+t+1)+".0.0":s?(n("replaceCaret pr",s),"-"!==s.charAt(0)&&(s="-"+s),a="0"===t?"0"===o?">="+t+"."+o+"."+i+s+" <"+t+"."+o+"."+(+i+1):">="+t+"."+o+"."+i+s+" <"+t+"."+(+o+1)+".0":">="+t+"."+o+"."+i+s+" <"+(+t+1)+".0.0"):(n("no pr"),a="0"===t?"0"===o?">="+t+"."+o+"."+i+" <"+t+"."+o+"."+(+i+1):">="+t+"."+o+"."+i+" <"+t+"."+(+o+1)+".0":">="+t+"."+o+"."+i+" <"+(+t+1)+".0.0"),n("caret return",a),a}))}(e,r)})).join(" ")}(e,r),n("caret",e),e=function(e,r){return e.trim().split(/\s+/).map((function(e){return function(e,r){var t=r?s[P]:s[V];return e.replace(t,(function(r,t,o,i,s){var a;return n("tilde",e,r,t,o,i,s),ue(t)?a="":ue(o)?a=">="+t+".0.0 <"+(+t+1)+".0.0":ue(i)?a=">="+t+"."+o+".0 <"+t+"."+(+o+1)+".0":s?(n("replaceTilde pr",s),"-"!==s.charAt(0)&&(s="-"+s),a=">="+t+"."+o+"."+i+s+" <"+t+"."+(+o+1)+".0"):a=">="+t+"."+o+"."+i+" <"+t+"."+(+o+1)+".0",n("tilde return",a),a}))}(e,r)})).join(" ")}(e,r),n("tildes",e),e=function(e,r){return n("replaceXRanges",e,r),e.split(/\s+/).map((function(e){return function(e,r){e=e.trim();var t=r?s[_]:s[I];return e.replace(t,(function(r,t,o,i,s,a){n("xRange",e,r,t,o,i,s,a);var u=ue(o),c=u||ue(i),p=c||ue(s);return"="===t&&p&&(t=""),u?r=">"===t||"<"===t?"<0.0.0":"*":t&&p?(c&&(i=0),p&&(s=0),">"===t?(t=">=",c?(o=+o+1,i=0,s=0):p&&(i=+i+1,s=0)):"<="===t&&(t="<",c?o=+o+1:i=+i+1),r=t+o+"."+i+"."+s):c?r=">="+o+".0.0 <"+(+o+1)+".0.0":p&&(r=">="+o+"."+i+".0 <"+o+"."+(+i+1)+".0"),n("xRange return",r),r}))}(e,r)})).join(" ")}(e,r),n("xrange",e),e=function(e,r){return n("replaceStars",e,r),e.trim().replace(s[B],"")}(e,r),n("stars",e),e}(e,r)})).join(" ").split(/\s+/);return this.loose&&(i=i.filter((function(e){return!!e.match(o)}))),i=i.map((function(e){return new ie(e,r)}))},ae.prototype.intersects=function(e,r){if(!(e instanceof ae))throw new TypeError("a Range is required");return this.set.some((function(t){return t.every((function(t){return e.set.some((function(e){return e.every((function(e){return t.intersects(e,r)}))}))}))}))},r.toComparators=function(e,r){return new ae(e,r).set.map((function(e){return e.map((function(e){return e.value})).join(" ").trim().split(" ")}))},ae.prototype.test=function(e){if(!e)return!1;"string"==typeof e&&(e=new H(e,this.loose));for(var r=0;r<this.set.length;r++)if(pe(this.set[r],e))return!0;return!1},r.satisfies=fe,r.maxSatisfying=function(e,r,t){var n=null,o=null;try{var i=new ae(r,t)}catch(e){return null}return e.forEach((function(e){i.test(e)&&(n&&-1!==o.compare(e)||(o=new H(n=e,t)))})),n},r.minSatisfying=function(e,r,t){var n=null,o=null;try{var i=new ae(r,t)}catch(e){return null}return e.forEach((function(e){i.test(e)&&(n&&1!==o.compare(e)||(o=new H(n=e,t)))})),n},r.validRange=function(e,r){try{return new ae(e,r).range||"*"}catch(e){return null}},r.ltr=function(e,r,t){return le(e,r,"<",t)},r.gtr=function(e,r,t){return le(e,r,">",t)},r.outside=le,r.prerelease=function(e,r){var t=F(e,r);return t&&t.prerelease.length?t.prerelease:null},r.intersects=function(e,r,t){return e=new ae(e,t),r=new ae(r,t),e.intersects(r)},r.coerce=function(e){if(e instanceof H)return e;if("string"!=typeof e)return null;var r=e.match(s[O]);return null==r?null:F((r[1]||"0")+"."+(r[2]||"0")+"."+(r[3]||"0"))}}).call(this,t(1))},function(e,r){var t,n,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(e){if(t===setTimeout)return setTimeout(e,0);if((t===i||!t)&&setTimeout)return t=setTimeout,setTimeout(e,0);try{return t(e,0)}catch(r){try{return t.call(null,e,0)}catch(r){return t.call(this,e,0)}}}!function(){try{t="function"==typeof setTimeout?setTimeout:i}catch(e){t=i}try{n="function"==typeof clearTimeout?clearTimeout:s}catch(e){n=s}}();var u,c=[],p=!1,f=-1;function l(){p&&u&&(p=!1,u.length?c=u.concat(c):f=-1,c.length&&h())}function h(){if(!p){var e=a(l);p=!0;for(var r=c.length;r;){for(u=c,c=[];++f<r;)u&&u[f].run();f=-1,r=c.length}u=null,p=!1,function(e){if(n===clearTimeout)return clearTimeout(e);if((n===s||!n)&&clearTimeout)return n=clearTimeout,clearTimeout(e);try{n(e)}catch(r){try{return n.call(null,e)}catch(r){return n.call(this,e)}}}(e)}}function v(e,r){this.fun=e,this.array=r}function m(){}o.nextTick=function(e){var r=new Array(arguments.length-1);if(arguments.length>1)for(var t=1;t<arguments.length;t++)r[t-1]=arguments[t];c.push(new v(e,r)),1!==c.length||p||a(h)},v.prototype.run=function(){this.fun.apply(null,this.array)},o.title="browser",o.browser=!0,o.env={},o.argv=[],o.version="",o.versions={},o.on=m,o.addListener=m,o.once=m,o.off=m,o.removeListener=m,o.removeAllListeners=m,o.emit=m,o.prependListener=m,o.prependOnceListener=m,o.listeners=function(e){return[]},o.binding=function(e){throw new Error("process.binding is not supported")},o.cwd=function(){return"/"},o.chdir=function(e){throw new Error("process.chdir is not supported")},o.umask=function(){return 0}}])}));
+
+// ESM-uncomment-begin
+// export const SEMVER_SPEC_VERSION = module.exports.SEMVER_SPEC_VERSION;
+// export const parse = module.exports.parse;
+// export const valid = module.exports.valid;
+// export const coerce = module.exports.coerce;
+// export const clean = module.exports.clean;
+// export const inc = module.exports.inc;
+// export const major = module.exports.major;
+// export const minor = module.exports.minor;
+// export const patch = module.exports.patch;
+// export const prerelease = module.exports.prerelease;
+// export const gt = module.exports.gt;
+// export const gte = module.exports.gte;
+// export const lt = module.exports.lt;
+// export const lte = module.exports.lte;
+// export const eq = module.exports.eq;
+// export const neq = module.exports.neq;
+// export const cmp = module.exports.cmp;
+// export const compare = module.exports.compare;
+// export const rcompare = module.exports.rcompare;
+// export const compareIdentifiers = module.exports.compareIdentifiers;
+// export const rcompareIdentifiers = module.exports.rcompareIdentifiers;
+// export const compareBuild = module.exports.compareBuild;
+// export const sort = module.exports.sort;
+// export const rsort = module.exports.rsort;
+// export const diff = module.exports.diff;
+// export const validRange = module.exports.validRange;
+// export const satisfies = module.exports.satisfies;
+// export const maxSatisfying = module.exports.maxSatisfying;
+// export const minSatisfying = module.exports.minSatisfying;
+// export const minVersion = module.exports.minVersion;
+// export const gtr = module.exports.gtr;
+// export const ltr = module.exports.ltr;
+// export const outside = module.exports.outside;
+// export const intersects = module.exports.intersects;
+// export const SemVer = module.exports.SemVer;
+// export const Comparator = module.exports.Comparator;
+// export const Range = module.exports.Range;
+// ESM-uncomment-end
diff --git a/src/vs/base/node/nls.js b/src/vs/base/node/nls.js
index c171eb6542e..bcd2a24740a 100644
--- a/src/vs/base/node/nls.js
+++ b/src/vs/base/node/nls.js
@@ -13,6 +13,14 @@
  * @import { IResolveNLSConfigurationContext } from './nls'
  */
 
+// ESM-uncomment-begin
+// import * as path from 'path';
+// import * as fs from 'fs';
+// import * as perf from '../common/performance.js';
+//
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 (function () {
 
 	/**
@@ -249,11 +257,17 @@
 		define(['path', 'fs', 'vs/base/common/performance'], function (/** @type {typeof import('path')} */ path, /** @type {typeof import('fs')} */ fs, /** @type {typeof import('../common/performance')} */ perf) { return factory(path, fs, perf); });
 	} else if (typeof module === 'object' && typeof module.exports === 'object') {
 		// commonjs
+		// ESM-comment-begin
 		const path = require('path');
 		const fs = require('fs');
 		const perf = require('../common/performance');
+		// ESM-comment-end
 		module.exports = factory(path, fs, perf);
 	} else {
 		throw new Error('vs/base/node/nls defined in UNKNOWN context (neither requirejs or commonjs)');
 	}
 })();
+
+// ESM-uncomment-begin
+// export const resolveNLSConfiguration = module.exports.resolveNLSConfiguration;
+// ESM-uncomment-end
diff --git a/src/vs/base/node/unc.js b/src/vs/base/node/unc.js
index e019e5258ce..a9203d79cc3 100644
--- a/src/vs/base/node/unc.js
+++ b/src/vs/base/node/unc.js
@@ -8,6 +8,10 @@
 //@ts-check
 'use strict';
 
+// ESM-uncomment-begin
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 (function () {
 	function factory() {
 
@@ -148,3 +152,11 @@
 		console.trace('vs/base/node/unc defined in UNKNOWN context (neither requirejs or commonjs)');
 	}
 })();
+
+// ESM-uncomment-begin
+// export const getUNCHost = module.exports.getUNCHost;
+// export const getUNCHostAllowlist = module.exports.getUNCHostAllowlist;
+// export const addUNCHostToAllowlist = module.exports.addUNCHostToAllowlist;
+// export const disableUNCAccessRestrictions = module.exports.disableUNCAccessRestrictions;
+// export const isUNCAccessRestrictionsDisabled = module.exports.isUNCAccessRestrictionsDisabled;
+// ESM-uncomment-end
diff --git a/src/vs/base/parts/sandbox/common/sandboxTypes.ts b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
index 9b607da8103..d449ad1aa60 100644
--- a/src/vs/base/parts/sandbox/common/sandboxTypes.ts
+++ b/src/vs/base/parts/sandbox/common/sandboxTypes.ts
@@ -70,4 +70,9 @@ export interface ISandboxConfiguration {
 		 */
 		language: string | undefined;
 	};
+
+	/**
+	 * DEV time only! All css-modules that we have.
+	 */
+	cssModules?: string[];
 }
diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts
index 33a8498c7bb..ed5e8937e98 100644
--- a/src/vs/base/parts/storage/node/storage.ts
+++ b/src/vs/base/parts/storage/node/storage.ts
@@ -309,8 +309,14 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 	private doConnect(path: string): Promise<IDatabaseConnection> {
 		return new Promise((resolve, reject) => {
 			import('@vscode/sqlite3').then(sqlite3 => {
+				// ESM-comment-begin
+				const ctor = (this.logger.isTracing ? sqlite3.verbose().Database : sqlite3.Database);
+				// ESM-comment-end
+				// ESM-uncomment-begin
+				// const ctor = (this.logger.isTracing ? sqlite3.default.verbose().Database : sqlite3.default.Database);
+				// ESM-uncomment-end
 				const connection: IDatabaseConnection = {
-					db: new (this.logger.isTracing ? sqlite3.verbose().Database : sqlite3.Database)(path, (error: (Error & { code?: string }) | null) => {
+					db: new ctor(path, (error: (Error & { code?: string }) | null) => {
 						if (error) {
 							return (connection.db && error.code !== 'SQLITE_CANTOPEN' /* https://github.com/TryGhost/node-sqlite3/issues/1617 */) ? connection.db.close(() => reject(error)) : reject(error);
 						}
diff --git a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
index a81bd8c04ed..98e67e7c25c 100644
--- a/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
+++ b/src/vs/code/electron-sandbox/processExplorer/processExplorer.js
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 //@ts-check
+'use strict';
+
 (function () {
-	'use strict';
 
 	/**
 	 * @import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes'
diff --git a/src/vs/code/electron-sandbox/workbench/workbench.js b/src/vs/code/electron-sandbox/workbench/workbench.js
index 9f41e508bb3..5ad97839d23 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.js
+++ b/src/vs/code/electron-sandbox/workbench/workbench.js
@@ -6,8 +6,9 @@
 /// <reference path="../../../../typings/require.d.ts" />
 
 //@ts-check
+'use strict';
+
 (function () {
-	'use strict';
 
 	/**
 	 * @import {INativeWindowConfiguration} from '../../../platform/window/common/window'
diff --git a/src/vs/platform/environment/node/userDataPath.js b/src/vs/platform/environment/node/userDataPath.js
index 1e89f1fee06..3661c50a3ba 100644
--- a/src/vs/platform/environment/node/userDataPath.js
+++ b/src/vs/platform/environment/node/userDataPath.js
@@ -6,8 +6,16 @@
 /// <reference path="../../../../typings/require.d.ts" />
 
 //@ts-check
+'use strict';
+
+// ESM-uncomment-begin
+// import * as os from 'os';
+// import * as path from 'path';
+//
+// const module = { exports: {} };
+// ESM-uncomment-end
+
 (function () {
-	'use strict';
 
 	/**
 	 * @import { NativeParsedArgs } from '../../environment/common/argv'
@@ -117,11 +125,17 @@
 			return factory(path, os, process.cwd()); // amd
 		});
 	} else if (typeof module === 'object' && typeof module.exports === 'object') {
+		// ESM-comment-begin
 		const path = require('path');
 		const os = require('os');
+		// ESM-comment-end
 
 		module.exports = factory(path, os, process.env['VSCODE_CWD'] || process.cwd()); // commonjs
 	} else {
 		throw new Error('Unknown context');
 	}
 }());
+
+// ESM-uncomment-begin
+// export const getUserDataPath = module.exports.getUserDataPath;
+// ESM-uncomment-end
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index 81db8b47267..d2997c2d22b 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -56,7 +56,12 @@ flakySuite('Native Modules (all platforms)', () => {
 	});
 
 	test('@vscode/sqlite3', async () => {
+		// ESM-comment-begin
 		const sqlite3 = await import('@vscode/sqlite3');
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const { default: sqlite3 } = await import('@vscode/sqlite3');
+		// ESM-uncomment-end
 		assert.ok(typeof sqlite3.Database === 'function', testErrorMessage('@vscode/sqlite3'));
 	});
 
diff --git a/src/vs/platform/request/node/proxy.ts b/src/vs/platform/request/node/proxy.ts
index db448e06cc1..141be5bb796 100644
--- a/src/vs/platform/request/node/proxy.ts
+++ b/src/vs/platform/request/node/proxy.ts
@@ -44,7 +44,21 @@ export async function getProxyAgent(rawRequestURL: string, env: typeof process.e
 		rejectUnauthorized: isBoolean(options.strictSSL) ? options.strictSSL : true,
 	};
 
-	return requestURL.protocol === 'http:'
-		? new (await import('http-proxy-agent')).HttpProxyAgent(proxyURL, opts)
-		: new (await import('https-proxy-agent')).HttpsProxyAgent(proxyURL, opts);
+	if (requestURL.protocol === 'http:') {
+		// ESM-comment-begin
+		const mod = await import('http-proxy-agent');
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const mod = (await import('http-proxy-agent')).default;
+		// ESM-uncomment-end
+		return new mod.HttpProxyAgent(proxyURL, opts);
+	} else {
+		// ESM-comment-begin
+		const mod = await import('https-proxy-agent');
+		// ESM-comment-end
+		// ESM-uncomment-begin
+		// const mod = (await import('https-proxy-agent')).default;
+		// ESM-uncomment-end
+		return new mod.HttpsProxyAgent(proxyURL, opts);
+	}
 }
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index ec8182b3c1d..f7295637003 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -15,7 +15,6 @@ import { RequestStore } from 'vs/platform/terminal/common/requestStore';
 import { IProcessDataEvent, IProcessReadyEvent, IPtyService, IRawTerminalInstanceLayoutInfo, IReconnectConstants, IShellLaunchConfig, ITerminalInstanceLayoutInfoById, ITerminalLaunchError, ITerminalsLayoutInfo, ITerminalTabLayoutInfoById, TerminalIcon, IProcessProperty, TitleEventSource, ProcessPropertyType, IProcessPropertyMap, IFixedTerminalDimensions, IPersistentTerminalProcessLaunchConfig, ICrossVersionSerializedTerminalState, ISerializedTerminalState, ITerminalProcessOptions, IPtyHostLatencyMeasurement } from 'vs/platform/terminal/common/terminal';
 import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBuffering';
 import { escapeNonWindowsPath } from 'vs/platform/terminal/common/terminalEnvironment';
-import { Terminal as XtermTerminal } from '@xterm/headless';
 import type { ISerializeOptions, SerializeAddon as XtermSerializeAddon } from '@xterm/addon-serialize';
 import type { Unicode11Addon as XtermUnicode11Addon } from '@xterm/addon-unicode11';
 import { IGetTerminalLayoutInfoArgs, IProcessDetails, ISetTerminalLayoutInfoArgs, ITerminalTabLayoutInfoDto } from 'vs/platform/terminal/common/terminalProcess';
@@ -32,6 +31,14 @@ import { IProductService } from 'vs/platform/product/common/productService';
 import { join } from 'path';
 import { memoize } from 'vs/base/common/decorators';
 import * as performance from 'vs/base/common/performance';
+// ESM-comment-begin
+import { Terminal as XtermTerminal } from '@xterm/headless';
+// ESM-comment-end
+// ESM-uncomment-begin
+// import pkg from '@xterm/headless';
+// type XtermTerminal = pkg.Terminal;
+// const { Terminal: XtermTerminal } = pkg;
+// ESM-uncomment-end
 
 export function traceRpc(_target: any, key: string, descriptor: any) {
 	if (typeof descriptor.value !== 'function') {
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 2eed66f7ee0..fc0f7c259e0 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as _fs from 'fs';
-import * as _url from 'url';
-import * as _cp from 'child_process';
-import * as _http from 'http';
-import * as _os from 'os';
+import * as fs from 'fs';
+import * as url from 'url';
+import * as cp from 'child_process';
+import * as http from 'http';
 import { cwd } from 'vs/base/common/process';
 import { dirname, extname, resolve, join } from 'vs/base/common/path';
 import { parseArgs, buildHelpMessage, buildVersionMessage, OPTIONS, OptionDescriptions, ErrorReporter } from 'vs/platform/environment/node/argv';
@@ -240,8 +239,8 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 				cmdLine.push('--update-extensions');
 			}
 
-			const cp = _cp.fork(join(__dirname, '../../../server-main.js'), cmdLine, { stdio: 'inherit' });
-			cp.on('error', err => console.log(err));
+			const childProcess = cp.fork(join(__dirname, '../../../server-main.js'), cmdLine, { stdio: 'inherit' });
+			childProcess.on('error', err => console.log(err));
 			return;
 		}
 
@@ -270,7 +269,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 			if (verbose) {
 				console.log(`Invoking: cmd.exe /C ${cliCommand} ${newCommandline.join(' ')} in ${processCwd}`);
 			}
-			_cp.spawn('cmd.exe', ['/C', cliCommand, ...newCommandline], {
+			cp.spawn('cmd.exe', ['/C', cliCommand, ...newCommandline], {
 				stdio: 'inherit',
 				cwd: processCwd
 			});
@@ -285,11 +284,11 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 				if (verbose) {
 					console.log(`Using pipes for output.`);
 				}
-				const cp = _cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: ['inherit', 'pipe', 'pipe'] });
-				cp.stdout.on('data', data => process.stdout.write(data));
-				cp.stderr.on('data', data => process.stderr.write(data));
+				const childProcess = cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: ['inherit', 'pipe', 'pipe'] });
+				childProcess.stdout.on('data', data => process.stdout.write(data));
+				childProcess.stderr.on('data', data => process.stderr.write(data));
 			} else {
-				_cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: 'inherit' });
+				cp.spawn(cliCommand, newCommandline, { cwd: cliCwd, env, stdio: 'inherit' });
 			}
 		}
 	} else {
@@ -357,7 +356,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 function runningInWSL2(): boolean {
 	if (!!process.env['WSL_DISTRO_NAME']) {
 		try {
-			return _cp.execSync('uname -r', { encoding: 'utf8' }).includes('-microsoft-');
+			return cp.execSync('uname -r', { encoding: 'utf8' }).includes('-microsoft-');
 		} catch (_e) {
 			// Ignore
 		}
@@ -366,7 +365,7 @@ function runningInWSL2(): boolean {
 }
 
 async function waitForFileDeleted(path: string) {
-	while (_fs.existsSync(path)) {
+	while (fs.existsSync(path)) {
 		await new Promise(res => setTimeout(res, 1000));
 	}
 }
@@ -376,7 +375,7 @@ function openInBrowser(args: string[], verbose: boolean) {
 	for (const location of args) {
 		try {
 			if (/^(http|https|file):\/\//.test(location)) {
-				uris.push(_url.parse(location).href);
+				uris.push(url.parse(location).href);
 			} else {
 				uris.push(pathToURI(location).href);
 			}
@@ -406,7 +405,7 @@ function sendToPipe(args: PipeCommand, verbose: boolean): Promise<any> {
 			return;
 		}
 
-		const opts: _http.RequestOptions = {
+		const opts: http.RequestOptions = {
 			socketPath: cliPipe,
 			path: '/',
 			method: 'POST',
@@ -416,7 +415,7 @@ function sendToPipe(args: PipeCommand, verbose: boolean): Promise<any> {
 			}
 		};
 
-		const req = _http.request(opts, res => {
+		const req = http.request(opts, res => {
 			if (res.headers['content-type'] !== 'application/json') {
 				reject('Error in response: Invalid content type: Expected \'application/json\', is: ' + res.headers['content-type']);
 				return;
@@ -461,18 +460,18 @@ function fatal(message: string, err: any): void {
 
 const preferredCwd = process.env.PWD || cwd(); // prefer process.env.PWD as it does not follow symlinks
 
-function pathToURI(input: string): _url.URL {
+function pathToURI(input: string): url.URL {
 	input = input.trim();
 	input = resolve(preferredCwd, input);
 
-	return _url.pathToFileURL(input);
+	return url.pathToFileURL(input);
 }
 
 function translatePath(input: string, mapFileUri: (input: string) => string, folderURIS: string[], fileURIS: string[]) {
 	const url = pathToURI(input);
 	const mappedUri = mapFileUri(url.href);
 	try {
-		const stat = _fs.lstatSync(_fs.realpathSync(input));
+		const stat = fs.lstatSync(fs.realpathSync(input));
 
 		if (stat.isFile()) {
 			fileURIS.push(mappedUri);
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 5ac0ddc7ec9..ec6bb2bd1f4 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -18,6 +18,10 @@ import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';
 import { realpathSync } from 'vs/base/node/extpath';
 import { ExtHostConsoleForwarder } from 'vs/workbench/api/node/extHostConsoleForwarder';
 import { ExtHostDiskFileSystemProvider } from 'vs/workbench/api/node/extHostDiskFileSystemProvider';
+// ESM-uncomment-begin
+// import { createRequire } from 'node:module';
+// const require = createRequire(import.meta.url);
+// ESM-uncomment-end
 
 class NodeModuleRequireInterceptor extends RequireInterceptor {
 
@@ -109,7 +113,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
 			if (extensionId) {
 				performance.mark(`code/extHost/willLoadExtensionCode/${extensionId}`);
 			}
-			r = require.__$__nodeRequire<T>(module.fsPath);
+			r = <T>require.__$__nodeRequire(module.fsPath);
 		} finally {
 			if (extensionId) {
 				performance.mark(`code/extHost/didLoadExtensionCode/${extensionId}`);
diff --git a/src/vs/workbench/api/node/proxyResolver.ts b/src/vs/workbench/api/node/proxyResolver.ts
index 0df3f98c980..4840c8b5b82 100644
--- a/src/vs/workbench/api/node/proxyResolver.ts
+++ b/src/vs/workbench/api/node/proxyResolver.ts
@@ -3,10 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// ESM-comment-begin
 import * as http from 'http';
 import * as https from 'https';
 import * as tls from 'tls';
 import * as net from 'net';
+// ESM-comment-end
 
 import { IExtHostWorkspaceProvider } from 'vs/workbench/api/common/extHostWorkspace';
 import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
@@ -19,6 +21,15 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
 import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates } from '@vscode/proxy-agent';
 import { AuthInfo } from 'vs/platform/request/common/request';
 
+// ESM-uncomment-begin
+// import { createRequire } from 'node:module';
+// const require = createRequire(import.meta.url);
+// const http = require('http');
+// const https = require('https');
+// const tls = require('tls');
+// const net = require('net');
+// ESM-uncomment-end
+
 const systemCertificatesV2Default = false;
 
 export function connectProxyResolver(
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
index aad5671f1f0..15a7f2a211d 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporter.js
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 //@ts-check
+'use strict';
+
 (function () {
-	'use strict';
 
 	/**
 	 * @import { ISandboxConfiguration } from '../../../../base/parts/sandbox/common/sandboxTypes'