lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Updated Gulpfile.js

Browse Source 
Removed variable option for rebuildAlways
Set watch task to always check `watchPaths` and populated that based on `watch` variable option (if the option is present, it will watch files designated in `watch` as well as files designated in `input`.  Otherwise, it will only watch files designated in `input`.
This commit is contained in:
Gustavo Tandeciarz
2015-08-05 08:28:08 -04:00
parent 0fcf8c7409
commit ecbd485fd8
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Gulpfile.js
View File

@@ -31,7 +31,6 @@ var glob = require("glob"),
"inputs": [ "Less/master.less" ], //Specifies which files to process during the Build task "inputs": [ "Less/master.less" ], //Specifies which files to process during the Build task
"output": "Styles/@.css", //When @ is specified, each file specified in "inputs" will be converted to [filename].css "output": "Styles/@.css", //When @ is specified, each file specified in "inputs" will be converted to [filename].css
"watch": ["Less/*.less"], //specifies which files to watch, use this when you have a master Less file that imports other Less files "watch": ["Less/*.less"], //specifies which files to watch, use this when you have a master Less file that imports other Less files
"rebuildAlways": true, //Will force rebuild, defaults to 'true'
"generateSourceMaps": true //Will include source maps in unminified version, defaults to 'true' "generateSourceMaps": true //Will include source maps in unminified version, defaults to 'true'
} }
] ]
@@ -59,9 +58,9 @@ gulp.task("rebuild", function () {
// Continuous watch (each asset group is built whenever one of its inputs changes). // Continuous watch (each asset group is built whenever one of its inputs changes).
gulp.task("watch", function () { gulp.task("watch", function () {
getAssetGroups().forEach(function (assetGroup) { getAssetGroups().forEach(function (assetGroup) {
gulp.watch(assetGroup.watchPaths != undefined ? assetGroup.watchPaths : assetGroup.inputPaths, function (event) { gulp.watch(assetGroup.watchPaths, function (event) {
console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding output '" + assetGroup.outputPath + "'."); console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding output '" + assetGroup.outputPath + "'.");
var doRebuild = assetGroup.rebuildAlways != undefined ? assetGroup.rebuildAlways : true; //defaults to true var doRebuild = true;
var task = createAssetGroupTask(assetGroup, doRebuild); var task = createAssetGroupTask(assetGroup, doRebuild);
}); });
}); });
@@ -89,12 +88,12 @@ function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) { assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
return path.join(assetGroup.basePath, inputPath); return path.join(assetGroup.basePath, inputPath);
}); });
if (assetGroup.watch != undefined) {
assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) { assetGroup.watchPaths = !!assetGroup.watch ?
assetGroup.watch.map(function (watchPath) {
return path.join(assetGroup.basePath, watchPath); return path.join(assetGroup.basePath, watchPath);
}) }).concat(assetGroup.inputPaths) : assetGroup.inputPaths;
.concat(assetGroup.inputPaths); //include inputs in watch list
}
assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output); assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output);
assetGroup.outputDir = path.dirname(assetGroup.outputPath); assetGroup.outputDir = path.dirname(assetGroup.outputPath);
assetGroup.outputFileName = path.basename(assetGroup.output); assetGroup.outputFileName = path.basename(assetGroup.output);
@@ -127,7 +126,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
else { else {
console.log("Force Rebuild is enabled, rebuilding all input files."); console.log("Force Rebuild is enabled, rebuilding all input files.");
} }
var generateSourceMaps = assetGroup.generateSourceMaps != undefined ? assetGroup.generateSourceMaps : true; var generateSourceMaps = assetGroup.generateSourceMaps !== undefined ? assetGroup.generateSourceMaps : true;
return gulp.src(assetGroup.inputPaths) return gulp.src(assetGroup.inputPaths)
.pipe(gulpif(!doRebuild, .pipe(gulpif(!doRebuild,
gulpif(doConcat, gulpif(doConcat,
@@ -155,7 +154,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
suffix: ".min" suffix: ".min"
})) }))
.pipe(gulp.dest(assetGroup.outputDir)) .pipe(gulp.dest(assetGroup.outputDir))
.pipe(gulpif(doRebuild, notify("Rebuild complete"),notify("Build process complete"))); .pipe(gulpif(doRebuild, notify("Rebuild complete"), notify("Build process complete")));
} }
function buildJsPipeline(assetGroup, doRebuild) { function buildJsPipeline(assetGroup, doRebuild) {
@@ -165,7 +164,7 @@ function buildJsPipeline(assetGroup, doRebuild) {
throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'."; throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
}); });
var doConcat = path.basename(assetGroup.outputFileName, ".js") !== "@"; var doConcat = path.basename(assetGroup.outputFileName, ".js") !== "@";
var generateSourceMaps = assetGroup.generateSourceMaps != undefined ? assetGroup.generateSourceMaps : true; var generateSourceMaps = assetGroup.generateSourceMaps !== undefined ? assetGroup.generateSourceMaps : true;
return gulp.src(assetGroup.inputPaths) return gulp.src(assetGroup.inputPaths)
.pipe(gulpif(!doRebuild, .pipe(gulpif(!doRebuild,
gulpif(doConcat, gulpif(doConcat,
@@ -182,7 +181,7 @@ function buildJsPipeline(assetGroup, doRebuild) {
noEmitOnError: true, noEmitOnError: true,
sortOutput: true, sortOutput: true,
}).js)) }).js))
.pipe(gulpif(doConcat, concat(assetGroup.outputFileName))) .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
// TODO: Start using below whenever gulp-header supports sourcemaps. // TODO: Start using below whenever gulp-header supports sourcemaps.
//.pipe(header( //.pipe(header(
// "/*\n" + // "/*\n" +
@@ -192,9 +191,9 @@ function buildJsPipeline(assetGroup, doRebuild) {
// "*/\n\n")) // "*/\n\n"))
.pipe(gulpif(generateSourceMaps, sourcemaps.write())) .pipe(gulpif(generateSourceMaps, sourcemaps.write()))
.pipe(gulp.dest(assetGroup.outputDir)) .pipe(gulp.dest(assetGroup.outputDir))
.pipe(uglify()) .pipe(uglify())
.pipe(rename({ .pipe(rename({
suffix: ".min" suffix: ".min"
})) }))
.pipe(gulp.dest(assetGroup.outputDir)); .pipe(gulp.dest(assetGroup.outputDir));
} }