@@ -20,7 +20,6 @@ const gulp = require('gulp');
2020const $ = require ( 'gulp-load-plugins' ) ( ) ;
2121const del = require ( 'del' ) ;
2222const merge = require ( 'merge-stream' ) ;
23- const runSequence = require ( 'run-sequence' ) ;
2423const electronPackager = require ( 'electron-packager' ) ;
2524const electronOsxSignAsync = require ( 'electron-osx-sign' ) . signAsync ;
2625const argv = require ( 'yargs' ) . argv ;
@@ -92,15 +91,15 @@ gulp.task('clean', cb => {
9291
9392gulp . task ( 'build' , gulp . series ( 'clean' , 'styles' , 'scripts' , 'copy' ) ) ;
9493
95- gulp . task ( 'install-packages' , gulp . series ( 'build' , $ . shell . task ( [
94+ gulp . task ( 'install-packages' , gulp . series ( $ . shell . task ( [
9695 'npm install --production'
9796] , { cwd : 'build' } ) ) ) ;
9897
99- gulp . task ( 'run-electron' , gulp . series ( 'build' , $ . shell . task ( [
98+ gulp . task ( 'run-electron' , gulp . series ( $ . shell . task ( [
10099 'electron ./build/ --dev'
101100] ) ) ) ;
102101
103- gulp . task ( 'dist' , gulp . series ( 'build' , 'install-packages' , async cb => {
102+ gulp . task ( 'dist' , gulp . series ( 'build' , 'install-packages' , async ( ) => {
104103 let packageInfo = require ( './build/package.json' ) ;
105104 let appPaths = await electronPackager ( {
106105 arch : 'x64' ,
@@ -135,24 +134,27 @@ gulp.task('dist', gulp.series('build', 'install-packages', async cb => {
135134 // https://developer.apple.com/library/content/qa/qa1940/_index.html
136135 execSync ( `xattr -cr "${ appFilePath } "` ) ;
137136
138- plistStream . on ( 'end' , async ( ) => {
139- // Sign the app
140- await electronOsxSignAsync ( {
141- app : appFilePath ,
142- identity : 'Developer ID Application: Roman NURIK (NLACF347G7)' ,
143- platform : 'darwin'
137+ await new Promise ( ( resolve , reject ) => {
138+ plistStream . on ( 'end' , async ( ) => {
139+ // Sign the app
140+ await electronOsxSignAsync ( {
141+ app : appFilePath ,
142+ identity : 'Developer ID Application: Roman NURIK (NLACF347G7)' ,
143+ platform : 'darwin'
144+ } ) ;
145+
146+ // zip up the directory
147+ console . log ( 'Zipping up the package' ) ;
148+ let zipStream = fs . createWriteStream ( `./dist/${ packageInfo . version } .zip` )
149+ . on ( 'warning' , err => { throw err ; } )
150+ . on ( 'error' , err => { throw err ; } )
151+ . on ( 'close' , ( ) => resolve ( ) ) ;
152+ let archive = archiver ( 'zip' , { zlib : { level : 9 } } )
153+ archive . pipe ( zipStream ) ;
154+ archive . directory ( appFilePath , `${ packageInfo . appDisplayName } .app` ) ;
155+ archive . finalize ( ) ;
144156 } ) ;
145-
146- // zip up the directory
147- console . log ( 'Zipping up the package' ) ;
148- let zipStream = fs . createWriteStream ( `./dist/${ packageInfo . version } .zip` )
149- . on ( 'error' , err => { throw err } )
150- . on ( 'end' , ( ) => cb ( ) ) ;
151- let archive = archiver ( 'zip' , { zlib : { level : 9 } } )
152- archive . pipe ( zipStream ) ;
153- archive . directory ( appFilePath , `${ packageInfo . appDisplayName } .app` ) ;
154- archive . finalize ( ) ;
155157 } ) ;
156158} ) ) ;
157159
158- gulp . task ( 'default' , gulp . series ( 'run-electron' ) ) ;
160+ gulp . task ( 'default' , gulp . series ( 'build' , ' run-electron') ) ;
0 commit comments