@@ -4,17 +4,11 @@ const map = require('map-stream');
44const $ = require ( 'gulp-load-plugins' ) ( ) ;
55const version = require ( './package.json' ) . version ;
66
7- // Tasks
87gulp . task ( 'clean' , ( ) => {
9- return pipe ( './tmp' , $ . clean ( ) ) ;
10- } ) ;
11-
12- gulp . task ( 'build' , ( cb ) => {
13- $ . runSequence ( 'clean' , 'style' , 'template' , 'js' , 'devdist' , cb ) ;
14- } ) ;
15-
16- gulp . task ( 'default' , [ 'build' ] , ( ) => {
17- gulp . watch ( [ './libs/**/*' , './src/**/*' ] , [ 'default' ] ) ;
8+ return pipe (
9+ './tmp' ,
10+ $ . clean ( )
11+ ) ;
1812} ) ;
1913
2014gulp . task ( 'style' , ( ) => {
@@ -38,7 +32,7 @@ gulp.task('template', () => {
3832 ) ;
3933} ) ;
4034
41- gulp . task ( 'js' , [ 'template' ] , ( ) => {
35+ gulp . task ( 'js' , gulp . series ( 'template' , ( ) => {
4236 const src = [
4337 './tmp/template.js' ,
4438 './src/constants.js' ,
@@ -56,16 +50,29 @@ gulp.task('js', ['template'], () => {
5650 $ . concat ( 'mdisviewer.js' ) ,
5751 './tmp'
5852 ) ;
59- } ) ;
53+ } ) ) ;
6054
61- gulp . task ( 'devdist' , [ 'js' ] , ( ) => {
62- return merge (
55+ gulp . task ( 'devdist' , gulp . series ( 'js' , ( cb ) => {
56+ merge (
6357 pipe ( './icons/**/*' , './tmp/app/icons' ) ,
6458 pipe ( [ './libs/**/*' , './tmp/mdisviewer.*' ] , './tmp/app/' ) ,
6559 pipe ( './src/config/background.js' , './tmp/app/' ) ,
6660 pipe ( './src/config/manifest.json' , $ . replace ( '$VERSION' , version ) , './tmp/app/' )
6761 ) ;
68- } ) ;
62+ cb ( ) ; // Need this callback after Gulp4 because `return merge()` doesn't returns stream
63+ } ) ) ;
64+
65+ gulp . task ( 'build' , gulp . series (
66+ 'clean' ,
67+ 'style' ,
68+ 'template' ,
69+ 'js' ,
70+ 'devdist'
71+ ) ) ;
72+
73+ gulp . task ( 'default' , gulp . series ( 'build' , ( ) => {
74+ gulp . watch ( [ './libs/**/*' , './src/**/*' ] , gulp . task ( 'default' ) ) ;
75+ } ) ) ;
6976
7077// Helpers
7178function pipe ( src , ...transforms ) {
@@ -90,7 +97,7 @@ function html2js(template) {
9097 const body = template . replace ( '$$' , escaped ) ;
9198
9299 file . path = path ;
93- file . contents = new Buffer ( body ) ;
100+ file . contents = Buffer . from ( body ) ;
94101 cb ( null , file ) ;
95102 }
96103}
0 commit comments