diff --git a/gulpfile.js b/gulpfile.js index 10cfd4738ecc956231850db6a9b68e7a9eb844c3_Z3VscGZpbGUuanM=..4c5f2468ca3322a1dc1bcddf676a789615e36527_Z3VscGZpbGUuanM= 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,8 +8,7 @@ var sourcemaps = require('gulp-sourcemaps'); var iconfont = require('gulp-iconfont'); var iconfontCss = require('gulp-iconfont-css'); -var sequence = require('run-sequence'); var cssFileName = 'screen'; var fontName = 'Icons'; gulp.task('js', function() { @@ -12,8 +11,8 @@ var cssFileName = 'screen'; var fontName = 'Icons'; gulp.task('js', function() { - gulp.src([ + return gulp.src([ 'node_modules/jquery/dist/jquery.slim.js', 'node_modules/popper.js/dist/umd/popper.js', 'node_modules/bootstrap/dist/js/bootstrap.js', @@ -32,7 +31,7 @@ }); gulp.task('sass', function() { - gulp.src('sass/' + cssFileName + '.scss') + return gulp.src('sass/' + cssFileName + '.scss') .pipe(sourcemaps.init()) .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError)) .pipe(rename(cssFileName + '.min.css')) @@ -59,8 +58,6 @@ .on('end', callback); }); -gulp.task('css', function(done) { - sequence('iconfont', 'sass', done); -}); +gulp.task('css', gulp.series(['iconfont', 'sass'])); gulp.task('watch', function() { @@ -65,6 +62,6 @@ gulp.task('watch', function() { - gulp.watch(['sass/*', 'sass/*/*', 'sass/*/*/*'], ['sass']); - gulp.watch(['iconfont/*'], ['iconfont']); + gulp.watch(['sass/*', 'sass/*/*', 'sass/*/*/*'], gulp.parallel(['sass'])); + gulp.watch(['iconfont/*'], gulp.parallel(['iconfont'])); }); @@ -69,3 +66,3 @@ }); -gulp.task('default', ['js', 'css']); +gulp.task('default', gulp.parallel(['js', 'css'])); diff --git a/package.json b/package.json index 10cfd4738ecc956231850db6a9b68e7a9eb844c3_cGFja2FnZS5qc29u..4c5f2468ca3322a1dc1bcddf676a789615e36527_cGFja2FnZS5qc29u 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "description": "NPM Tryton", "author": "Pierre Gomba", "dependencies": { - "animate.css": "^3.7.0", - "bootstrap": "^4.1.0", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^6.0.0", - "gulp-clean-css": "^3.9.0", + "animate.css": "^3.7.2", + "bootstrap": "^4.3.1", + "gulp": "^4.0.2", + "gulp-autoprefixer": "^6.1.0", + "gulp-clean-css": "^4.0.0", "gulp-concat": "^2.6.1", @@ -13,4 +13,4 @@ "gulp-concat": "^2.6.1", - "gulp-iconfont": "^10.0.2", - "gulp-iconfont-css": "^2.3.0", + "gulp-iconfont": "^10.0.3", + "gulp-iconfont-css": "^3.0.0", "gulp-rename": "^1.2.2", @@ -16,14 +16,11 @@ "gulp-rename": "^1.2.2", - "gulp-sass": "^3.1.0", - "gulp-sourcemaps": "^2.6.4", - "gulp-uglify": "^3.0.1", - "html5shiv": "^3.7.3", - "jquery": "^3.3.1", - "leaflet": "^1.3.4", - "material-icons": "^0.2.3", - "popper.js": "^1.14.0", - "respond.js": "^1.4.2", - "run-sequence": "^2.2.1", + "gulp-sass": "^4.0.2", + "gulp-sourcemaps": "^2.6.5", + "gulp-uglify": "^3.0.2", + "jquery": "^3.4.1", + "leaflet": "^1.5.1", + "material-icons": "^0.3.1", + "popper.js": "^1.15.0", "wowjs": "^1.1.3" }, "devDependencies": { @@ -27,6 +24,6 @@ "wowjs": "^1.1.3" }, "devDependencies": { - "sass-lint": "^1.12.1" + "sass-lint": "^1.13.1" } }