5.11.7

.eslintrc.js

@@ -22,7 +22,7 @@ module.exports = {
 
 	},
 	parserOptions: {
-		ecmaVersion: 2021,
+		ecmaVersion: 2023,
 	},
 	plugins: [
 		'unicorn',

gulp/publish-frontend.mjs

@@ -1,20 +1,22 @@
 /* eslint-disable import/no-extraneous-dependencies */
-const gulp = require('gulp');
+import {
-const concat = require('gulp-concat');
+	src, dest, series, parallel,
-const terser = require('gulp-terser');
+} from 'gulp';
-const ejs = require('gulp-ejs');
+import concat from 'gulp-concat';
-const rename = require('gulp-rename');
+import terser from 'gulp-terser';
-const htmlmin = require('gulp-htmlmin');
+import ejs from 'gulp-ejs';
-const del = require('del');
+import rename from 'gulp-rename';
-const s3Upload = require('gulp-s3-upload');
+import htmlmin from 'gulp-htmlmin';
-const webpack = require('webpack-stream');
+import { deleteAsync } from 'del';
-const TerserPlugin = require('terser-webpack-plugin');
+import s3Upload from 'gulp-s3-upload';
-const path = require('path');
+import webpack from 'webpack-stream';
-
+import TerserPlugin from 'terser-webpack-plugin';
-const clean = () => del(['./dist**']);
+import { readFile } from 'fs/promises';
 
 // get cloudfront
-const { CloudFrontClient, CreateInvalidationCommand } = require('@aws-sdk/client-cloudfront');
+import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront';
+
+const clean = () => deleteAsync(['./dist**']);
 
 const cloudfront = new CloudFrontClient({ region: 'us-east-1' });
 
@@ -34,7 +36,7 @@ const webpackOptions = {
 		filename: 'ws.min.js',
 	},
 	resolve: {
-		roots: [path.resolve(__dirname, './')],
+		roots: ['./'],
 	},
 	optimization: {
 		minimize: true,
@@ -52,10 +54,10 @@ const webpackOptions = {
 	},
 };
 
-gulp.task('compress_js_data', () => gulp.src(jsSourcesData)
+const compressJsData = () => src(jsSourcesData)
 	.pipe(concat('data.min.js'))
 	.pipe(terser())
-	.pipe(gulp.dest(RESOURCES_PATH)));
+	.pipe(dest(RESOURCES_PATH));
 
 const jsVendorSources = [
 	'server/scripts/vendor/auto/jquery.js',
@@ -65,10 +67,10 @@ const jsVendorSources = [
 	'server/scripts/vendor/auto/suncalc.js',
 ];
 
-gulp.task('compress_js_vendor', () => gulp.src(jsVendorSources)
+const compressJsVendor = () => src(jsVendorSources)
 	.pipe(concat('vendor.min.js'))
 	.pipe(terser())
-	.pipe(gulp.dest(RESOURCES_PATH)));
+	.pipe(dest(RESOURCES_PATH));
 
 const mjsSources = [
 	'server/scripts/modules/currentweatherscroll.mjs',
@@ -88,39 +90,40 @@ const mjsSources = [
 	'server/scripts/index.mjs',
 ];
 
-gulp.task('build_js', () => gulp.src(mjsSources)
+const buildJs = () => src(mjsSources)
 	.pipe(webpack(webpackOptions))
-	.pipe(gulp.dest(RESOURCES_PATH)));
+	.pipe(dest(RESOURCES_PATH));
 
 const cssSources = [
 	'server/styles/main.css',
 ];
-gulp.task('copy_css', () => gulp.src(cssSources)
+const copyCss = () => src(cssSources)
 	.pipe(concat('ws.min.css'))
-	.pipe(gulp.dest(RESOURCES_PATH)));
+	.pipe(dest(RESOURCES_PATH));
 
 const htmlSources = [
 	'views/*.ejs',
 ];
-gulp.task('compress_html', () => {
+const compressHtml = async () => {
-	// eslint-disable-next-line global-require
+	const packageJson = await readFile('package.json');
-	const { version } = require('../package.json');
+	const { version } = JSON.parse(packageJson);
-	return gulp.src(htmlSources)
+
+	return src(htmlSources)
 		.pipe(ejs({
 			production: version,
 			version,
 		}))
 		.pipe(rename({ extname: '.html' }))
 		.pipe(htmlmin({ collapseWhitespace: true }))
-		.pipe(gulp.dest('./dist'));
+		.pipe(dest('./dist'));
-});
+};
 
 const otherFiles = [
 	'server/robots.txt',
 	'server/manifest.json',
 ];
-gulp.task('copy_other_files', () => gulp.src(otherFiles, { base: 'server/' })
+const copyOtherFiles = () => src(otherFiles, { base: 'server/' })
-	.pipe(gulp.dest('./dist')));
+	.pipe(dest('./dist'));
 
 const s3 = s3Upload({
 	useIAM: true,
@@ -131,7 +134,7 @@ const uploadSources = [
 	'dist/**',
 	'!dist/**/*.map',
 ];
-gulp.task('upload', () => gulp.src(uploadSources, { base: './dist' })
+const upload = () => src(uploadSources, { base: './dist' })
 	.pipe(s3({
 		Bucket: 'weatherstar',
 		StorageClass: 'STANDARD',
@@ -141,21 +144,21 @@ gulp.task('upload', () => gulp.src(uploadSources, { base: './dist' })
 				return 'max-age=2592000'; // 1 month
 			},
 		},
-	})));
+	}));
 
 const imageSources = [
 	'server/fonts/**',
 	'server/images/**',
 ];
-gulp.task('upload_images', () => gulp.src(imageSources, { base: './server', encoding: false })
+const uploadImages = () => src(imageSources, { base: './server', encoding: false })
 	.pipe(
 		s3({
 			Bucket: 'weatherstar',
 			StorageClass: 'STANDARD',
 		}),
-	));
+	);
 
