esm - convert bootstrap files to TS (part 3)

Author: bpasero

.eslintrc.json

@@ -1133,7 +1133,7 @@
 						"restrictions": []
 					},
 					{
-						"target": "src/{bootstrap-cli.ts,bootstrap-esm.ts,bootstrap-fork.ts,bootstrap-node.ts,bootstrap-import.ts,bootstrap-meta.ts,bootstrap-window.js,cli.js,main.js,server-cli.js,server-main.js,bootstrap-cli.js,bootstrap-server.js}",
+						"target": "src/{bootstrap-cli.ts,bootstrap-esm.ts,bootstrap-fork.ts,bootstrap-node.ts,bootstrap-import.ts,bootstrap-meta.ts,bootstrap-window.js,cli.ts,main.js,server-cli.ts,server-main.ts,bootstrap-server.ts}",
 						"restrictions": []
 					}
 				]

src/bootstrap-fork.ts

@@ -6,19 +6,19 @@
 /* eslint-disable local/code-import-patterns */
 
 import * as performance from './vs/base/common/performance.js';
-import * as bootstrapNode from './bootstrap-node.js';
-import * as bootstrapESM from './bootstrap-esm.js';
+import { removeGlobalNodeJsModuleLookupPaths, devInjectNodeModuleLookupPath } from './bootstrap-node.js';
+import { load } from './bootstrap-esm.js';
 
 performance.mark('code/fork/start');
 
 // Crash reporter
 configureCrashReporter();
 
 // Remove global paths from the node module lookup (node.js only)
-bootstrapNode.removeGlobalNodeJsModuleLookupPaths();
+removeGlobalNodeJsModuleLookupPaths();
 
 if (process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']) {
-	bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
+	devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
 }
 
 // Configure: pipe logging to parent process
@@ -37,7 +37,7 @@ if (process.env['VSCODE_PARENT_PID']) {
 }
 
 // Load ESM entry point
-bootstrapESM.load(process.env['VSCODE_ESM_ENTRYPOINT']);
+load(process.env['VSCODE_ESM_ENTRYPOINT']);
 
 
 //#region Helpers

src/bootstrap-server.js renamed to src/bootstrap-server.ts

@@ -3,8 +3,5 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
-'use strict';
-
 // Keep bootstrap-esm.js from redefining 'fs'.
 delete process.env['ELECTRON_RUN_AS_NODE'];

src/cli.js renamed to src/cli.ts

@@ -3,34 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//@ts-check
-'use strict';
+/* eslint-disable local/code-import-patterns */
 
 import './bootstrap-cli.js'; // this MUST come before other imports as it changes global state
 import * as path from 'path';
 import { fileURLToPath } from 'url';
-import * as bootstrapNode from './bootstrap-node.js';
-import * as bootstrapESM from './bootstrap-esm.js';
+import { configurePortable } from './bootstrap-node.js';
+import { load } from './bootstrap-esm.js';
 import { resolveNLSConfiguration } from './vs/base/node/nls.js';
 import { product } from './bootstrap-meta.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-async function start() {
+// NLS
+const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-esm` to pick up NLS messages
 
-	// NLS
-	const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
-	process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-esm` to pick up NLS messages
+// Enable portable support
+configurePortable(product);
 
-	// Enable portable support
-	// @ts-ignore
-	bootstrapNode.configurePortable(product);
+// Signal processes that we got launched as CLI
+process.env['VSCODE_CLI'] = '1';
 
-	// Signal processes that we got launched as CLI
-	process.env['VSCODE_CLI'] = '1';
-
-	// Load CLI
-	bootstrapESM.load('vs/code/node/cli');
-}
-
-start();
+// Load CLI
+load('vs/code/node/cli');

src/server-cli.js

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable local/code-import-patterns */
+
+import './bootstrap-server.js'; // this MUST come before other imports as it changes global state
+import * as path from 'path';
+import { fileURLToPath } from 'url';
+import { devInjectNodeModuleLookupPath } from './bootstrap-node.js';
+import { load } from './bootstrap-esm.js';
+import { resolveNLSConfiguration } from './vs/base/node/nls.js';
+import { product } from './bootstrap-meta.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// NLS
+const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfiguration); // required for `bootstrap-esm` to pick up NLS messages
+
+if (process.env['VSCODE_DEV']) {
+	// 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_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
+	devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
+} else {
+	delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
+}
+
+// Load Server CLI
+load('vs/server/node/server.cli');