More fixes on deploy scripts.

This commit is contained in:
Andrey Antukh 2016-02-21 20:50:26 +02:00
parent ce2ac6fe47
commit ffbaf87cf5
2 changed files with 13 additions and 10 deletions

View file

@ -12,6 +12,7 @@ var paths = {};
paths.app = "./resources/"; paths.app = "./resources/";
paths.output = "./resources/public/"; paths.output = "./resources/public/";
paths.dist = "./dist/"; paths.dist = "./dist/";
paths.target = "./target/";
paths.scss = paths.app + "styles/**/*.scss"; paths.scss = paths.app + "styles/**/*.scss";
gulp.task("scss", function() { gulp.task("scss", function() {
@ -33,21 +34,23 @@ gulp.task("cssmin", function() {
.pipe(gulp.dest(paths.output + "css/")); .pipe(gulp.dest(paths.output + "css/"));
}); });
gulp.task("styles:dev", function(next) { gulp.task("styles-dev", function(next) {
runseq("scss", "autoprefixer", next); runseq("scss", "autoprefixer", next);
}); });
gulp.task("styles:dist", function(next) { gulp.task("styles-dist", function(next) {
runseq("scss", "autoprefixer", next); runseq("scss", "autoprefixer", next);
}); });
gulp.task("clean:dist", function(next) { gulp.task("clean-dist", function(next) {
rimraf(paths.dist + "**/*", next); rimraf(paths.dist, next);
}); });
gulp.task("clean:public", function(next) { gulp.task("clean", function(next) {
rimraf(paths.output + "css/", function() { rimraf(paths.output + "css/", function() {
rimraf(paths.output + "js/", next); rimraf(paths.output + "js/", function() {
rimraf(paths.target, next);
});
}); });
}); });
@ -58,10 +61,10 @@ gulp.task("copy", function() {
// Default // Default
gulp.task("dist", function(next) { gulp.task("dist", function(next) {
runseq("clean:public", "styles:dist", "cssmin", "clean:dist", "copy", next); runseq("styles-dist", "cssmin", "clean-dist", "copy", next);
}); });
// Watch // Watch
gulp.task("default", ["styles:dev"], function () { gulp.task("default", ["styles-dev"], function () {
gulp.watch(paths.scss, ["autoprefixer"]); gulp.watch(paths.scss, ["autoprefixer"]);
}); });

View file

@ -9,7 +9,7 @@
}, },
"scripts": { "scripts": {
"watch": "gulp", "watch": "gulp",
"dist": "./scripts/dist && gulp dist", "dist": "gulp clean && ./scripts/dist && gulp dist",
"clean": "gulp clean", "clean": "gulp clean",
"figwheel": "./scripts/figwheel", "figwheel": "./scripts/figwheel",
"test-watch": "./scripts/watch", "test-watch": "./scripts/watch",