-gulp.task('invalidate', async () => cloudfront.send(new CreateInvalidationCommand({
+const invalidate = () => cloudfront.send(new CreateInvalidationCommand({
 	DistributionId: 'E9171A4KV8KCW',
 	InvalidationBatch: {
 		CallerReference: (new Date()).toLocaleString(),
@@ -164,10 +167,12 @@ gulp.task('invalidate', async () => cloudfront.send(new CreateInvalidationComman
 			Items: ['/*'],
 		},
 	},
-}).promise()));
+}));
 
-gulp.task('build-dist', gulp.series(clean, gulp.parallel('build_js', 'compress_js_data', 'compress_js_vendor', 'copy_css', 'compress_html', 'copy_other_files')));
+const buildDist = series(clean, parallel(buildJs, compressJsData, compressJsVendor, copyCss, compressHtml, copyOtherFiles));
 
 // upload_images could be in parallel with upload, but _images logs a lot and has little changes
 // by running upload last the majority of the changes will be at the bottom of the log for easy viewing
-module.exports = gulp.series('build-dist', 'upload_images', 'upload', 'invalidate');
+const publishFrontend = series(buildDist, uploadImages,	upload,	invalidate);
+
+export default publishFrontend;

gulp/update-vendor.mjs

@@ -1,12 +1,9 @@
 /* eslint-disable import/no-extraneous-dependencies */
-const gulp = require('gulp');
+import { src, series, dest } from 'gulp';
-const del = require('del');
+import { deleteAsync } from 'del';
-const rename = require('gulp-rename');
+import rename from 'gulp-rename';
 
-const clean = (cb) => {
+const clean = () => deleteAsync(['./server/scripts/vendor/auto/**']);
-	del(['./server/scripts/vendor/auto/**']);
-	cb();
-};
 
 const vendorFiles = [
 	'./node_modules/luxon/build/es6/luxon.js',
@@ -17,13 +14,15 @@ const vendorFiles = [
 	'./node_modules/swiped-events/src/swiped-events.js',
 ];
 
-const copy = () => gulp.src(vendorFiles)
+const copy = () => src(vendorFiles)
 	.pipe(rename((path) => {
 		path.dirname = path.dirname.toLowerCase();
 		path.basename = path.basename.toLowerCase();
 		path.extname = path.extname.toLowerCase();
 		if (path.basename === 'luxon') path.extname = '.mjs';
 	}))
-	.pipe(gulp.dest('./server/scripts/vendor/auto'));
+	.pipe(dest('./server/scripts/vendor/auto'));
 
-module.exports = gulp.series(clean, copy);
+const updateVendor = series(clean, copy);
+
+export default updateVendor;

gulpfile.js

@@ -1,4 +0,0 @@
-const gulp = require('gulp');
-
-gulp.task('update-vendor', require('./gulp/update-vendor'));
-gulp.task('publish-frontend', require('./gulp/publish-frontend'));

gulpfile.mjs

@@ -0,0 +1,7 @@
+import updateVendor from './gulp/update-vendor.mjs';
+import publishFrontend from './gulp/publish-frontend.mjs';
+
+export {
+	updateVendor,
+	publishFrontend,
+};

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "ws4kp",
-	"version": "5.11.6",
+	"version": "5.11.7",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "ws4kp",
-			"version": "5.11.6",
+			"version": "5.11.7",
 			"license": "MIT",
 			"dependencies": {
 				"@aws-sdk/client-cloudfront": "^3.609.0",
@@ -14,7 +14,7 @@
 				"gulp-s3-upload": "^1.7.3"
 			},
 			"devDependencies": {
-				"del": "^6.0.0",
+				"del": "^7.1.0",
 				"ejs": "^3.1.5",
 				"eslint": "^8.2.0",
 				"eslint-config-airbnb-base": "^15.0.0",
@@ -1633,19 +1633,6 @@
 				"node": ">=16.0.0"
 			}
 		},
-		"node_modules/@smithy/middleware-retry/node_modules/uuid": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-			"funding": [
-				"https://github.com/sponsors/broofa",
-				"https://github.com/sponsors/ctavan"
-			],
-			"license": "MIT",
-			"bin": {
-				"uuid": "dist/bin/uuid"
-			}
-		},
 		"node_modules/@smithy/middleware-serde": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz",
