From f8f90ec15eddb415b2c455c900b783cef09a6137 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Wed, 20 Jul 2022 17:14:36 -0400 Subject: [PATCH] Update the traditional bootstrap --- traditional-bootstrap/gulpfile.js | 20 +++++++++++--------- traditional-bootstrap/package.json | 14 +++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/traditional-bootstrap/gulpfile.js b/traditional-bootstrap/gulpfile.js index ccc8d00..aa7789c 100644 --- a/traditional-bootstrap/gulpfile.js +++ b/traditional-bootstrap/gulpfile.js @@ -22,19 +22,21 @@ const babel = require("gulp-babel"), // Determine if gulp has been run with --production const isProduction = minimist(process.argv.slice(2)).production !== undefined; +// Declare plugin settings +const sassOutputStyle = isProduction ? "compressed" : "expanded", + sassPaths = "node_modules", + autoprefixerSettings = { remove: false, cascade: false }; + // Include browsersync when gulp has not been run with --production let browserSync = undefined; -if (isProduction) { - process.env.NODE_ENV = "production"; -} else { +if (!isProduction) { browserSync = require("browser-sync").create(); } -// Declare plugin settings -const sassOutputStyle = isProduction ? "compressed" : "expanded", - sassPaths = [ "node_modules" ], - autoprefixerSettings = { remove: false, cascade: false }; +// Environment +process.env.NODE_ENV = isProduction ? "production" : "development"; +process.env.SASS_PATH = sassPaths; // Javascript files for the public site const jsPublic = [ @@ -61,7 +63,7 @@ const jsDashboard = [ const jsDashboardLibs = [ "node_modules/jquery/dist/jquery.js", "node_modules/popper.js/dist/umd/popper.js", - "node_modules/bootstrap/dist/js/bootstrap.js", + "node_modules/bootstrap/dist/js/bootstrap.bundle.js", "node_modules/flatpickr/dist/flatpickr.js", "node_modules/sortablejs/Sortable.js", "node_modules/list.js/dist/list.js", @@ -93,7 +95,7 @@ function processSass(filename) { const css = gulp.src(`resources/sass/${filename}.scss`) .pipe(plumber(handleError)) .pipe(sassGlob()) - .pipe(sass({ outputStyle: sassOutputStyle, includePaths: sassPaths })) + .pipe(sass({ outputStyle: sassOutputStyle })) .pipe(postCSS([ autoprefixer(autoprefixerSettings) ])) .pipe(concat(`${filename}.css`)) .pipe(gulp.dest("public/css/")); diff --git a/traditional-bootstrap/package.json b/traditional-bootstrap/package.json index 370cc3b..48716b6 100644 --- a/traditional-bootstrap/package.json +++ b/traditional-bootstrap/package.json @@ -8,13 +8,13 @@ "browser-sync": "2.27.10" }, "dependencies": { - "@babel/core": "7.18.5", - "@babel/preset-env": "7.18.2", - "@fortawesome/fontawesome-free": "5.15.4", - "@mr-hope/gulp-sass": "2.0.0", + "@babel/core": "7.18.9", + "@babel/preset-env": "7.18.9", + "@fortawesome/fontawesome-free": "6.1.1", + "@mr-hope/gulp-sass": "3.0.2", "autonumeric": "4.6.0", - "autoprefixer": "10.4.5", - "bootstrap": "5.1.3", + "autoprefixer": "10.4.7", + "bootstrap": "5.2.0", "easymde": "2.16.1", "fancy-log": "2.0.0", "flatpickr": "4.6.13", @@ -33,7 +33,7 @@ "minimist": "1.2.6", "popper.js": "1.16.1", "postcss": "8.4.14", - "sass": "1.32.12", + "sass": "1.53.0", "sortablejs": "1.15.0", "spinkit": "2.0.1", "what-input": "5.2.12"