Upgrade to Gulp4 to resolve security issues

gulpfile.js

@@ -43,18 +43,45 @@ gulp.task('default', false, [
   'check-install'
 ]);
 
-gulp.task('watch', 'Watch for site/theme changes', watch);
-
-gulp.task('build', 'Builds all files from source', build);
-gulp.task('build-javascript', 'Builds all javascript from source', buildJS);
-gulp.task('build-css', 'Builds all css from source', buildCSS);
-gulp.task('build-assets', 'Copies all assets from source', buildAssets);
-
-gulp.task('clean', 'Clean dist folder', clean);
-gulp.task('version', 'Displays current version of Semantic', version);
-
-gulp.task('install', 'Runs set-up', install);
-gulp.task('check-install', 'Displays current version of Semantic', checkInstall);
+gulp.task('watch', function(done) {
+  watch();
+  done();
+});
+
+gulp.task('build', function(done) {
+  build();
+  done();
+});
+gulp.task('build-javascript', function(done) {
+  buildJS();
+  done();
+});
+gulp.task('build-css', function(done) {
+  buildCSS();
+  done();
+});
+gulp.task('build-assets', function(done) {
+  buildAssets();
+  done();
+});
+
+gulp.task('clean', function(done) {
+  clean();
+  done();
+});
+gulp.task('version', function(done) {
+  version();
+  done();
+});
+
+gulp.task('install', function(done) {
+  install();
+  done();
+});
+gulp.task('check-install', function(done) {
+  checkInstall();
+  done();
+});
 
 /*--------------
       Docs
@@ -65,8 +92,14 @@ gulp.task('check-install', 'Displays current version of Semantic', checkInstall)
   https://github.com/Semantic-Org/Semantic-UI-Docs/
 */
 
-gulp.task('serve-docs', 'Serve file changes to SUI Docs', serveDocs);
-gulp.task('build-docs', 'Build all files and add to SUI Docs', buildDocs);
+gulp.task('serve-docs', function(done) {
+  serveDocs();
+  done();
+});
+gulp.task('build-docs', function(done) {
+  buildDocs();
+  done();
+});
 
 
 /*--------------
@@ -74,8 +107,14 @@ gulp.task('build-docs', 'Build all files and add to SUI Docs', buildDocs);
 ---------------*/
 
 if(config.rtl) {
-  gulp.task('watch-rtl', 'Watch files as RTL', watchRTL);
-  gulp.task('build-rtl', 'Build all files as RTL', buildRTL);
+  gulp.task('watch-rtl', function(done) {
+    watchRTL();
+    done();
+  });
+  gulp.task('build-rtl', function(done) {
+    buildRTL();
+    done();
+  });
 }
 
 /* Admin Tasks */

package.json

@@ -45,32 +45,30 @@
     "gulp-watch": "*",
     "map-stream": "*",
     "require-dot-file": "*",
-    "run-sequence": "*",
     "yamljs": "*"
   },
   "dependencies": {
     "better-console": "*",
     "del": "^3.0.0",
     "extend": "^3.0.1",
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.0",
     "gulp-autoprefixer": "^4.0.0",
     "gulp-chmod": "^2.0.0",
+    "gulp-clean-css": "^3.7.0",
     "gulp-clone": "^1.1.3",
     "gulp-concat": "^2.6.1",
     "gulp-concat-css": "^2.3.0",
-    "gulp-copy": "1.0.0",
+    "gulp-copy": "^1.1.0",
     "gulp-dedupe": "0.0.2",
     "gulp-flatten": "^0.3.1",
     "gulp-header": "^1.8.9",
-    "gulp-help": "^1.6.1",
+    "gulp-help": "chmontgomery/gulp-help#gulp4",
     "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.2.1",
     "gulp-less": "^3.3.2",
-    "gulp-clean-css": "^3.7.0",
     "gulp-notify": "^3.0.0",
     "gulp-plumber": "^1.1.0",
     "gulp-print": "^2.0.1",
-    "prompt-sui": "^3.2.1",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.6.1",
     "gulp-rtlcss": "^1.0.0",
@@ -81,8 +79,8 @@
     "map-stream": "^0.1.0",
     "merge-stream": "^1.0.0",
     "mkdirp": "^0.5.1",
+    "prompt-sui": "^3.2.1",
     "require-dot-file": "^0.4.0",
-    "run-sequence": "^2.1.0",
     "wrench-sui": "^0.0.3",
     "yamljs": "^0.3.0"
   },

