Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 07:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on node require for startup code path (#130088)

Browse Source 
* sandbox - disable support to enable file protocol

* mitigate symlinks on different drives
This commit is contained in:
Benjamin Pasero
2021-08-04 10:45:11 +02:00
committed by GitHub
parent 53c3a2297b
commit b6ca3e52ae
14 changed files with 74 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/bootstrap.js vendored
View File

@@ -42,12 +42,14 @@
//#region Add support for using node_modules.asar
/**
* @param {string | undefined} appRoot
* @param {boolean} alwaysAddASARPath
* TODO@sandbox remove the support for passing in `appRoot` once
* sandbox is fully enabled
*
* @param {string=} appRoot
*/
function enableASARSupport(appRoot, alwaysAddASARPath) {
function enableASARSupport(appRoot) {
if (!path || !Module || typeof process === 'undefined') {
console.warn('enableASARSupport() is only available in node.js environments'); // TODO@sandbox ASAR is currently non-sandboxed only
console.warn('enableASARSupport() is only available in node.js environments');
return;
}
@@ -56,8 +58,14 @@
NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
} else {
// use the drive letter casing of __dirname
// if it matches the drive letter of `appRoot`
// (https://github.com/microsoft/vscode/issues/128725)
if (process.platform === 'win32') {
NODE_MODULES_PATH = __dirname.substr(0, 1) + NODE_MODULES_PATH.substr(1);
const nodejsDriveLetter = __dirname.substr(0, 1);
const vscodeDriveLetter = appRoot.substr(0, 1);
if (nodejsDriveLetter.toLowerCase() === vscodeDriveLetter.toLowerCase()) {
NODE_MODULES_PATH = nodejsDriveLetter + NODE_MODULES_PATH.substr(1);
}
}
}
@@ -78,7 +86,7 @@
break;
}
}
if (alwaysAddASARPath && !asarPathAdded) {
if (!asarPathAdded && appRoot) {
paths.push(NODE_MODULES_ASAR_PATH);
}
}