Fix deprecations: electron-packager cb->promise, mocha compilers->require

This commit is contained in:
Ronan Jouchet 2018-05-11 16:55:50 -04:00
parent 69a5b2cbbe
commit 6a8114e505
2 changed files with 10 additions and 8 deletions

View File

@ -13,7 +13,7 @@ gulp.task('mocha', (done) => {
.pipe(istanbul.hookRequire()) // Force `require` to return covered files
.on('finish', () => gulp.src(PATHS.TEST_SRC, { read: false })
.pipe(mocha({
compilers: 'js:babel-core/register',
require: 'babel-core/register',
recursive: true,
}))
.pipe(istanbul.writeReports({

View File

@ -202,13 +202,15 @@ function buildMain(inpOptions, callback) {
packagerConsole.override();
packager(packageOptions, (error, appPathArray) => {
// restore console.error
packagerConsole.restore();
// pass options which still contains the icon to waterfall
cb(error, opts, appPathArray);
});
packager(packageOptions)
.then(appPathArray => {
packagerConsole.restore(); // restore console.error
cb(null, opts, appPathArray); // options still contain the icon to waterfall
})
.catch(error => {
packagerConsole.restore(); // restore console.error
cb(error, opts); // options still contain the icon to waterfall
});
},
(opts, appPathArray, cb) => {
progress.tick('finalizing');