tasks/admin/components/create.js

@@ -22,7 +22,6 @@ var
   del             = require('del'),
   fs              = require('fs'),
   path            = require('path'),
-  runSequence     = require('run-sequence'),
 
   // admin dependencies
   concatFileNames = require('gulp-concat-filenames'),
@@ -309,24 +308,21 @@ module.exports = function(callback) {
       });
 
 
-      // synchronous tasks in orchestrator? I think not
-      gulp.task(task.all, false, function(callback) {
-        runSequence([
-          task.repo,
-          task.npm,
-          task.bower,
-          task.readme,
-          task.package,
-          task.composer,
-          task.notes,
-          task.meteor
-        ], callback);
-      });
-
-      tasks.push(task.all);
+      gulp.task(task.all, gulp.series(
+        task.repo,
+        task.npm,
+        task.bower,
+        task.readme,
+        task.package,
+        task.composer,
+        task.notes,
+        task.meteor,
+        function(done) {
+          callback();
+          done();
+        }
+      ));
 
     })(component);
   }
-
-  runSequence(tasks, callback);
 };

tasks/admin/distributions/create.js

@@ -17,7 +17,6 @@ var
   del             = require('del'),
   fs              = require('fs'),
   path            = require('path'),
-  runSequence     = require('run-sequence'),
   mergeStream     = require('merge-stream'),
 
   // admin dependencies
@@ -46,8 +45,7 @@ var
 module.exports = function(callback) {
   var
     stream,
-    index,
-    tasks = []
+    index
   ;
 
   for(index in release.distributions) {
@@ -209,11 +207,11 @@ module.exports = function(callback) {
         ;
       });
 
-      tasks.push(task.meteor);
-      tasks.push(task.repo);
-      tasks.push(task.package);
-
     })(distribution);
   }
-  runSequence(tasks, callback);
-};
+
+  gulp.task('create', gulp.series(task.meteor, task.repo, task.package, function(done){
+    callback();
+    done();
+  }));
+};

tasks/admin/publish.js

@@ -10,16 +10,15 @@
 */
 
 var
-  runSequence = require('run-sequence')
+  gulp = require('gulp')
 ;
 
 /* Release All */
 module.exports = function(callback) {
 
-  runSequence(
-    'update distributions', // commit less/css versions to github
-    'update components', // commit components to github
-    callback
-  );
+  gulp.task('publish', gulp.series('update distributions', 'update components', function(done) {
+    callback();
+    done();
+  }));
 
-};
+};

tasks/admin/release.js

@@ -11,19 +11,21 @@
 */
 
 var
-  runSequence = require('run-sequence')
+  gulp = require('gulp')
 ;
 
 /* Release All */
 module.exports = function(callback) {
 
-  runSequence(
-    //'build', // build Semantic
-    'init distributions', // sync with current github version
-    'create distributions', // update each repo with changes from master repo
-    'init components', // sync with current github version
-    'create components', // update each repo
-    callback
-  );
+  gulp.task('release', gulp.series(
+    'init distributions',
+    'create distributions',
+    'init components',
+    'create components',
+    function(done) {
+      callback();
+      done();
+    }
+  ));
 
-};
+};

tasks/build.js

@@ -5,14 +5,10 @@
 var
   // dependencies
   gulp         = require('gulp-help')(require('gulp')),
-  runSequence  = require('run-sequence'),
 
   // config
   config       = require('./config/user'),
