Upgraded gulpfile completely to version 4

Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
2019-02-26 23:33:25 +01:00
parent e97f15b0b6
commit 5c5411288b

View File

@ -53,12 +53,11 @@ gulp.task("build:styles:critical", function () {
// Builds all styles. // Builds all styles.
gulp.task("build:styles", gulp.series("build:styles:main", "build:styles:critical")); gulp.task("build:styles", gulp.series("build:styles:main", "build:styles:critical"));
gulp.task("clean:styles", function (callback) { gulp.task("clean:styles", function () {
del([paths.jekyllCssFiles + "main.css", return del([paths.jekyllCssFiles + "main.css",
paths.siteCssFiles + "main.css", paths.siteCssFiles + "main.css",
"_includes/critical.css" "_includes/critical.css"
]); ]);
callback();
}); });
// Concatenates and uglifies global JS files and outputs result to the // Concatenates and uglifies global JS files and outputs result to the
@ -67,18 +66,16 @@ gulp.task("build:scripts:global", function () {
return gulp.src([ return gulp.src([
paths.jsFiles + "/global/lib" + paths.jsPattern, paths.jsFiles + "/global/lib" + paths.jsPattern,
paths.jsFiles + "/global/*.js" paths.jsFiles + "/global/*.js"
]) ]).pipe(sprockets.default.js())
.pipe(sprockets.default.js()) .pipe(concat("main.js"))
.pipe(concat("main.js")) .pipe(uglify())
.pipe(uglify()) .pipe(gulp.dest(paths.jekyllJsFiles))
.pipe(gulp.dest(paths.jekyllJsFiles)) .pipe(gulp.dest(paths.siteJsFiles))
.pipe(gulp.dest(paths.siteJsFiles)) .on("error", gutil.log);
.on("error", gutil.log);
}); });
gulp.task("clean:scripts", function (callback) { gulp.task("clean:scripts", function () {
del([paths.jekyllJsFiles + "main.js", paths.siteJsFiles + "main.js"]); return del([paths.jekyllJsFiles + "main.js", paths.siteJsFiles + "main.js"]);
callback();
}); });
// Concatenates and uglifies leaflet JS files and outputs result to the // Concatenates and uglifies leaflet JS files and outputs result to the
@ -87,17 +84,15 @@ gulp.task("build:scripts:leaflet", function () {
return gulp.src([ return gulp.src([
paths.jsFiles + "/leaflet/leaflet.js", paths.jsFiles + "/leaflet/leaflet.js",
paths.jsFiles + "/leaflet/leaflet-providers.js" paths.jsFiles + "/leaflet/leaflet-providers.js"
]) ]).pipe(concat("leaflet.js"))
.pipe(concat("leaflet.js")) .pipe(uglify())
.pipe(uglify()) .pipe(gulp.dest(paths.jekyllJsFiles))
.pipe(gulp.dest(paths.jekyllJsFiles)) .pipe(gulp.dest(paths.siteJsFiles))
.pipe(gulp.dest(paths.siteJsFiles)) .on("error", gutil.log);
.on("error", gutil.log);
}); });
gulp.task("clean:scripts:leaflet", function (callback) { gulp.task("clean:scripts:leaflet", function () {
del([paths.jekyllJsFiles + "leaflet.js", paths.siteJsFiles + "leaflet.js"]); return del([paths.jekyllJsFiles + "leaflet.js", paths.siteJsFiles + "leaflet.js"]);
callback();
}); });
// Builds all scripts. // Builds all scripts.
@ -112,14 +107,13 @@ gulp.task("build:images", function () {
.pipe(browserSync.stream()); .pipe(browserSync.stream());
}); });
gulp.task("clean:images", function (callback) { gulp.task("clean:images", function () {
del([paths.jekyllImageFiles, paths.siteImageFiles]); return del([paths.jekyllImageFiles, paths.siteImageFiles]);
callback();
}); });
// Runs jekyll build command. // Runs jekyll build command.
gulp.task("build:jekyll", function () { gulp.task("build:jekyll", function () {
var shellCommand = "bundle exec jekyll build --config _config.yml"; let shellCommand = "bundle exec jekyll build --config _config.yml";
return gulp.src("") return gulp.src("")
.pipe(run(shellCommand)) .pipe(run(shellCommand))
@ -128,7 +122,7 @@ gulp.task("build:jekyll", function () {
// Runs jekyll build command using test config. // Runs jekyll build command using test config.
gulp.task("build:jekyll:test", function () { gulp.task("build:jekyll:test", function () {
var shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml"; let shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml";
return gulp.src("") return gulp.src("")
.pipe(run(shellCommand)) .pipe(run(shellCommand))
@ -137,7 +131,7 @@ gulp.task("build:jekyll:test", function () {
// Runs jekyll build command using local config. // Runs jekyll build command using local config.
gulp.task("build:jekyll:local", function () { gulp.task("build:jekyll:local", function () {
var shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml,_config.dev.yml"; let shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml,_config.dev.yml";
return gulp.src("") return gulp.src("")
.pipe(run(shellCommand)) .pipe(run(shellCommand))
@ -145,9 +139,8 @@ gulp.task("build:jekyll:local", function () {
}); });
// Deletes the entire _site directory. // Deletes the entire _site directory.
gulp.task("clean:jekyll", function (callback) { gulp.task("clean:jekyll", function () {
del(["_site"]); return del(["_site"]);
callback();
}); });
gulp.task("clean", gulp.series("clean:jekyll", gulp.task("clean", gulp.series("clean:jekyll",
@ -156,28 +149,20 @@ gulp.task("clean", gulp.series("clean:jekyll",
"clean:styles")); "clean:styles"));
// Builds site anew. // Builds site anew.
gulp.task("build", function (callback) { gulp.task("build", gulp.series("clean",
gulp.series("clean", gulp.parallel("build:scripts", "build:images", "build:styles"),
gulp.series("build:scripts", "build:images", "build:styles"), "build:jekyll")
"build:jekyll"); );
callback();
});
// Builds site anew using test config. // Builds site anew using test config.
gulp.task("build:test", function (callback) { gulp.task("build:test", gulp.series("clean",
gulp.series("clean", gulp.parallel("build:scripts", "build:images", "build:styles"),
gulp.series("build:scripts", "build:images", "build:styles"), "build:jekyll:test"));
"build:jekyll:test");
callback();
});
// Builds site anew using local config. // Builds site anew using local config.
gulp.task("build:local", function (callback) { gulp.task("build:local", gulp.series("clean",
gulp.series("clean", gulp.parallel("build:scripts", "build:images", "build:styles"),
gulp.series("build:scripts", "build:images", "build:styles"), "build:jekyll:local"));
"build:jekyll:local");
callback();
});
// Default Task: builds site. // Default Task: builds site.
gulp.task("default", gulp.series("build")); gulp.task("default", gulp.series("build"));