@@ -2367,17 +2354,33 @@
 			}
 		},
 		"node_modules/aggregate-error": {
-			"version": "3.1.0",
+			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz",
-			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+			"integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"clean-stack": "^2.0.0",
+				"clean-stack": "^4.0.0",
-				"indent-string": "^4.0.0"
+				"indent-string": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/aggregate-error/node_modules/indent-string": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
+			"integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/ajv": {
@@ -2567,16 +2570,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/array-union": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/array.prototype.findlastindex": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
@@ -2740,6 +2733,15 @@
 				"node": ">= 10.0.0"
 			}
 		},
+		"node_modules/aws-sdk/node_modules/uuid": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+			"integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+			"license": "MIT",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
 		"node_modules/b4a": {
 			"version": "1.6.6",
 			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz",
@@ -3207,13 +3209,32 @@
 			}
 		},
 		"node_modules/clean-stack": {
-			"version": "2.2.0",
+			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz",
-			"integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+			"integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"escape-string-regexp": "5.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/clean-stack/node_modules/escape-string-regexp": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+			"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": ">=6"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/cliui": {
@@ -3537,23 +3558,23 @@
 			}
 		},
 		"node_modules/del": {
-			"version": "6.1.1",
+			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/del/-/del-7.1.0.tgz",
-			"integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+			"integrity": "sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"globby": "^11.0.1",
+				"globby": "^13.1.2",
-				"graceful-fs": "^4.2.4",
+				"graceful-fs": "^4.2.10",
-				"is-glob": "^4.0.1",
+				"is-glob": "^4.0.3",
-				"is-path-cwd": "^2.2.0",
+				"is-path-cwd": "^3.0.0",
-				"is-path-inside": "^3.0.2",
+				"is-path-inside": "^4.0.0",
-				"p-map": "^4.0.0",
+				"p-map": "^5.5.0",
 				"rimraf": "^3.0.2",
-				"slash": "^3.0.0"
+				"slash": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=14.16"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -4193,6 +4214,16 @@
 				"url": "https://opencollective.com/eslint"
 			}
 		},
+		"node_modules/eslint/node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/espree": {
 			"version": "9.6.1",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@@ -4385,18 +4416,15 @@
 			}
 		},
 		"node_modules/fancy-log": {
-			"version": "1.3.3",
+			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
-			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+			"integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
 			"license": "MIT",
 			"dependencies": {
-				"ansi-gray": "^0.1.1",
+				"color-support": "^1.1.3"
-				"color-support": "^1.1.3",
-				"parse-node-version": "^1.0.0",
-				"time-stamp": "^1.0.0"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/fast-deep-equal": {
@@ -5010,21 +5038,20 @@
 			}
 		},
 		"node_modules/globby": {
-			"version": "11.1.0",
+			"version": "13.2.2",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+			"integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"array-union": "^2.1.0",
 				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
+				"fast-glob": "^3.3.0",
-				"ignore": "^5.2.0",
+				"ignore": "^5.2.4",
 				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
+				"slash": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -5106,58 +5133,6 @@
 				"node": ">=14"
 			}
 		},
