Merge branch 'master' into a11y-updates-v3

middlebury · Aug 19, 2024 · 52143cf · 52143cf
2 parents 25c6880 + 80acac9
commit 52143cf
Show file tree

Hide file tree

Showing 74 changed files with 2,734 additions and 5,646 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,5 +2,5 @@
   "singleQuote": true,
   "trailingComma": "none",
   "arrowParens": "always",
-  "plugins": ["./node_modules/prettier-plugin-twig-melody"]
+  "plugins": ["./node_modules/prettier-plugin-twig-melody/src/index.js"]
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -29,7 +29,7 @@ import dotenv from 'dotenv';
 import svgSprite from 'gulp-svg-sprite';
 import gulpSvgo from 'gulp-svgo';
 import dom from 'gulp-dom';
-import gulpStylelint from 'gulp-stylelint';
+import gulpStylelint from '@ronilaukkarinen/gulp-stylelint';
 import webpack from 'webpack-stream';
 import config from './webpack.config.js';
 
@@ -236,7 +236,7 @@ const html = () =>
 
 const images = () =>
   gulp
-    .src(paths.images.src)
+    .src(paths.images.src, { encoding: false })
     .pipe(
       imagemin([
         mozjpeg({ progressive: true }),