Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-11-10 17:48:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update to electron-packager 13.0.x

Browse source
This commit is contained in:
Ben Gotow 2018-12-20 12:12:40 -07:00
parent edec4e37f8
commit b167b9cdcd
4 changed files with 506 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/build/tasks/package-task.js
View file

@ -254,14 +254,15 @@ module.exports = grunt => {
resolveRealSymlinkPaths(grunt.config('appDir')); resolveRealSymlinkPaths(grunt.config('appDir'));
packager(grunt.config.get('packager'), (err, appPaths) => { packager(grunt.config.get('packager'))
clearInterval(ongoing); .catch(err => {
if (err) {
grunt.fail.fatal(err); grunt.fail.fatal(err);
return done(err); return done(err);
} })
console.log(`---> Done Successfully. Built into: ${appPaths}`); .then(appPaths => {
return done(); clearInterval(ongoing);
}); console.log(`---> Done Successfully. Built into: ${appPaths}`);
return done();
});
}); });
}; };

12
app/src/browser/main.js
View file

@ -244,16 +244,18 @@ const start = () => {
options.configDirPath = configDirPath; options.configDirPath = configDirPath;
if (!options.devMode) { if (!options.devMode) {
const otherInstanceRunning = app.makeSingleInstance(commandLine => { const gotTheLock = app.requestSingleInstanceLock();
const otherOpts = parseCommandLine(commandLine);
global.application.handleLaunchOptions(otherOpts);
});
if (otherInstanceRunning) { if (!gotTheLock) {
console.log('Exiting because another instance of the app is already running.'); console.log('Exiting because another instance of the app is already running.');
app.exit(1); app.exit(1);
return; return;
} }
app.on('second-instance', (event, commandLine, workingDirectory) => {
const otherOpts = parseCommandLine(commandLine);
global.application.handleLaunchOptions(otherOpts);
});
} }
setupCompileCache(configDirPath); setupCompileCache(configDirPath);

765
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -22,7 +22,7 @@
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "4.0.0-beta.11", "electron": "4.0.0-beta.11",
"electron-installer-dmg": "0.2.x", "electron-installer-dmg": "0.2.x",
"electron-packager": "8.7.x", "electron-packager": "13.0.x",
"electron-winstaller": "2.x.x", "electron-winstaller": "2.x.x",
"eslint": "^4.7.2", "eslint": "^4.7.2",
"eslint-config-prettier": "^2.9.0", "eslint-config-prettier": "^2.9.0",