-		"node_modules/gulp-awspublish/node_modules/fancy-log": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
-			"integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
-			"license": "MIT",
-			"dependencies": {
-				"color-support": "^1.1.3"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/gulp-awspublish/node_modules/plugin-error": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
-			"integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
-			"license": "MIT",
-			"dependencies": {
-				"ansi-colors": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
-		"node_modules/gulp-awspublish/node_modules/plugin-error/node_modules/ansi-colors": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-			"license": "MIT",
-			"dependencies": {
-				"ansi-wrap": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/gulp-awspublish/node_modules/vinyl": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-			"integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-			"license": "MIT",
-			"dependencies": {
-				"clone": "^2.1.2",
-				"clone-stats": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0",
-				"replace-ext": "^2.0.0",
-				"teex": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
 		"node_modules/gulp-cli": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz",
@@ -5200,6 +5175,34 @@
 				"node": ">= 0.10"
 			}
 		},
+		"node_modules/gulp-concat/node_modules/replace-ext": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+			"integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/gulp-concat/node_modules/vinyl": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+			"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"clone": "^2.1.1",
+				"clone-buffer": "^1.0.0",
+				"clone-stats": "^1.0.0",
+				"cloneable-readable": "^1.0.0",
+				"remove-trailing-separator": "^1.0.1",
+				"replace-ext": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/gulp-ejs": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/gulp-ejs/-/gulp-ejs-5.1.0.tgz",
@@ -5215,6 +5218,35 @@
 				"npm": ">= 3"
 			}
 		},
+		"node_modules/gulp-ejs/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gulp-ejs/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/gulp-ejs/node_modules/through2": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
@@ -5241,6 +5273,35 @@
 				"node": ">= 6.0"
 			}
 		},
+		"node_modules/gulp-htmlmin/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gulp-htmlmin/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/gulp-rename": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
@@ -5277,6 +5338,48 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/gulp-s3-upload/node_modules/fancy-log": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+			"license": "MIT",
+			"dependencies": {
+				"ansi-gray": "^0.1.1",
+				"color-support": "^1.1.3",
+				"parse-node-version": "^1.0.0",
+				"time-stamp": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/gulp-s3-upload/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/gulp-s3-upload/node_modules/plugin-error/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/gulp-sass": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-5.1.0.tgz",
@@ -5295,6 +5398,35 @@
 				"node": ">=12"
 			}
 		},
+		"node_modules/gulp-sass/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gulp-sass/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/gulp-terser": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
@@ -5311,6 +5443,35 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/gulp-terser/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/gulp-terser/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/gulp-terser/node_modules/readable-stream": {
 			"version": "3.6.2",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -5963,23 +6124,29 @@
 			}
 		},
 		"node_modules/is-path-cwd": {
-			"version": "2.2.0",
+			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz",
-			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+			"integrity": "sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": ">=6"
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/is-path-inside": {
-			"version": "3.0.3",
+			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz",
-			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/is-plain-object": {
@@ -6932,16 +7099,16 @@
 			}
 		},
 		"node_modules/p-map": {
-			"version": "4.0.0",
+			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz",
-			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+			"integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"aggregate-error": "^3.0.0"
+				"aggregate-error": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=12"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/sindresorhus"
@@ -7182,18 +7349,15 @@
 			}
 		},
 		"node_modules/plugin-error": {
-			"version": "1.0.1",
+			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
-			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
 			"license": "MIT",
 			"dependencies": {
-				"ansi-colors": "^1.0.1",
+				"ansi-colors": "^1.0.1"
-				"arr-diff": "^4.0.0",
-				"arr-union": "^3.1.0",
-				"extend-shallow": "^3.0.2"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/plugin-error/node_modules/ansi-colors": {
@@ -8021,13 +8185,16 @@
 			}
 		},
 		"node_modules/slash": {
-			"version": "3.0.0",
+			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+			"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/source-map": {
@@ -8856,9 +9023,13 @@
 			}
 		},
 		"node_modules/uuid": {
-			"version": "8.0.0",
+			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-			"integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
+			"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+			"funding": [
+				"https://github.com/sponsors/broofa",
+				"https://github.com/sponsors/ctavan"
+			],
 			"license": "MIT",
 			"bin": {
 				"uuid": "dist/bin/uuid"
@@ -8906,21 +9077,19 @@
 			}
 		},
 		"node_modules/vinyl": {
-			"version": "2.2.1",
+			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-			"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+			"integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"clone": "^2.1.1",
+				"clone": "^2.1.2",
-				"clone-buffer": "^1.0.0",
 				"clone-stats": "^1.0.0",
-				"cloneable-readable": "^1.0.0",
+				"remove-trailing-separator": "^1.1.0",
-				"remove-trailing-separator": "^1.0.1",
+				"replace-ext": "^2.0.0",
-				"replace-ext": "^1.0.0"
+				"teex": "^1.0.1"
 			},
 			"engines": {
-				"node": ">= 0.10"
+				"node": ">=10.13.0"
 			}
 		},
 		"node_modules/vinyl-contents": {
@@ -8937,23 +9106,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/vinyl-contents/node_modules/vinyl": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-			"integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"clone": "^2.1.2",
-				"clone-stats": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0",
-				"replace-ext": "^2.0.0",
-				"teex": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
 		"node_modules/vinyl-fs": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
@@ -8993,23 +9145,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/vinyl-fs/node_modules/vinyl": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-			"integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"clone": "^2.1.2",
-				"clone-stats": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0",
-				"replace-ext": "^2.0.0",
-				"teex": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
 		"node_modules/vinyl-sourcemap": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
@@ -9028,23 +9163,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/vinyl-sourcemap/node_modules/vinyl": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-			"integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"clone": "^2.1.2",
-				"clone-stats": "^1.0.0",
-				"remove-trailing-separator": "^1.1.0",
-				"replace-ext": "^2.0.0",
-				"teex": "^1.0.1"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			}
-		},
 		"node_modules/vinyl-sourcemaps-apply": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
