Merge pull request phpbb#6606 from marc1706/ticket/17309

[ticket/17309] Update gulp and remove no longer needed gulp packages
marc1706 · May 7, 2024 · 9ecd1e4 · 9ecd1e4
2 parents 222ca64 + 19f5347
commit 9ecd1e4
Show file tree

Hide file tree

Showing 3 changed files with 1,567 additions and 7,409 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -2,8 +2,7 @@
 
 const gulp = require('gulp');
 const rename = require('gulp-rename');
-const sourcemaps = require('gulp-sourcemaps');
-const concat = require('gulp-concat-css');
+const concat = require('gulp-concat');
 const postcss = require('gulp-postcss');
 const autoprefixer = require('autoprefixer');
 const cssnano = require('cssnano');
@@ -19,16 +18,14 @@ const paths = {
 };
 
 function styles() {
-	return gulp.src(paths.styles.src)
-		.pipe(sourcemaps.init())
+	return gulp.src(paths.styles.src, { sourcemaps: true })
 		.pipe(
 			postcss([
 				autoprefixer(),
 				sorting(sortOrder),
 			]),
 		)
-		.pipe(sourcemaps.write('./'))
-		.pipe(gulp.dest(paths.styles.css));
+		.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
 }
 
 function minify() {
@@ -47,8 +44,7 @@ function minify() {
 		paths.styles.css + 'colours.css',
 		paths.styles.css + 'responsive.css',
 		paths.styles.css + 'bidi.css',
-	])
-		.pipe(sourcemaps.init())
+	], { sourcemaps: true })
 		.pipe(concat('stylesheet.css'))
 		.pipe(
 			postcss([
@@ -59,8 +55,7 @@ function minify() {
 			suffix: '.min',
 			extname: '.css',
 		}))
-		.pipe(sourcemaps.write('./'))
-		.pipe(gulp.dest(paths.styles.css));
+		.pipe(gulp.dest(paths.styles.css, { sourcemaps: './' }));
 }
 
 function watch() {