Page MenuHomeDevCentral
Files F3748029

D2432.id6114.diff
No OneTemporary
Actions

D2432.id6114.diff
View Options

diff --git a/components/gulpfile.js b/components/gulpfile.js
--- a/components/gulpfile.js
+++ b/components/gulpfile.js
@@ -14,6 +14,8 @@
import uncss from 'uncss';
import autoprefixer from 'autoprefixer';
+var sass = require('gulp-sass')(require('sass'));
+
// Load all Gulp plugins into one variable
const $ = plugins();
@@ -31,7 +33,7 @@
// Build the "dist" folder by running all of the below tasks
// Sass must be run later so UnCSS can search for used classes in the others assets.
gulp.task('build',
- gulp.series(clean, gulp.parallel(pages, javascript, images, copy), sass));
+ gulp.series(clean, gulp.parallel(pages, javascript, images, copy), compileSass));
// Build the site, run the server, and watch for file changes
gulp.task('default',
@@ -46,7 +48,7 @@
// Copy files out of the assets folder
// This task skips over the "img", "js", and "scss" folders, which are parsed separately
function copy() {
- return gulp.src(build_paths.assets)
+ return gulp.src(config.paths.assets)
.pipe(gulp.dest(config.paths.dist + '/assets'));
}
@@ -71,7 +73,7 @@
// Compile Sass into CSS
// In production, the CSS is compressed
-function sass() {
+function compileSass() {
const postCssPlugins = [
autoprefixer(),
@@ -80,10 +82,10 @@
return gulp.src('src/assets/scss/app.scss')
.pipe($.sourcemaps.init())
- .pipe($.sass({
+ .pipe(sass({
includePaths: config.paths.sass
})
- .on('error', $.sass.logError))
+ .on('error', sass.logError))
.pipe($.postcss(postCssPlugins))
.pipe($.if(PRODUCTION, $.cleanCss({ compatibility: 'ie9' })))
.pipe($.if(!PRODUCTION, $.sourcemaps.write()))
@@ -129,7 +131,9 @@
function images() {
return gulp.src('src/assets/img/**/*')
.pipe($.if(PRODUCTION, $.imagemin([
- $.imagemin.jpegtran({ progressive: true }),
+ $.imagemin.gifsicle({interlaced: true}),
+ $.imagemin.mozjpeg({quality: 80, progressive: true}),
+ $.imagemin.optipng({optimizationLevel: 7}),
])))
.pipe(gulp.dest(config.paths.dist + '/assets/img'));
}
@@ -154,7 +158,7 @@
gulp.watch('src/{layouts,partials}/**/*.html').on('all', gulp.series(resetPages, pages, browser.reload));
gulp.watch('src/data/**/*.{js,json,yml}').on('all', gulp.series(resetPages, pages, browser.reload));
gulp.watch('src/helpers/**/*.js').on('all', gulp.series(resetPages, pages, browser.reload));
- gulp.watch('src/assets/scss/**/*.scss').on('all', sass);
+ gulp.watch('src/assets/scss/**/*.scss').on('all', compileSass);
gulp.watch('src/assets/js/**/*.js').on('all', gulp.series(javascript, browser.reload));
gulp.watch('src/assets/img/**/*').on('all', gulp.series(images, browser.reload));
}
diff --git a/components/package-template.json b/components/package-template.json
--- a/components/package-template.json
+++ b/components/package-template.json
@@ -7,8 +7,8 @@
"dependencies": {
"foundation-sites": "~6.4.1",
"jquery": ">=3.0.0",
- "what-input": "^4.1.3",
- "motion-ui": "^2.0.3"
+ "motion-ui": "^2.0.3",
+ "what-input": "^4.1.3"
},
"devDependencies": {
"@babel/core": "^7.1.2",
@@ -24,21 +24,22 @@
"gulp-concat": "^2.5.2",
"gulp-extname": "^0.2.0",
"gulp-if": "^2.0.0",
- "gulp-imagemin": "^4.1.0",
+ "gulp-imagemin": "^7.1.0",
"gulp-load-plugins": "^1.1.0",
"gulp-postcss": "^8.0.0",
- "gulp-sass": "^4.0.1",
+ "gulp-sass": "^5.0.0",
"gulp-sourcemaps": "^2.6.4",
"gulp-uglify": "^3.0.1",
"js-yaml": "^3.4.6",
"panini": "^1.3.0",
"rimraf": "^2.4.3",
+ "sass": "^1.41.1",
"style-sherpa": "^1.0.0",
"uncss": "^0.16.2",
"vinyl-named": "^1.1.0",
- "webpack": "^4.20.2",
- "webpack-stream": "^5.1.1",
- "yargs": "^12.0.2"
+ "webpack": "^5.53.0",
+ "webpack-stream": "^7.0.0",
+ "yargs": "^17.1.1"
},
"bugs": {
"url": "https://devcentral.nasqueron.org/"

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 06:20 (7 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2248800
Default Alt Text
D2432.id6114.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator