Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

esm - bootstrap import (#225615)

Browse Source
This commit is contained in:
Benjamin Pasero
2024-08-14 17:48:45 +02:00
committed by GitHub
parent 077cbfb268
commit 4ccb98926f
10 changed files with 100 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
migrate.mjs
View File

@@ -45,6 +45,7 @@ function migrate() {
migrateOne(filePath, fileContents);
}
writeFileSync(join(dstFolder, 'package.json'), `{"type": "module"}`);
writeFileSync(join(dstFolder, '.gitignore'), `*`);
console.log(`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`);

4
src/bootstrap-fork.js vendored
View File

@@ -28,8 +28,8 @@ bootstrapNode.removeGlobalNodeModuleLookupPaths();
// Enable ASAR in our forked processes
bootstrapNode.enableASARSupport();
if (process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']) {
bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
if (process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']) {
bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
}
// Configure: pipe logging to parent process

78
src/bootstrap-import.js vendored Normal file
View File

@@ -0,0 +1,78 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//@ts-check
// *********************************************************************
// * *
// * We need this to redirect to node_modules from the remote-folder. *
// * This ONLY applies when running out of source. *
// * *
// *********************************************************************
import { fileURLToPath, pathToFileURL } from 'node:url';
import { promises } from 'node:fs';
import { join } from 'node:path';
// SEE https://nodejs.org/docs/latest/api/module.html#initialize
/**
* @type {Object.<string, string>}
*/
const _specifierToUrl = {};
/**
* @param {string} injectPath
*/
export async function initialize(injectPath) {
// populate mappings
const injectPackageJSONPath = fileURLToPath(new URL('../package.json', pathToFileURL(injectPath)));
const packageJSON = JSON.parse(String(await promises.readFile(injectPackageJSONPath)));
for (const [name] of Object.entries(packageJSON.dependencies)) {
try {
const path = join(injectPackageJSONPath, `../node_modules/${name}/package.json`);
let { main } = JSON.parse(String(await promises.readFile(path)));
if (!main) {
main = 'index.js';
}
if (!main.endsWith('.js')) {
main += '.js';
}
const mainPath = join(injectPackageJSONPath, `../node_modules/${name}/${main}`);
_specifierToUrl[name] = pathToFileURL(mainPath).href;
} catch (err) {
console.error(name);
console.error(err);
}
}
console.log(`[bootstrap-import] Initialized node_modules redirector for: ${injectPath}`);
}
/**
* @param {string | number} specifier
* @param {any} context
* @param {(arg0: any, arg1: any) => any} nextResolve
*/
export async function resolve(specifier, context, nextResolve) {
const newSpecifier = _specifierToUrl[specifier];
if (newSpecifier !== undefined) {
// console.log('[HOOKS]', specifier, '--->', newSpecifier);
return {
format: 'commonjs',
shortCircuit: true,
url: newSpecifier
};
}
// Defer to the next hook in the chain, which would be the
// Node.js default resolve if this is the last user-specified loader.
return nextResolve(specifier, context);
}

12
src/bootstrap-node.js vendored
View File

@@ -72,9 +72,15 @@ setupCurrentWorkingDirectory();
/**
* Add support for redirecting the loading of node modules
*
* Note: only applies when running out of sources.
*
* @param {string} injectPath
*/
module.exports.injectNodeModuleLookupPath = function (injectPath) {
module.exports.devInjectNodeModuleLookupPath = function (injectPath) {
if (!process.env['VSCODE_DEV']) {
return; // only applies running out of sources
}
if (!injectPath) {
throw new Error('Missing injectPath');
}
@@ -83,7 +89,7 @@ module.exports.injectNodeModuleLookupPath = function (injectPath) {
if (isESM) {
// register a loader hook
// ESM-uncomment-begin
// Module.register('./loader-lookup-path.mjs', { parentURL: import.meta.url, data: injectPath });
// Module.register('./bootstrap-import.js', { parentURL: import.meta.url, data: injectPath });
// ESM-uncomment-end
} else {
const nodeModulesPath = path.join(__dirname, '../node_modules');
@@ -266,7 +272,7 @@ module.exports.fileUriFromPath = function (path, config) {
//#endregion
// ESM-uncomment-begin
// export const injectNodeModuleLookupPath = module.exports.injectNodeModuleLookupPath;
// export const devInjectNodeModuleLookupPath = module.exports.devInjectNodeModuleLookupPath;
// export const removeGlobalNodeModuleLookupPaths = module.exports.removeGlobalNodeModuleLookupPaths;
// export const configurePortable = module.exports.configurePortable;
// export const enableASARSupport = module.exports.enableASARSupport;

6
src/server-cli.js
View File

@@ -36,10 +36,10 @@ async function start() {
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_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
} else {
delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
}
bootstrapAmd.load('vs/server/node/server.cli');
}

6
src/server-main.js
View File

@@ -296,10 +296,10 @@ function loadCode(nlsConfiguration) {
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_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
bootstrapNode.injectNodeModuleLookupPath(process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH']);
process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] = process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'] || path.join(__dirname, '..', 'remote', 'node_modules');
bootstrapNode.devInjectNodeModuleLookupPath(process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH']);
} else {
delete process.env['VSCODE_INJECT_NODE_MODULE_LOOKUP_PATH'];
delete process.env['VSCODE_DEV_INJECT_NODE_MODULE_LOOKUP_PATH'];
}
bootstrapAmd.load('vs/server/node/server.main', resolve, reject);
});

1
src/tsconfig.json
View File

@@ -28,6 +28,7 @@
"./bootstrap-amd.js",
"./bootstrap-cli.js",
"./bootstrap-fork.js",
"./bootstrap-import.js",
"./bootstrap-meta.js",
"./bootstrap-node.js",
"./bootstrap-server.js",

2
src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
View File

@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { importAMDNodeModule } from 'vs/amdX';
import { getErrorMessage } from 'vs/base/common/errors';
import { IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { TargetPlatform } from 'vs/platform/extensions/common/extensions';
@@ -109,6 +108,7 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
// ESM-uncomment-end
// ESM-comment-begin
const { importAMDNodeModule } = await import('vs/amdX');
return importAMDNodeModule('@vscode/vsce-sign', 'src/main.js');
// ESM-comment-end
}

2
src/vs/platform/sign/node/signService.ts
View File

@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { importAMDNodeModule } from 'vs/amdX';
import { AbstractSignService, IVsdaValidator } from 'vs/platform/sign/common/abstractSignService';
import { ISignService } from 'vs/platform/sign/common/sign';
@@ -37,6 +36,7 @@ export class SignService extends AbstractSignService implements ISignService {
// ESM-uncomment-end
// ESM-comment-begin
const { importAMDNodeModule } = await import('vs/amdX');
return importAMDNodeModule('vsda', 'index.js');
// ESM-comment-end
}

2
src/vs/platform/telemetry/common/1dsAppender.ts
View File

@@ -5,7 +5,6 @@
import type { IExtendedConfiguration, IExtendedTelemetryItem, ITelemetryItem, ITelemetryUnloadState } from '@microsoft/1ds-core-js';
import type { IChannelConfiguration, IXHROverride, PostChannel } from '@microsoft/1ds-post-js';
import { importAMDNodeModule } from 'vs/amdX';
import { onUnexpectedError } from 'vs/base/common/errors';
import { mixin } from 'vs/base/common/objects';
import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
@@ -23,6 +22,7 @@ const endpointHealthUrl = 'https://mobile.events.data.microsoft.com/ping';
async function getClient(instrumentationKey: string, addInternalFlag?: boolean, xhrOverride?: IXHROverride): Promise<IAppInsightsCore> {
// ESM-comment-begin
const { importAMDNodeModule } = await import('vs/amdX');
const oneDs = await importAMDNodeModule<typeof import('@microsoft/1ds-core-js')>('@microsoft/1ds-core-js', 'dist/ms.core.js');
const postPlugin = await importAMDNodeModule<typeof import('@microsoft/1ds-post-js')>('@microsoft/1ds-post-js', 'dist/ms.post.js');
// ESM-comment-end