Merge branch 'master'

docs/_data/supporters.js

@@ -17,7 +17,6 @@
 
 'use strict';
 
-const {loadImage} = require('canvas');
 const {writeFile, mkdir, rm} = require('fs').promises;
 const {resolve} = require('path');
 const debug = require('debug')('mocha:docs:data:supporters');
@@ -115,13 +114,6 @@ const fetchImage = process.env.MOCHA_DOCS_SKIP_IMAGE_DOWNLOAD
           );
         }
         debug('fetched %s', url);
-        const canvasImage = await loadImage(imageBuf);
-        debug('ok %s', url);
-        supporter.dimensions = {
-          width: canvasImage.width,
-          height: canvasImage.height
-        };
-        // debug('dimensions %s %dw %dh', url, canvasImage.width, canvasImage.height);
         const filePath = resolve(SUPPORTER_IMAGE_PATH, supporter.id + '.png');
         await writeFile(filePath, imageBuf);
         debug('wrote %s', filePath);

docs/_includes/default.liquid

@@ -130,7 +130,7 @@
         </ul>
         <div class="netlify-badge">
           <a href="https://www.netlify.com">
-            <img src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg" loading="lazy">
+            <img src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg" alt="Built with Netlify (Netlify logo)" loading="lazy">
           </a>
         </div>
       </div>

docs/_includes/supporters.md

@@ -8,7 +8,7 @@ Use Mocha at Work? Ask your manager or marketing team if they'd help [support](h
     {%- if supporter.website -%}
     <a href="{{ supporter.website }}" target="_blank" rel="noopener">
     {%- endif -%}
-      <div class="sponsor" title="{{ supporter.name }}" style="width: {{ supporter.dimensions.width }}px; background-image: url(/images/supporters/{{ supporter.id }}.png?sprite=sponsors)"></div>
+      <div class="sponsor" title="{{ supporter.name }}" style="background-image: url(/images/supporters/{{ supporter.id }}.png?sprite=sponsors)"></div>
     {%- if supporter.website -%}
     </a>
     {%- endif -%}

docs/css/supporters.css

@@ -9,6 +9,9 @@
   -sprite-location: url(/images/sprite-backers.png?pngquant);
   -sprite-image-format: png;
   -sprite-padding: 0 10;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: contain;
   width: 32px;
   height: 32px;
 }

lib/reporters/nyan.js

@@ -66,7 +66,7 @@ function NyanCat(runner, options) {
   runner.once(EVENT_RUN_END, function () {
     Base.cursor.show();
     for (var i = 0; i < self.numberOfLines; i++) {
-      write('\n');
+      process.stdout.write('\n');
     }
     self.epilogue();
   });
@@ -102,15 +102,15 @@ NyanCat.prototype.drawScoreboard = function () {
   var stats = this.stats;
 
   function draw(type, n) {
-    write(' ');
-    write(Base.color(type, n));
-    write('\n');
+    process.stdout.write(' ');
+    process.stdout.write(Base.color(type, n));
+    process.stdout.write('\n');
   }
 
   draw('green', stats.passes);
   draw('fail', stats.failures);
   draw('pending', stats.pending);
-  write('\n');
+  process.stdout.write('\n');
 
   this.cursorUp(this.numberOfLines);
 };
@@ -144,9 +144,9 @@ NyanCat.prototype.drawRainbow = function () {
   var self = this;
 
   this.trajectories.forEach(function (line) {
-    write('\u001b[' + self.scoreboardWidth + 'C');
-    write(line.join(''));
-    write('\n');
+    process.stdout.write('\u001b[' + self.scoreboardWidth + 'C');
+    process.stdout.write(line.join(''));
+    process.stdout.write('\n');
   });
 
   this.cursorUp(this.numberOfLines);
@@ -163,25 +163,25 @@ NyanCat.prototype.drawNyanCat = function () {
   var dist = '\u001b[' + startWidth + 'C';
   var padding = '';
 
-  write(dist);
-  write('_,------,');
-  write('\n');
+  process.stdout.write(dist);
+  process.stdout.write('_,------,');
+  process.stdout.write('\n');
 
-  write(dist);
+  process.stdout.write(dist);
   padding = self.tick ? '  ' : '   ';
-  write('_|' + padding + '/\\_/\\ ');
-  write('\n');
+  process.stdout.write('_|' + padding + '/\\_/\\ ');
+  process.stdout.write('\n');
 
-  write(dist);
+  process.stdout.write(dist);
   padding = self.tick ? '_' : '__';
   var tail = self.tick ? '~' : '^';
-  write(tail + '|' + padding + this.face() + ' ');
-  write('\n');
+  process.stdout.write(tail + '|' + padding + this.face() + ' ');
+  process.stdout.write('\n');
 
-  write(dist);
+  process.stdout.write(dist);
   padding = self.tick ? ' ' : '  ';
-  write(padding + '""  "" ');
-  write('\n');
+  process.stdout.write(padding + '""  "" ');
+  process.stdout.write('\n');
 
   this.cursorUp(this.numberOfLines);
 };
@@ -213,7 +213,7 @@ NyanCat.prototype.face = function () {
  */
 
 NyanCat.prototype.cursorUp = function (n) {
-  write('\u001b[' + n + 'A');
+  process.stdout.write('\u001b[' + n + 'A');
 };
 
 /**
@@ -224,7 +224,7 @@ NyanCat.prototype.cursorUp = function (n) {
  */
 
 NyanCat.prototype.cursorDown = function (n) {
-  write('\u001b[' + n + 'B');
+  process.stdout.write('\u001b[' + n + 'B');
 };
 
 /**
@@ -264,13 +264,4 @@ NyanCat.prototype.rainbowify = function (str) {
   return '\u001b[38;5;' + color + 'm' + str + '\u001b[0m';
 };
 
-/**
- * Stdout helper.
- *
- * @param {string} string A message to write to stdout.
- */
-function write(string) {
-  process.stdout.write(string);
-}
-
 NyanCat.description = '"nyan cat"';