-  install      = require('./config/project/install'),
-
-  // task sequence
-  tasks        = []
+  install      = require('./config/project/install')
 ;
 
 
@@ -39,12 +35,14 @@ module.exports = function(callback) {
   }
 
   if(config.rtl == 'both') {
-    tasks.push('build-rtl');
+    gulp.task('build', gulp.series('build-rtl', 'build-javascript', 'build-css', 'build-assets', function(done) {
+      callback();
+      done();
+    }));
+  } else {
+    gulp.task('build', gulp.series('build-javascript', 'build-css', 'build-assets', function(done) {
+      callback();
+      done();
+    }));
   }
-
-  tasks.push('build-javascript');
-  tasks.push('build-css');
-  tasks.push('build-assets');
-
-  runSequence(tasks, callback);
 };

tasks/build/css.js

@@ -21,7 +21,6 @@ var
   print        = require('gulp-print'),
   rename       = require('gulp-rename'),
   replace      = require('gulp-replace'),
-  runSequence  = require('run-sequence'),
 
   // config
   config       = require('../config/user'),
@@ -91,7 +90,10 @@ module.exports = function(callback) {
     .pipe(gulp.dest(output.uncompressed))
     .pipe(print(log.created))
     .on('end', function() {
-      runSequence('package uncompressed css', maybeCallback);
+      gulp.task('css', gulp.series('package uncompressed css', function(done) {
+        maybeCallback();
+        done();
+      }));
     })
   ;
 
@@ -106,7 +108,10 @@ module.exports = function(callback) {
     .pipe(gulp.dest(output.compressed))
     .pipe(print(log.created))
     .on('end', function() {
-      runSequence('package compressed css', maybeCallback);
+      gulp.task('css', gulp.series('package compressed css', function(done) {
+        maybeCallback();
+        done();
+      }));
     })
   ;
 

tasks/collections/build.js

@@ -6,14 +6,23 @@ module.exports = function(gulp) {
 
   var
     // build sub-tasks
-    buildJS      = require('./../build/javascript'),
-    buildCSS     = require('./../build/css'),
-    buildAssets  = require('./../build/assets')
+    buildJS      = require('../build/javascript'),
+    buildCSS     = require('../build/css'),
+    buildAssets  = require('../build/assets')
   ;
 
   // in case these tasks are undefined during import, less make sure these are available in scope
-  gulp.task('build-javascript', 'Builds all javascript from source', buildJS);
-  gulp.task('build-css', 'Builds all css from source', buildCSS);
-  gulp.task('build-assets', 'Copies all assets from source', buildAssets);
+  gulp.task('build-javascript', function(done) {
+    buildJS();
+    done();
+  });
+  gulp.task('build-css', function(done) {
+    buildCSS();
+    done();
+  });
+  gulp.task('build-assets', function(done) {
+    buildAssets();
+    done();
+  });
 
 };

tasks/install.js

@@ -23,7 +23,6 @@ var
   fs             = require('fs'),
   mkdirp         = require('mkdirp'),
   path           = require('path'),
-  runSequence    = require('run-sequence'),
 
   // gulp dependencies
   chmod          = require('gulp-chmod'),
@@ -408,12 +407,10 @@ gulp.task('create install files', function(callback) {
 
   });
 
-  runSequence(
-    'create theme.config',
-    'create semantic.json',
-    callback
-  );
-
+  gulp.task('create install files', gulp.series('create theme.config', 'create semantic.json', function(done) {
+    callback();
+    done();
+  }));
 });
 
 gulp.task('clean up install', function() {
@@ -449,11 +446,9 @@ gulp.task('clean up install', function() {
 
 });
 
-runSequence(
-  'run setup',
-  'create install files',
-  'clean up install',
-  callback
-);
+gulp.task('install', gulp.series('run setup', 'create install files', 'clean up install', function(done) {
+  callback();
+  done();
+}));
 
 };