From 0c99aa85d300025cc3a8661bb4c1020f165c21b7 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 5 Feb 2015 16:43:11 -0500 Subject: [PATCH] Fix issues with tasks caused by docs tasks --- tasks/collections/internal-docs.js | 125 ----------------------------- tasks/collections/internal.js | 24 +++--- tasks/watch.js | 9 +-- 3 files changed, 17 insertions(+), 141 deletions(-) delete mode 100644 tasks/collections/internal-docs.js diff --git a/tasks/collections/internal-docs.js b/tasks/collections/internal-docs.js deleted file mode 100644 index 6c97b88c6..000000000 --- a/tasks/collections/internal-docs.js +++ /dev/null @@ -1,125 +0,0 @@ -/******************************* - Internal Task Collection -*******************************/ - -/* These tasks create packaged files from **dist** components - Not intended to be called directly by a user because - these do not build fresh from **src** -*/ - -module.exports = function(gulp) { - - var - // node dependencies - fs = require('fs'), - chmod = require('gulp-chmod'), - concat = require('gulp-concat'), - concatCSS = require('gulp-concat-css'), - clone = require('gulp-clone'), - gulpif = require('gulp-if'), - header = require('gulp-header'), - less = require('gulp-less'), - minifyCSS = require('gulp-minify-css'), - plumber = require('gulp-plumber'), - print = require('gulp-print'), - rename = require('gulp-rename'), - replace = require('gulp-replace'), - uglify = require('gulp-uglify'), - - // docs config - config = require('./../config/docs'), - - // install config - tasks = require('./../config/project/tasks'), - release = require('./../config/project/release'), - - // shorthand - globs = config.globs, - assets = config.paths.assets, - output = config.paths.output, - source = config.paths.source, - - banner = tasks.banner, - filenames = tasks.filenames, - log = tasks.log, - settings = tasks.settings - ; - - /*-------------- - Packaged - ---------------*/ - - gulp.task('package uncompressed docs css', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') - .pipe(plumber()) - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concatCSS(filenames.concatenatedCSS)) - .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - - gulp.task('package compressed docs css', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') - .pipe(plumber()) - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concatCSS(filenames.concatenatedMinifiedCSS)) - .pipe(minifyCSS(settings.minify)) - .pipe(header(banner, settings.header)) - .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - - gulp.task('package uncompressed docs js', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js') - .pipe(plumber()) - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concat(filenames.concatenatedJS)) - .pipe(header(banner, settings.header)) - .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - - gulp.task('package compressed docs js', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js') - .pipe(plumber()) - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concat(filenames.concatenatedMinifiedJS)) - .pipe(uglify(settings.uglify)) - .pipe(header(banner, settings.header)) - .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - - /*-------------- - RTL - ---------------*/ - - gulp.task('package uncompressed docs rtl css', function () { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignoredRTL + '.rtl.css') - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concatCSS(filenames.concatenatedRTLCSS)) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - - gulp.task('package compressed rtl css', function () { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignoredRTL + '.rtl.css') - .pipe(replace(assets.uncompressed, assets.packaged)) - .pipe(concatCSS(filenames.concatenatedMinifiedRTLCSS)) - .pipe(minifyCSS(settings.minify)) - .pipe(header(banner, settings.header)) - .pipe(gulp.dest(output.packaged)) - .pipe(print(log.created)) - ; - }); - -}; \ No newline at end of file diff --git a/tasks/collections/internal.js b/tasks/collections/internal.js index 0c2829e2b..492104c97 100644 --- a/tasks/collections/internal.js +++ b/tasks/collections/internal.js @@ -38,7 +38,6 @@ module.exports = function(gulp) { globs = config.globs, assets = config.paths.assets, output = config.paths.output, - source = config.paths.source, banner = tasks.banner, filenames = tasks.filenames, @@ -51,6 +50,7 @@ module.exports = function(gulp) { ---------------*/ gulp.task('package uncompressed css', function() { + console.log(output.uncompressed + '**/' + globs.components + globs.ignored + '.css'); return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) @@ -62,6 +62,7 @@ module.exports = function(gulp) { }); gulp.task('package compressed css', function() { + console.log(output.uncompressed + '**/' + globs.components + globs.ignored + '.css'); return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) @@ -151,54 +152,55 @@ module.exports = function(gulp) { Docs ---------------*/ - output = docsConfig.paths.output; - source = docsConfig.paths.source; + var + docsOutput = docsConfig.paths.output + ; gulp.task('package uncompressed docs css', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') + return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.css') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) .pipe(concatCSS(filenames.concatenatedCSS)) .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) + .pipe(gulp.dest(docsOutput.packaged)) .pipe(print(log.created)) ; }); gulp.task('package compressed docs css', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.css') + return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.css') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) .pipe(concatCSS(filenames.concatenatedMinifiedCSS)) .pipe(minifyCSS(settings.minify)) .pipe(header(banner, settings.header)) .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) + .pipe(gulp.dest(docsOutput.packaged)) .pipe(print(log.created)) ; }); gulp.task('package uncompressed docs js', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js') + return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.js') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) .pipe(concat(filenames.concatenatedJS)) .pipe(header(banner, settings.header)) .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) + .pipe(gulp.dest(docsOutput.packaged)) .pipe(print(log.created)) ; }); gulp.task('package compressed docs js', function() { - return gulp.src(output.uncompressed + '**/' + globs.components + globs.ignored + '.js') + return gulp.src(docsOutput.uncompressed + '**/' + globs.components + globs.ignored + '.js') .pipe(plumber()) .pipe(replace(assets.uncompressed, assets.packaged)) .pipe(concat(filenames.concatenatedMinifiedJS)) .pipe(uglify(settings.uglify)) .pipe(header(banner, settings.header)) .pipe(gulpif(config.hasPermission, chmod(config.permission))) - .pipe(gulp.dest(output.packaged)) + .pipe(gulp.dest(docsOutput.packaged)) .pipe(print(log.created)) ; }); diff --git a/tasks/watch.js b/tasks/watch.js index 3728658c9..8543d08b4 100644 --- a/tasks/watch.js +++ b/tasks/watch.js @@ -95,7 +95,7 @@ module.exports = function(callback) { ---------------*/ // recompile on *.override , *.variable change - isConfig = (file.path.indexOf('.config') !== -1); + isConfig = (file.path.indexOf('theme.config') !== -1); isPackagedTheme = (file.path.indexOf(source.themes) !== -1); isSiteTheme = (file.path.indexOf(source.site) !== -1); isDefinition = (file.path.indexOf(source.definitions) !== -1); @@ -108,21 +108,20 @@ module.exports = function(callback) { } else if(isPackagedTheme) { console.log('Change detected in packaged theme'); - lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); lessPath = util.replaceExtension(file.path, '.less'); + lessPath = lessPath.replace(tasks.regExp.theme, source.definitions); } else if(isSiteTheme) { console.log('Change detected in site theme'); - lessPath = lessPath.replace(source.site, source.definitions); lessPath = util.replaceExtension(file.path, '.less'); + lessPath = lessPath.replace(source.site, source.definitions); } else if(isDefinition) { console.log('Change detected in definition'); - lessPath = util.replaceExtension(file.path, '.less'); } /*-------------- - Create CSS + Create CSS ---------------*/ if( fs.existsSync(lessPath) ) {