From 8a605ea563f1c077efe9613ddc27d2fc5faec33b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 9 Jul 2024 09:17:41 +0200
Subject: [PATCH] esm - more cleanup (#221240)

---
 src/bootstrap-meta.js | 16 ++++++++--------
 src/server-main.js    |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bootstrap-meta.js b/src/bootstrap-meta.js
index 46041d5d91a..5415bc5df6a 100644
--- a/src/bootstrap-meta.js
+++ b/src/bootstrap-meta.js
@@ -18,21 +18,21 @@
 // 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']) {
+let productObj = { BUILD_INSERT_PRODUCT_CONFIGURATION: 'BUILD_INSERT_PRODUCT_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
+if (productObj['BUILD_INSERT_PRODUCT_CONFIGURATION']) {
 	// @ts-ignore
-	product = require('../product.json'); // Running out of sources
+	productObj = require('../product.json'); // Running out of sources
 }
 
 /** @type object & { BUILD_INSERT_PACKAGE_CONFIGURATION?: string } */
-let pkg = { BUILD_INSERT_PACKAGE_CONFIGURATION: 'BUILD_INSERT_PACKAGE_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
-if (pkg['BUILD_INSERT_PACKAGE_CONFIGURATION']) {
+let pkgObj = { BUILD_INSERT_PACKAGE_CONFIGURATION: 'BUILD_INSERT_PACKAGE_CONFIGURATION' }; // DO NOT MODIFY, PATCHED DURING BUILD
+if (pkgObj['BUILD_INSERT_PACKAGE_CONFIGURATION']) {
 	// @ts-ignore
-	pkg = require('../package.json'); // Running out of sources
+	pkgObj = require('../package.json'); // Running out of sources
 }
 
-module.exports.product = product;
-module.exports.pkg = pkg;
+module.exports.product = productObj;
+module.exports.pkg = pkgObj;
 
 // ESM-uncomment-begin
 // export const product = module.exports.product;
diff --git a/src/server-main.js b/src/server-main.js
index f8c25856723..f1fad8f0b51 100644
--- a/src/server-main.js
+++ b/src/server-main.js
@@ -31,7 +31,6 @@ const minimist = require('minimist');
 // 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';
@@ -39,7 +38,6 @@ const minimist = require('minimist');
 // 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