@@ -9065,16 +9183,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/vinyl/node_modules/replace-ext": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-			"integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.10"
-			}
-		},
 		"node_modules/watchpack": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
@@ -9173,6 +9281,61 @@
 				"webpack": "^5.21.2"
 			}
 		},
+		"node_modules/webpack-stream/node_modules/ansi-colors": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+			"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-wrap": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/webpack-stream/node_modules/fancy-log": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+			"integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-gray": "^0.1.1",
+				"color-support": "^1.1.3",
+				"parse-node-version": "^1.0.0",
+				"time-stamp": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/webpack-stream/node_modules/plugin-error": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+			"integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ansi-colors": "^1.0.1",
+				"arr-diff": "^4.0.0",
+				"arr-union": "^3.1.0",
+				"extend-shallow": "^3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/webpack-stream/node_modules/replace-ext": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+			"integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/webpack-stream/node_modules/supports-color": {
 			"version": "8.1.1",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -9189,6 +9352,24 @@
 				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
+		"node_modules/webpack-stream/node_modules/vinyl": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+			"integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"clone": "^2.1.1",
+				"clone-buffer": "^1.0.0",
+				"clone-stats": "^1.0.0",
+				"cloneable-readable": "^1.0.0",
+				"remove-trailing-separator": "^1.0.1",
+				"replace-ext": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
 		"node_modules/webpack/node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ws4kp",
-	"version": "5.11.6",
+	"version": "5.11.7",
 	"description": "Welcome to the WeatherStar 4000+ project page!",
 	"main": "index.js",
 	"scripts": {
@@ -20,7 +20,7 @@
 	},
 	"homepage": "https://github.com/netbymatt/ws4kp#readme",
 	"devDependencies": {
-		"del": "^6.0.0",
+		"del": "^7.1.0",
 		"ejs": "^3.1.5",
 		"eslint": "^8.2.0",
 		"eslint-config-airbnb-base": "^15.0.0",

server/scripts/index.mjs

@@ -228,6 +228,7 @@ const exitFullScreenVisibilityChanges = () => {
 	const img = document.querySelector(TOGGLE_FULL_SCREEN_SELECTOR);
 	img.src = 'images/nav/ic_fullscreen_white_24dp_2x.png';
 	img.title = 'Enter fullscreen';
+	document.querySelector('#divTwc').classList.remove('no-cursor');
 	const divTwcBottom = document.querySelector('#divTwcBottom');
 	divTwcBottom.classList.remove('hidden');
 	divTwcBottom.classList.add('visible');
@@ -290,6 +291,7 @@ const updateFullScreenNavigate = () => {
 	const divTwcBottom = document.querySelector('#divTwcBottom');
 	divTwcBottom.classList.remove('hidden');
 	divTwcBottom.classList.add('visible');
+	document.querySelector('#divTwc').classList.remove('no-cursor');
 
 	if (navigateFadeIntervalId) {
 		clearTimeout(navigateFadeIntervalId);
@@ -300,6 +302,7 @@ const updateFullScreenNavigate = () => {
 		if (document.fullscreenElement) {
 			divTwcBottom.classList.remove('visible');
 			divTwcBottom.classList.add('hidden');
+			document.querySelector('#divTwc').classList.add('no-cursor');
 		}
 	}, 2000);
 };

server/styles/scss/_page.scss

@@ -412,6 +412,10 @@ body {
 	align-items: center;
 	justify-content: center;
 	align-content: center;
+
+	&.no-cursor {
+		cursor: none;
+	}
 }
 
 .kiosk #divTwc {