diff --git a/README.md b/README.md index 598aa922..f4b1cfb0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/jakejarvis/jarv.is/CI/main?label=build&logo=github&logoColor=white)](https://github.com/jakejarvis/jarv.is/actions?query=workflow%3ACI+branch%3Amain) [![Vercel deployment](https://img.shields.io/github/deployments/jakejarvis/jarv.is/production?label=vercel&logo=vercel&logoColor=white)](https://vercel.com/deployments/jarv.is) -[![Hugo v0.84.1](https://img.shields.io/badge/hugo-0.84.1-ff4088?logo=hugo&logoColor=white)](https://github.com/gohugoio/hugo) +[![Hugo v0.84.2](https://img.shields.io/badge/hugo-0.84.2-ff4088?logo=hugo&logoColor=white)](https://github.com/gohugoio/hugo) [![Licensed under CC-BY-4.0](https://img.shields.io/badge/license-CC--BY--4.0-fb7828?logo=creative-commons&logoColor=white)](LICENSE.md) [![GitHub repo size](https://img.shields.io/github/repo-size/jakejarvis/jarv.is?color=009cdf&label=repo%20size&logo=git&logoColor=white)](https://github.com/jakejarvis/jarv.is) [![Tor mirror status](https://img.shields.io/uptimerobot/status/m788172098-a4fcb769c8779f9a37a60775?color=7e4798&label=tor%20mirror&logo=tor-project&logoColor=white)](http://jarvis2i2vp4j4tbxjogsnqdemnte5xhzyi7hziiyzxwge3hzmh57zad.onion/) diff --git a/gulpfile.js b/gulpfile.js index 9142039e..9afe8fc0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,12 +4,6 @@ const htmlmin = require("gulp-html-minifier-terser"); const imagemin = require("gulp-imagemin"); const del = require("del"); -// use up-to-date imagemin plugins instead of those bundled with gulp-imagemin: -const imageminMozjpeg = require("imagemin-mozjpeg"); -const imageminPngquant = require("imagemin-pngquant"); -const imageminGifsicle = require("imagemin-gifsicle"); -const imageminSvgo = require("imagemin-svgo"); - exports.default = gulp.series( clean, npx("webpack", ["--mode", "production", "--profile"]), @@ -48,20 +42,21 @@ function optimizeHtml() { function optimizeImages() { return gulp - .src(["public/**/*.{gif,jpg,png,svg}", "!public/assets/emoji/*"], { base: "./" }) + .src(["public/**/*.{gif,jpg,jpeg,png,svg}", "!public/assets/emoji/*"], { base: "./" }) .pipe( imagemin([ - imageminMozjpeg({ + // use up-to-date imagemin plugins instead of those bundled with gulp-imagemin: + require("imagemin-mozjpeg")({ quality: 85, progressive: true, }), - imageminPngquant({ + require("imagemin-pngquant")({ quality: [0.7, 0.9], speed: 1, strip: true, }), - imageminGifsicle(), - imageminSvgo(), + require("imagemin-gifsicle")(), + require("imagemin-svgo")(), ], { verbose: true, diff --git a/package.json b/package.json index 5b4a2715..1721682c 100755 --- a/package.json +++ b/package.json @@ -30,8 +30,8 @@ "@fontsource/comic-neue": "4.4.5", "@fontsource/inter": "4.4.5", "@fontsource/roboto-mono": "4.4.5", - "@sentry/node": "^6.7.2", - "@sentry/tracing": "^6.7.2", + "@sentry/node": "^6.8.0", + "@sentry/tracing": "^6.8.0", "dotenv": "^10.0.0", "faunadb": "^4.3.0", "graphql": "^15.5.1", @@ -80,7 +80,7 @@ "gulp-execa": "^2.0.0", "gulp-html-minifier-terser": "^6.0.1", "gulp-imagemin": "^7.1.0", - "hugo-extended": "0.84.1", + "hugo-extended": "0.84.2", "lint-staged": "^11.0.0", "markdownlint-cli": "~0.27.1", "mini-css-extract-plugin": "^1.6.1", @@ -98,13 +98,14 @@ "prettier": "^2.3.2", "sass": "^1.35.1", "sass-loader": "^12.1.0", - "simple-git-hooks": "^2.4.1", + "simple-git-hooks": "^2.5.1", "stylelint": "~13.13.1", "stylelint-config-prettier": "~8.0.2", "stylelint-config-sass-guidelines": "~8.0.0", "stylelint-no-unsupported-browser-features": "~5.0.1", "stylelint-prettier": "~1.2.0", "stylelint-scss": "~3.19.0", + "terser": "^5.7.1", "terser-webpack-plugin": "^5.1.4", "typescript": "^4.3.4", "webpack": "^5.40.0", diff --git a/webpack.config.js b/webpack.config.js index b27e1186..493efb34 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ module.exports = { path.resolve(__dirname, "assets/sass/main.scss"), ], mode: isProd ? "production" : "development", - devtool: isProd ? "nosources-source-map" : "source-map", + devtool: isProd ? "hidden-nosources-source-map" : "source-map", output: { filename: isProd ? "js/[name]-[contenthash:6].js" : "js/[name].js", path: path.resolve(__dirname, "static/assets/"), diff --git a/yarn.lock b/yarn.lock index 65b91400..f98a6b91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -980,72 +980,72 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@sentry/core@6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.7.2.tgz#1d294fac6e62744bce3b9dfbcd90b14e93620480" - integrity sha512-NTZqwN5nR94yrXmSfekoPs1mIFuKvf8esdIW/DadwSKWAdLJwQTJY9xK/8PQv+SEzd7wiitPAx+mCw2By1xiNQ== +"@sentry/core@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.8.0.tgz#bfac76844deee9126460c18dc6166015992efdc3" + integrity sha512-vJzWt/znEB+JqVwtwfjkRrAYRN+ep+l070Ti8GhJnvwU4IDtVlV3T/jVNrj6rl6UChcczaJQMxVxtG5x0crlAA== dependencies: - "@sentry/hub" "6.7.2" - "@sentry/minimal" "6.7.2" - "@sentry/types" "6.7.2" - "@sentry/utils" "6.7.2" + "@sentry/hub" "6.8.0" + "@sentry/minimal" "6.8.0" + "@sentry/types" "6.8.0" + "@sentry/utils" "6.8.0" tslib "^1.9.3" -"@sentry/hub@6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.7.2.tgz#31b250e74aa303877620dfa500aa89e4411e2dec" - integrity sha512-05qVW6ymChJsXag4+fYCQokW3AcABIgcqrVYZUBf6GMU/Gbz5SJqpV7y1+njwWvnPZydMncP9LaDVpMKbE7UYQ== +"@sentry/hub@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.8.0.tgz#cb0f8509093919ed3c1ef98ef8cf63dc102a6524" + integrity sha512-hFrI2Ss1fTov7CH64FJpigqRxH7YvSnGeqxT9Jc1BL7nzW/vgCK+Oh2mOZbosTcrzoDv+lE8ViOnSN3w/fo+rg== dependencies: - "@sentry/types" "6.7.2" - "@sentry/utils" "6.7.2" + "@sentry/types" "6.8.0" + "@sentry/utils" "6.8.0" tslib "^1.9.3" -"@sentry/minimal@6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.7.2.tgz#9e6c0c587daea64a9042041694a4ad5d559d16cd" - integrity sha512-jkpwFv2GFHoVl5vnK+9/Q+Ea8eVdbJ3hn3/Dqq9MOLFnVK7ED6MhdHKLT79puGSFj+85OuhM5m2Q44mIhyS5mw== +"@sentry/minimal@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.8.0.tgz#d6c3e4c96f231367aeb2b8a87a83b53d28e7c6db" + integrity sha512-MRxUKXiiYwKjp8mOQMpTpEuIby1Jh3zRTU0cmGZtfsZ38BC1JOle8xlwC4FdtOH+VvjSYnPBMya5lgNHNPUJDQ== dependencies: - "@sentry/hub" "6.7.2" - "@sentry/types" "6.7.2" + "@sentry/hub" "6.8.0" + "@sentry/types" "6.8.0" tslib "^1.9.3" -"@sentry/node@^6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.7.2.tgz#ef2b865af2c37d83966db7fbd031179aa8c82cc0" - integrity sha512-vfNTmxBbHthAKPDBo0gVk/aNHdgUfXLzmaK7FgWO7cISiI2soCfvKEIP61XqIFZru06teqcRuDsYlR4wSeyWpg== +"@sentry/node@^6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.8.0.tgz#d39b45c2b9d33c0cf8859da70d08e25ae58c7dbc" + integrity sha512-DPUtDd1rRbDJys+aZdQTScKy2Xxo4m8iSQPxzfwFROsLmzE7XhDoriDwM+l1BpiZYIhxUU2TLxDyVzmdc/TMAw== dependencies: - "@sentry/core" "6.7.2" - "@sentry/hub" "6.7.2" - "@sentry/tracing" "6.7.2" - "@sentry/types" "6.7.2" - "@sentry/utils" "6.7.2" + "@sentry/core" "6.8.0" + "@sentry/hub" "6.8.0" + "@sentry/tracing" "6.8.0" + "@sentry/types" "6.8.0" + "@sentry/utils" "6.8.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/tracing@6.7.2", "@sentry/tracing@^6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.7.2.tgz#78a6934837143ae5e200b49bd256bc8a917477bc" - integrity sha512-juKlI7FICKONWJFJxDxerj0A+8mNRhmtrdR+OXFqOkqSAy/QXlSFZcA/j//O19k2CfwK1BrvoMcQ/4gnffUOVg== +"@sentry/tracing@6.8.0", "@sentry/tracing@^6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.8.0.tgz#5baa4f2e66cd2e6851c213213017850f67e65f4b" + integrity sha512-3gDkQnmOuOjHz5rY7BOatLEUksANU3efR8wuBa2ujsPQvoLSLFuyZpRjPPsxuUHQOqAYIbSNAoDloXECvQeHjw== dependencies: - "@sentry/hub" "6.7.2" - "@sentry/minimal" "6.7.2" - "@sentry/types" "6.7.2" - "@sentry/utils" "6.7.2" + "@sentry/hub" "6.8.0" + "@sentry/minimal" "6.8.0" + "@sentry/types" "6.8.0" + "@sentry/utils" "6.8.0" tslib "^1.9.3" -"@sentry/types@6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.7.2.tgz#8108272c98ad7784ddf9ddda0b7bdc6880ed6e50" - integrity sha512-h21Go/PfstUN+ZV6SbwRSZVg9GXRJWdLfHoO5PSVb3TVEMckuxk8tAE57/u+UZDwX8wu+Xyon2TgsKpiWKxqUg== +"@sentry/types@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.8.0.tgz#97fd531a0ed1e75e65b4a24b26509fb7c15eb7b8" + integrity sha512-PbSxqlh6Fd5thNU5f8EVYBVvX+G7XdPA+ThNb2QvSK8yv3rIf0McHTyF6sIebgJ38OYN7ZFK7vvhC/RgSAfYTA== -"@sentry/utils@6.7.2": - version "6.7.2" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.7.2.tgz#c7f957ebe16de3e701a0c5477ac2dba04e7b4b68" - integrity sha512-9COL7aaBbe61Hp5BlArtXZ1o/cxli1NGONLPrVT4fMyeQFmLonhUiy77NdsW19XnvhvaA+2IoV5dg3dnFiF/og== +"@sentry/utils@6.8.0": + version "6.8.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.8.0.tgz#0ffafa5b69fe0cdeabad5c4a6cc68a426eaa6b37" + integrity sha512-OYlI2JNrcWKMdvYbWNdQwR4QBVv2V0y5wK0U6f53nArv6RsyO5TzwRu5rMVSIZofUUqjoE5hl27jqnR+vpUrsA== dependencies: - "@sentry/types" "6.7.2" + "@sentry/types" "6.8.0" tslib "^1.9.3" "@sindresorhus/is@^0.7.0": @@ -4171,16 +4171,15 @@ fast-diff@^1.1.2: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + version "3.2.6" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz#434dd9529845176ea049acc9343e8282765c6e1a" + integrity sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -4686,7 +4685,7 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -5283,10 +5282,10 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -hugo-extended@0.84.1: - version "0.84.1" - resolved "https://registry.yarnpkg.com/hugo-extended/-/hugo-extended-0.84.1.tgz#8a1d26099dedd165c8278e191e85b8f4233301f8" - integrity sha512-hFrzONF80b73JyNQiZ9Y6tSe9pzd7PY59FdKcFLUCgN2xltliCCJmlL5sjVJwlwFeI1VOSHLvbuRBhtdNpGtFw== +hugo-extended@0.84.2: + version "0.84.2" + resolved "https://registry.yarnpkg.com/hugo-extended/-/hugo-extended-0.84.2.tgz#202c91c6cf1a054895a8db0c3c1c9262ddcbfb4f" + integrity sha512-M6yS5kHs9m2fCQpVrVEKx2yvdg28YyjjramvonNeCYHwKu3/11AUZvHCQDNUQjx//0UmZfkKVU1A24p8l4flJQ== dependencies: chalk "^4.1.1" decompress "^4.2.1" @@ -6850,7 +6849,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -9202,10 +9201,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== -simple-git-hooks@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/simple-git-hooks/-/simple-git-hooks-2.4.1.tgz#bb3495610701394d00ce4a84892a9ca8aad73710" - integrity sha512-LFdiF7O0Hg96vS1mO8gtBiDXLkCrLhqpU7O3gMZVO90Uf+/VFY4C5VJITyXPbHNX6OnlFmiFR0YnV4XbfguZHA== +simple-git-hooks@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/simple-git-hooks/-/simple-git-hooks-2.5.1.tgz#78ed9cfa552843bc45cd36ad5b7424567119c2f4" + integrity sha512-iI/MEEVObv45slsxz+BT+5NCS2UDgVIqfQKmNjL4/XnEfacpdYAHd71Imc5Nw/FY100A+i1PIXdIdkLHYcC2Bg== slash@^2.0.0: version "2.0.0" @@ -9919,10 +9918,10 @@ terser@^4.6.3: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" - integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== +terser@^5.7.0, terser@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" + integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== dependencies: commander "^2.20.0" source-map "~0.7.2"