Page MenuHomeDevCentral
Files F3774329

D3588.id9285.diff
No OneTemporary
Actions

D3588.id9285.diff
View Options

diff --git a/components/gulpfile.js b/components/gulpfile.js
--- a/components/gulpfile.js
+++ b/components/gulpfile.js
@@ -5,7 +5,7 @@
import browser from 'browser-sync';
import gulp from 'gulp';
import panini from 'panini';
-import rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
import yaml from 'js-yaml';
import fs from 'fs';
import webpackStream from 'webpack-stream';
@@ -13,8 +13,12 @@
import named from 'vinyl-named';
import uncss from 'uncss';
import autoprefixer from 'autoprefixer';
+import imagemin from 'gulp-imagemin';
+import { gifsicle, mozjpeg, optipng, svgo } from 'gulp-imagemin';
-var sass = require('gulp-sass')(require('sass'));
+import * as dartSass from 'sass';
+import gulpSass from 'gulp-sass';
+const sass = gulpSass(dartSass);
// Load all Gulp plugins into one variable
const $ = plugins();
@@ -26,8 +30,10 @@
const config = loadConfig();
function loadConfig() {
+ const unsafe = require('js-yaml-js-types').all;
+ const schema = yaml.DEFAULT_SCHEMA.extend(unsafe);
let ymlFile = fs.readFileSync('config.yml', 'utf8');
- return yaml.load(ymlFile);
+ return yaml.load(ymlFile, { schema });
}
// Build the "dist" folder by running all of the below tasks
@@ -42,7 +48,8 @@
// Delete the "dist" folder
// This happens every time a build starts
function clean(done) {
- rimraf(config.paths.dist, done);
+ rimraf.rimrafSync(config.paths.dist);
+ done();
}
// Copy files out of the assets folder
@@ -130,10 +137,16 @@
// In production, the images are compressed
function images() {
return gulp.src('src/assets/img/**/*')
- .pipe($.if(PRODUCTION, $.imagemin([
- $.imagemin.gifsicle({interlaced: true}),
- $.imagemin.mozjpeg({quality: 80, progressive: true}),
- $.imagemin.optipng({optimizationLevel: 7}),
+ .pipe($.if(PRODUCTION, imagemin([
+ gifsicle({interlaced: true}),
+ mozjpeg({quality: 85, progressive: true}),
+ optipng({optimizationLevel: 5}),
+ svgo({
+ plugins: [
+ {removeViewBox: true},
+ {cleanupIDs: false}
+ ]
+ })
])))
.pipe(gulp.dest(config.paths.dist + '/assets/img'));
}
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -5,41 +5,43 @@
"build": "gulp build --production"
},
"dependencies": {
- "foundation-sites": "~6.4.1",
- "jquery": ">=3.0.0",
- "motion-ui": "^2.0.3",
- "what-input": "^4.1.3"
+ "foundation-sites": "~6.8.1",
+ "jquery": "^3.6.0",
+ "motion-ui": "^2.0.4",
+ "what-input": "^5.2.12"
},
"devDependencies": {
- "@babel/core": "^7.1.2",
- "@babel/preset-env": "^7.1.0",
- "@babel/register": "^7.0.0",
- "autoprefixer": "^9.1.5",
- "babel-loader": "^8.0.4",
- "browser-sync": "^2.10.0",
- "gulp": "^4.0.0",
+ "@babel/core": "^7.26.0",
+ "@babel/preset-env": "^7.26.0",
+ "@babel/register": "^7.25.9",
+ "autoprefixer": "^10.4.20",
+ "babel-loader": "^9.2.1",
+ "browser-sync": "^3.0.3",
+ "gulp": "^5.0.0",
"gulp-babel": "^8.0.0",
- "gulp-clean-css": "^3.3.1",
- "gulp-cli": "^2.0.1",
- "gulp-concat": "^2.5.2",
- "gulp-extname": "^0.2.0",
- "gulp-if": "^2.0.0",
+ "gulp-clean-css": "^4.3.0",
+ "gulp-cli": "^3.0.0",
+ "gulp-concat": "^2.6.1",
+ "gulp-extname": "^0.2.2",
+ "gulp-if": "^3.0.0",
"gulp-imagemin": "^7.1.0",
- "gulp-load-plugins": "^1.1.0",
- "gulp-postcss": "^8.0.0",
- "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",
+ "gulp-load-plugins": "^2.0.8",
+ "gulp-postcss": "^10.0.0",
+ "gulp-sass": "^5.1.0",
+ "gulp-sourcemaps": "^3.0.0",
+ "gulp-uglify": "^3.0.2",
+ "js-yaml": "^4.1.0",
+ "js-yaml-js-types": "^1.0.1",
+ "panini": "^1.7.2",
+ "postcss": "^8.4.49",
+ "rimraf": "^6.0.1",
+ "sass": "^1.80.7",
+ "style-sherpa": "^1.0.2",
+ "uncss": "^0.17.3",
"vinyl-named": "^1.1.0",
- "webpack": "^5.53.0",
+ "webpack": "^5.96.1",
"webpack-stream": "^7.0.0",
- "yargs": "^17.1.1"
+ "yargs": "^17.7.2"
},
"bugs": {
"url": "https://devcentral.nasqueron.org/"

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 11:06 (18 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2262187
Default Alt Text
D3588.id9285.diff (4 KB)

Event Timeline

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