Update npm dependencies and migrate to gulp v5

This commit is contained in:
Kevin MacMartin 2024-04-01 00:54:53 -04:00
parent fc599e4996
commit 9809d803da
5 changed files with 1216 additions and 3398 deletions

View file

@ -4,6 +4,7 @@ const gulp = require("gulp"),
log = require("fancy-log"), log = require("fancy-log"),
plumber = require("gulp-plumber"), plumber = require("gulp-plumber"),
concat = require("gulp-concat"), concat = require("gulp-concat"),
ordered = require("ordered-read-streams"),
fs = require("fs"), fs = require("fs"),
crypto = require("crypto"); crypto = require("crypto");
@ -89,6 +90,13 @@ function handleError(err) {
this.emit("end"); this.emit("end");
} }
// Takes an array of files and returns an stream of gulp sources
function orderedGulpSources(array) {
return ordered(array.map(function(item) {
return gulp.src(item);
}));
}
// Process sass // Process sass
function processSass(filename) { function processSass(filename) {
const css = gulp.src(`resources/sass/${filename}.scss`) const css = gulp.src(`resources/sass/${filename}.scss`)
@ -113,7 +121,7 @@ function processSass(filename) {
// Process css // Process css
function processCSS(outputFilename, inputFiles) { function processCSS(outputFilename, inputFiles) {
const css = gulp.src(inputFiles) const css = orderedGulpSources(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(postCSS([ autoprefixer(autoprefixerSettings) ])) .pipe(postCSS([ autoprefixer(autoprefixerSettings) ]))
.pipe(concat(`${outputFilename}.css`)); .pipe(concat(`${outputFilename}.css`));
@ -210,7 +218,7 @@ function processVue(outputFilename, inputFile, done) {
// Process javascript // Process javascript
function processJavaScript(outputFilename, inputFiles, es6) { function processJavaScript(outputFilename, inputFiles, es6) {
const javascript = gulp.src(inputFiles) const javascript = orderedGulpSources(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(concat(`${outputFilename}.js`)); .pipe(concat(`${outputFilename}.js`));

4558
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -8,12 +8,12 @@
"browser-sync": "3.0.2" "browser-sync": "3.0.2"
}, },
"dependencies": { "dependencies": {
"@babel/core": "7.24.1", "@babel/core": "7.24.3",
"@babel/preset-env": "7.24.1", "@babel/preset-env": "7.24.3",
"@fortawesome/fontawesome-free": "6.5.1", "@fortawesome/fontawesome-free": "6.5.1",
"@mr-hope/gulp-sass": "3.1.1", "@mr-hope/gulp-sass": "3.1.1",
"autonumeric": "4.10.5", "autonumeric": "4.10.5",
"autoprefixer": "10.4.18", "autoprefixer": "10.4.19",
"axios": "1.6.8", "axios": "1.6.8",
"babel-loader": "9.1.3", "babel-loader": "9.1.3",
"bootstrap": "5.3.3", "bootstrap": "5.3.3",
@ -21,7 +21,7 @@
"fancy-log": "2.0.0", "fancy-log": "2.0.0",
"flatpickr": "4.6.13", "flatpickr": "4.6.13",
"gsap": "3.12.5", "gsap": "3.12.5",
"gulp": "4.0.2", "gulp": "5.0.0",
"gulp-babel": "8.0.0", "gulp-babel": "8.0.0",
"gulp-clean-css": "4.3.0", "gulp-clean-css": "4.3.0",
"gulp-concat": "2.6.1", "gulp-concat": "2.6.1",
@ -33,8 +33,9 @@
"jquery": "3.7.1", "jquery": "3.7.1",
"list.js": "2.3.1", "list.js": "2.3.1",
"minimist": "1.2.8", "minimist": "1.2.8",
"ordered-read-streams": "^2.0.0",
"popper.js": "1.16.1", "popper.js": "1.16.1",
"postcss": "8.4.37", "postcss": "8.4.38",
"sass": "1.72.0", "sass": "1.72.0",
"sortablejs": "1.15.2", "sortablejs": "1.15.2",
"spinkit": "2.0.1", "spinkit": "2.0.1",
@ -43,7 +44,7 @@
"vue-loader": "17.4.2", "vue-loader": "17.4.2",
"vue-router": "4.3.0", "vue-router": "4.3.0",
"vuex": "4.1.0", "vuex": "4.1.0",
"webpack": "5.90.3", "webpack": "5.91.0",
"what-input": "5.2.12" "what-input": "5.2.12"
} }
} }

View file

@ -4,6 +4,7 @@ const gulp = require("gulp"),
log = require("fancy-log"), log = require("fancy-log"),
plumber = require("gulp-plumber"), plumber = require("gulp-plumber"),
concat = require("gulp-concat"), concat = require("gulp-concat"),
ordered = require("ordered-read-streams"),
fs = require("fs"), fs = require("fs"),
crypto = require("crypto"); crypto = require("crypto");
@ -90,6 +91,13 @@ function handleError(err) {
this.emit("end"); this.emit("end");
} }
// Takes an array of files and returns an stream of gulp sources
function orderedGulpSources(array) {
return ordered(array.map(function(item) {
return gulp.src(item);
}));
}
// Process sass // Process sass
function processSass(filename) { function processSass(filename) {
const css = gulp.src(`resources/sass/${filename}.scss`) const css = gulp.src(`resources/sass/${filename}.scss`)
@ -109,7 +117,7 @@ function processSass(filename) {
// Process css // Process css
function processCSS(outputFilename, inputFiles) { function processCSS(outputFilename, inputFiles) {
const css = gulp.src(inputFiles) const css = orderedGulpSources(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(postCSS([ autoprefixer(autoprefixerSettings) ])) .pipe(postCSS([ autoprefixer(autoprefixerSettings) ]))
.pipe(concat(`${outputFilename}.css`)); .pipe(concat(`${outputFilename}.css`));
@ -123,7 +131,7 @@ function processCSS(outputFilename, inputFiles) {
// Process javascript // Process javascript
function processJavaScript(outputFilename, inputFiles, es6) { function processJavaScript(outputFilename, inputFiles, es6) {
const javascript = gulp.src(inputFiles) const javascript = orderedGulpSources(inputFiles)
.pipe(plumber(handleError)) .pipe(plumber(handleError))
.pipe(concat(`${outputFilename}.js`)); .pipe(concat(`${outputFilename}.js`));

View file

@ -8,18 +8,18 @@
"browser-sync": "3.0.2" "browser-sync": "3.0.2"
}, },
"dependencies": { "dependencies": {
"@babel/core": "7.24.1", "@babel/core": "7.24.3",
"@babel/preset-env": "7.24.1", "@babel/preset-env": "7.24.3",
"@fortawesome/fontawesome-free": "6.5.1", "@fortawesome/fontawesome-free": "6.5.1",
"@mr-hope/gulp-sass": "3.1.1", "@mr-hope/gulp-sass": "3.1.1",
"autonumeric": "4.10.5", "autonumeric": "4.10.5",
"autoprefixer": "10.4.18", "autoprefixer": "10.4.19",
"bootstrap": "5.3.3", "bootstrap": "5.3.3",
"easymde": "2.18.0", "easymde": "2.18.0",
"fancy-log": "2.0.0", "fancy-log": "2.0.0",
"flatpickr": "4.6.13", "flatpickr": "4.6.13",
"gsap": "3.12.5", "gsap": "3.12.5",
"gulp": "4.0.2", "gulp": "5.0.0",
"gulp-babel": "8.0.0", "gulp-babel": "8.0.0",
"gulp-clean-css": "4.3.0", "gulp-clean-css": "4.3.0",
"gulp-concat": "2.6.1", "gulp-concat": "2.6.1",
@ -31,8 +31,9 @@
"jquery": "3.7.1", "jquery": "3.7.1",
"list.js": "2.3.1", "list.js": "2.3.1",
"minimist": "1.2.8", "minimist": "1.2.8",
"ordered-read-streams": "^2.0.0",
"popper.js": "1.16.1", "popper.js": "1.16.1",
"postcss": "8.4.37", "postcss": "8.4.38",
"sass": "1.72.0", "sass": "1.72.0",
"sortablejs": "1.15.2", "sortablejs": "1.15.2",
"spinkit": "2.0.1", "spinkit": "2.0.1",