From 63ac92fd4cdeb031e292f2ca96f05c33d9c268ad Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 15 Jan 2018 22:04:05 +0000 Subject: [PATCH] (gulpfile): Delete .tmp folder now works correctly after failed build. Fixes: #258 --- generators/app/templates/_package.json | 2 +- generators/app/templates/gulpfile.js | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json index be89dfb..40d9b73 100644 --- a/generators/app/templates/_package.json +++ b/generators/app/templates/_package.json @@ -38,7 +38,7 @@ "@types/node": "~6.0.60", "codelyzer": "~2.0.0", "core-js": "^2.4.1", - "del": "^2.2.2", + "fs-extra": "^5.0.0", "gulp": "^3.9.1", "gulp-rename": "^1.2.2", "gulp-rollup": "^2.11.0", diff --git a/generators/app/templates/gulpfile.js b/generators/app/templates/gulpfile.js index 770f1ec..033b28c 100644 --- a/generators/app/templates/gulpfile.js +++ b/generators/app/templates/gulpfile.js @@ -4,7 +4,7 @@ var gulp = require('gulp'), ngc = require('@angular/compiler-cli/src/main').main, rollup = require('gulp-rollup'), rename = require('gulp-rename'), - del = require('del'), + fs = require('fs-extra'), runSequence = require('run-sequence'), inlineResources = require('./tools/gulp/inline-resources'); @@ -21,7 +21,7 @@ gulp.task('clean:dist', function () { // Delete contents but not dist folder to avoid broken npm links // when dist directory is removed while npm link references it. - return deleteFolders([distFolder + '/**', '!' + distFolder]); + return fs.emptyDirSync(distFolder); }); /** @@ -173,14 +173,14 @@ gulp.task('copy:readme', function () { * 10. Delete /.tmp folder */ gulp.task('clean:tmp', function () { - return deleteFolders([tmpFolder]); + return deleteFolder(tmpFolder); }); /** * 11. Delete /build folder */ gulp.task('clean:build', function () { - return deleteFolders([buildFolder]); + return deleteFolder(buildFolder); }); gulp.task('compile', function () { @@ -199,7 +199,9 @@ gulp.task('compile', function () { function (err) { if (err) { console.log('ERROR:', err.message); - deleteFolders([distFolder, tmpFolder, buildFolder]); + deleteFolder(distFolder); + deleteFolder(tmpFolder); + deleteFolder(buildFolder); } else { console.log('Compilation finished succesfully'); } @@ -222,6 +224,6 @@ gulp.task('default', ['build:watch']); /** * Deletes the specified folder */ -function deleteFolders(folders) { - return del(folders); +function deleteFolder(folder) { + return fs.removeSync(folder); }