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

fix ASAR path again

Browse Source
This commit is contained in:
Benjamin Pasero
2018-09-07 19:30:50 +02:00
parent 70df226af0
commit d649ac014d
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootstrap-window.js
Vendored
+1 -9
View File
@@ -36,7 +36,6 @@ exports.assign = function assign(destination, source) {
exports.load = function (modulePaths, resultCallback, options) {
// @ts-ignore
const webFrame = require('electron').webFrame;
const path = require('path');
const args = exports.parseURLQueryArgs();
const configuration = JSON.parse(args['config'] || '{}') || {};
@@ -56,14 +55,7 @@ exports.load = function (modulePaths, resultCallback, options) {
exports.assign(process.env, configuration.userEnv);
// Enable ASAR support
// Note: On windows we have to be careful about the drive letter casing. If
// the drive letter case is lowercase, we convert it to uppercase. DO NOT
// CHANGE THIS logic or otherwise loading will fail in windows.
let nodeModulesPath = path.join(configuration.appRoot, 'node_modules');
if (process.platform === 'win32' && /[a-z]\:/.test(nodeModulesPath)) {
nodeModulesPath = nodeModulesPath.charAt(0).toUpperCase() + nodeModulesPath.substr(1); // Make drive letter uppercase
}
bootstrap.enableASARSupport(nodeModulesPath);
bootstrap.enableASARSupport();
// disable pinch zoom & apply zoom level early to avoid glitches
const zoomLevel = configuration.zoomLevel;
src/bootstrap.js
Vendored
+2 -9
View File
@@ -21,18 +21,11 @@ process.on('SIGPIPE', () => {
//#endregion
//#region Add support for using node_modules.asar
/**
* @param {string=} nodeModulesPath
*/
exports.enableASARSupport = function (nodeModulesPath) {
exports.enableASARSupport = function () {
// @ts-ignore
const Module = require('module');
const path = require('path');
let NODE_MODULES_PATH = nodeModulesPath;
if (!NODE_MODULES_PATH) {
NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
}
const NODE_MODULES_PATH = path.join(__dirname, '../node_modules');
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
const originalResolveLookupPaths = Module._resolveLookupPaths;