From 624ed3052568d8ad586226f6b9129bb186aee9b9 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Sun, 11 Nov 2018 10:24:42 -0500 Subject: [PATCH] match tasks config npm gulpfile to main one --- tasks/config/npm/gulpfile.js | 90 ++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 19 deletions(-) diff --git a/tasks/config/npm/gulpfile.js b/tasks/config/npm/gulpfile.js index bde19605ec..2fc0537578 100644 --- a/tasks/config/npm/gulpfile.js +++ b/tasks/config/npm/gulpfile.js @@ -8,7 +8,7 @@ var // read user config to know what task to load config = require('./tasks/config/user'), - // watch changes + // watch for file changes and build watch = require('./tasks/watch'), // build all files @@ -17,10 +17,14 @@ var buildCSS = require('./tasks/build/css'), buildAssets = require('./tasks/build/assets'), - // utility + // utility tasks clean = require('./tasks/clean'), version = require('./tasks/version'), + // install tasks + install = require('./tasks/install'), + checkInstall = require('./tasks/check-install'), + // docs tasks serveDocs = require('./tasks/docs/serve'), buildDocs = require('./tasks/docs/build'), @@ -35,19 +39,50 @@ var Tasks *******************************/ -gulp.task('default', false, [ - 'watch' -]); - -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('default', function(done) { + checkInstall(); + done(); +}); + +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 @@ -58,8 +93,14 @@ gulp.task('version', 'Displays current version of Semantic', version); 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(); +}); /*-------------- @@ -67,6 +108,17 @@ 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 */ +if(config.admin) { + require('./tasks/collections/admin')(gulp); }