Remove warning related to 10+ year old vm compability setup

This commit is contained in:
Ben Gotow 2024-01-08 10:45:28 -06:00
parent 8b4f59ba49
commit c6d29c2420

View file

@ -1,5 +1,5 @@
window.eval = global.eval = function () { window.eval = global.eval = function() {
throw new Error('Sorry, N1 does not support window.eval() for security reasons.'); throw new Error('Sorry, Mailspring does not support window.eval() for security reasons.');
}; };
var util = null; var util = null;
@ -27,7 +27,11 @@ function handleSetupError(error) {
} }
function copyEnvFromMainProcess() { function copyEnvFromMainProcess() {
const newEnv = Object.assign({}, process.env, JSON.parse(JSON.stringify(require('@electron/remote').process.env))); const newEnv = Object.assign(
{},
process.env,
JSON.parse(JSON.stringify(require('@electron/remote').process.env))
);
process.env = newEnv; process.env = newEnv;
} }
@ -41,19 +45,10 @@ function setupWindow(loadSettings) {
var CompileCache = require('../src/compile-cache'); var CompileCache = require('../src/compile-cache');
CompileCache.setHomeDirectory(loadSettings.configDirPath); CompileCache.setHomeDirectory(loadSettings.configDirPath);
setupVmCompatibility();
require(loadSettings.bootstrapScript); require(loadSettings.bootstrapScript);
} }
function setupVmCompatibility() { window.onload = function() {
var vm = require('vm');
if (!vm.Script.createContext) {
vm.Script.createContext = vm.createContext;
}
}
window.onload = function () {
try { try {
var startTime = Date.now(); var startTime = Date.now();