Merge pull request #107 from scratchfoundation/renovate/tap-21.x

chore(deps): update dependency tap to v21

Author: cwillisf

package-lock.json

@@ -16,6 +16,7 @@
     "prepare": "husky install",
     "build": "cross-env NODE_ENV=production npm run --workspaces build",
     "clean": "npm run --workspaces clean",
+    "test": "npm test --workspaces",
     "version": "cross-env-shell ./scripts/npm-version.sh"
   },
   "config": {

package.json

@@ -7,6 +7,7 @@ npm-*
 
 # Testing
 /.nyc_output
+/.tap
 /coverage
 
 # IDEA
@@ -17,4 +18,4 @@ npm-*
 /playground
 
 # Act
-.secrets
+.secrets

packages/scratch-render/.gitignore

@@ -33,10 +33,7 @@
     "watch": "webpack --progress --watch --watch-poll"
   },
   "tap": {
-    "branches": 10,
-    "functions": 20,
-    "lines": 30,
-    "statements": 30
+    "allow-incomplete-coverage": true
   },
   "browserslist": [
     "Chrome >= 63",
@@ -80,7 +77,7 @@
     "scratch-storage": "4.0.223",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",
-    "tap": "16.3.10",
+    "tap": "21.1.0",
     "terser-webpack-plugin": "5.3.14",
     "webpack": "5.101.3",
     "webpack-cli": "5.1.4",

packages/scratch-render/package.json

@@ -52,7 +52,7 @@ const runFile = async (file, action, page, script) => {
 
             t.plan(expect.length);
             for (let x = 0; x < expect.length; x++) {
-                t.deepEqual(results[x], expect[x], expect[x][0]);
+                t.same(results[x], expect[x], expect[x][0]);
             }
             t.end();
         });

packages/scratch-render/test/integration/pick-tests.js

@@ -1,48 +1,46 @@
-const {test, Test} = require('tap');
+const {test} = require('tap');
 
 const {rgbToHsv, hsvToRgb} = require('../../src/util/color-conversions');
 
-Test.prototype.addAssert('colorsAlmostEqual', 2, function (found, wanted, message, extra) {
-    /* eslint-disable no-invalid-this */
+const colorsAlmostEqual = (t, found, wanted, message, extra) => {
     message += `: found ${JSON.stringify(Array.from(found))}, wanted ${JSON.stringify(Array.from(wanted))}`;
 
     // should always return another assert call, or
     // this.pass(message) or this.fail(message, extra)
     if (found.length !== wanted.length) {
-        return this.fail(message, extra);
+        return t.fail(message, extra);
     }
 
     for (let i = 0; i < found.length; i++) {
         // smallest meaningful difference--detects changes in hue value after rounding
         if (Math.abs(found[i] - wanted[i]) >= 0.5 / 360) {
-            return this.fail(message, extra);
+            return t.fail(message, extra);
         }
     }
 
-    return this.pass(message);
-    /* eslint-enable no-invalid-this */
-});
+    return t.pass(message);
+};
 
 test('RGB to HSV', t => {
     const dst = [0, 0, 0];
-    t.colorsAlmostEqual(rgbToHsv([255, 255, 255], dst), [0, 0, 1], 'white');
-    t.colorsAlmostEqual(rgbToHsv([0, 0, 0], dst), [0, 0, 0], 'black');
-    t.colorsAlmostEqual(rgbToHsv([127, 127, 127], dst), [0, 0, 0.498], 'grey');
-    t.colorsAlmostEqual(rgbToHsv([255, 255, 0], dst), [0.167, 1, 1], 'yellow');
-    t.colorsAlmostEqual(rgbToHsv([1, 0, 0], dst), [0, 1, 0.00392], 'dark red');
+    colorsAlmostEqual(t, rgbToHsv([255, 255, 255], dst), [0, 0, 1], 'white');
+    colorsAlmostEqual(t, rgbToHsv([0, 0, 0], dst), [0, 0, 0], 'black');
+    colorsAlmostEqual(t, rgbToHsv([127, 127, 127], dst), [0, 0, 0.498], 'grey');
+    colorsAlmostEqual(t, rgbToHsv([255, 255, 0], dst), [0.167, 1, 1], 'yellow');
+    colorsAlmostEqual(t, rgbToHsv([1, 0, 0], dst), [0, 1, 0.00392], 'dark red');
 
     t.end();
 });
 
 test('HSV to RGB', t => {
     const dst = new Uint8ClampedArray(3);
-    t.colorsAlmostEqual(hsvToRgb([0, 1, 1], dst), [255, 0, 0], 'red');
-    t.colorsAlmostEqual(hsvToRgb([1, 1, 1], dst), [255, 0, 0], 'red (hue of 1)');
-    t.colorsAlmostEqual(hsvToRgb([0.5, 1, 1], dst), [0, 255, 255], 'cyan');
-    t.colorsAlmostEqual(hsvToRgb([1.5, 1, 1], dst), [0, 255, 255], 'cyan (hue of 1.5)');
-    t.colorsAlmostEqual(hsvToRgb([0, 0, 0], dst), [0, 0, 0], 'black');
-    t.colorsAlmostEqual(hsvToRgb([0.5, 1, 0], dst), [0, 0, 0], 'black (with hue and saturation)');
-    t.colorsAlmostEqual(hsvToRgb([0, 1, 0.00392], dst), [1, 0, 0], 'dark red');
+    colorsAlmostEqual(t, hsvToRgb([0, 1, 1], dst), [255, 0, 0], 'red');
+    colorsAlmostEqual(t, hsvToRgb([1, 1, 1], dst), [255, 0, 0], 'red (hue of 1)');
+    colorsAlmostEqual(t, hsvToRgb([0.5, 1, 1], dst), [0, 255, 255], 'cyan');
+    colorsAlmostEqual(t, hsvToRgb([1.5, 1, 1], dst), [0, 255, 255], 'cyan (hue of 1.5)');
+    colorsAlmostEqual(t, hsvToRgb([0, 0, 0], dst), [0, 0, 0], 'black');
+    colorsAlmostEqual(t, hsvToRgb([0.5, 1, 0], dst), [0, 0, 0], 'black (with hue and saturation)');
+    colorsAlmostEqual(t, hsvToRgb([0, 1, 0.00392], dst), [1, 0, 0], 'dark red');
 
     t.end();
 });

packages/scratch-render/test/unit/ColorConversionTests.js

@@ -6,12 +6,15 @@
 npm-*
 
 # Build
-dist/*
+/dist
 /playground
 
+# Test
+/.tap
+
 # Editors
 /#*
 *~
 
 # Act
-.secrets
+.secrets

packages/scratch-svg-renderer/.gitignore

@@ -34,10 +34,7 @@
     "scratch-render-fonts": "^1.0.0"
   },
   "tap": {
-    "branches": 70,
-    "functions": 50,
-    "lines": 70,
-    "statements": 70
+    "allow-incomplete-coverage": true
   },
   "dependencies": {
     "base64-js": "1.5.1",
@@ -65,7 +62,7 @@
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",
-    "tap": "16.3.10",
+    "tap": "21.1.0",
     "webpack": "5.101.3",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2",

packages/scratch-svg-renderer/package.json

@@ -6,97 +6,97 @@ const BitmapAdapter = require('../src/bitmap-adapter');
 test('zero', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(0, 0);
-    t.equals(0, size.width);
-    t.equals(0, size.height);
+    t.equal(0, size.width);
+    t.equal(0, size.height);
     t.end();
 });
 
 // Double (as if it is bitmap resolution 1)
 test('smallImg', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(50, 50);
-    t.equals(100, size.width);
-    t.equals(100, size.height);
+    t.equal(100, size.width);
+    t.equal(100, size.height);
     t.end();
 });
 
 // Double (as if it is bitmap resolution 1)
 test('stageSizeImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(480, 360);
-    t.equals(960, size.width);
-    t.equals(720, size.height);
+    t.equal(960, size.width);
+    t.equal(720, size.height);
     t.end();
 });
 
 // Don't resize
 test('mediumHeightImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(50, 700);
-    t.equals(50, size.width);
-    t.equals(700, size.height);
+    t.equal(50, size.width);
+    t.equal(700, size.height);
     t.end();
 });
 
 // Don't resize
 test('mediumWidthImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(700, 50);
-    t.equals(700, size.width);
-    t.equals(50, size.height);
+    t.equal(700, size.width);
+    t.equal(50, size.height);
     t.end();
 });
 
 // Don't resize
 test('mediumImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(700, 700);
-    t.equals(700, size.width);
-    t.equals(700, size.height);
+    t.equal(700, size.width);
+    t.equal(700, size.height);
     t.end();
 });
 
 // Don't resize
 test('doubleStageSizeImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(960, 720);
-    t.equals(960, size.width);
-    t.equals(720, size.height);
+    t.equal(960, size.width);
+    t.equal(720, size.height);
     t.end();
 });
 
 // Fit to stage width
 test('wideImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(1000, 50);
-    t.equals(960, size.width);
-    t.equals(960 / 1000 * 50, size.height);
+    t.equal(960, size.width);
+    t.equal(960 / 1000 * 50, size.height);
     t.end();
 });
 
 // Fit to stage height
 test('tallImage', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(50, 1000);
-    t.equals(720, size.height);
-    t.equals(720 / 1000 * 50, size.width);
+    t.equal(720, size.height);
+    t.equal(720 / 1000 * 50, size.width);
     t.end();
 });
 
 // Fit to stage height
 test('largeImageHeightConstraint', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(1000, 1000);
-    t.equals(720, size.height);
-    t.equals(720 / 1000 * 1000, size.width);
+    t.equal(720, size.height);
+    t.equal(720 / 1000 * 1000, size.width);
     t.end();
 });
 
 // Fit to stage width
 test('largeImageWidthConstraint', t => {
     const bitmapAdapter = new BitmapAdapter();
     const size = bitmapAdapter.getResizedWidthHeight(2000, 1000);
-    t.equals(960, size.width);
-    t.equals(960 / 2000 * 1000, size.height);
+    t.equal(960, size.width);
+    t.equal(960 / 2000 * 1000, size.height);
     t.end();
 });

packages/scratch-svg-renderer/test/bitmapAdapter_getResized.js

@@ -22,7 +22,7 @@ test('fixupSvgString should make parsing fixtures not throw', t => {
 
     // Make sure undefineds aren't being written into the file
     t.equal(fixed.indexOf('undefined'), -1);
-    t.notThrow(() => {
+    t.doesNotThrow(() => {
         domParser.parseFromString(fixed, 'text/xml');
     });
     t.end();
@@ -36,7 +36,7 @@ test('fixupSvgString should correct namespace declarations bound to reserved nam
 
     // Make sure undefineds aren't being written into the file
     t.equal(fixed.indexOf('undefined'), -1);
-    t.notThrow(() => {
+    t.doesNotThrow(() => {
         domParser.parseFromString(fixed, 'text/xml');
     });
     t.end();
@@ -45,7 +45,7 @@ test('fixupSvgString should correct namespace declarations bound to reserved nam
 test('fixupSvgString shouldn\'t correct non-attributes', t => {
     const dontFix = fixupSvgString('<text>xmlns:test="http://www/w3.org/XML/1998/namespace" is not an xmlns attribute</text>');
 
-    t.notEqual(dontFix.indexOf('http://www/w3.org/XML/1998/namespace'), -1);
+    t.not(dontFix.indexOf('http://www/w3.org/XML/1998/namespace'), -1);
     t.end();
 });
 
@@ -56,7 +56,7 @@ test('fixupSvgString should strip `svg:` prefix from tag names', t => {
     const fixed = fixupSvgString(svgString);
 
     const checkPrefixes = element => {
-        t.notEqual(element.prefix, 'svg');
+        t.not(element.prefix, 'svg');
         // JSDOM doesn't have element.children, only element.childNodes
         if (element.childNodes) {
             // JSDOM's childNodes is not iterable, so for...of cannot be used here
@@ -69,7 +69,7 @@ test('fixupSvgString should strip `svg:` prefix from tag names', t => {
 
     // Make sure undefineds aren't being written into the file
     t.equal(fixed.indexOf('undefined'), -1);
-    t.notThrow(() => {
+    t.doesNotThrow(() => {
         domParser.parseFromString(fixed, 'text/xml');
     });
 
@@ -84,9 +84,9 @@ test('fixupSvgString should empty script tags', t => {
         .toString();
     const fixed = fixupSvgString(svgString);
     // Script tag should remain but have no contents.
-    t.equals(fixed.indexOf('<script></script>'), 207);
+    t.equal(fixed.indexOf('<script></script>'), 207);
     // The contents of the script tag (e.g. the alert) are no longer there.
-    t.equals(fixed.indexOf('stuff inside'), -1);
+    t.equal(fixed.indexOf('stuff inside'), -1);
     t.end();
 });
 
@@ -96,7 +96,7 @@ test('fixupSvgString should empty script tags in onload', t => {
         .toString();
     const fixed = fixupSvgString(svgString);
     // Script tag should remain but have no contents.
-    t.equals(fixed.indexOf('<script></script>'), 792);
+    t.equal(fixed.indexOf('<script></script>'), 792);
     t.end();
 });
 
@@ -106,9 +106,9 @@ test('fixupSvgString strips contents of metadata', t => {
         .toString();
     const fixed = fixupSvgString(svgString);
     // Metadata tag should still exist, it'll just be empty.
-    t.equals(fixed.indexOf('<metadata></metadata>'), 207);
+    t.equal(fixed.indexOf('<metadata></metadata>'), 207);
     // The contents of the metadata tag are gone.
-    t.equals(fixed.indexOf('stuff inside'), -1);
+    t.equal(fixed.indexOf('stuff inside'), -1);
     t.end();
 });
 
@@ -118,7 +118,7 @@ test('fixupSvgString strips contents of metadata in onload', t => {
         .toString();
     const fixed = fixupSvgString(svgString);
     // Metadata tag should still exist, it'll just be empty.
-    t.equals(fixed.indexOf('<metadata></metadata>'), 800);
+    t.equal(fixed.indexOf('<metadata></metadata>'), 800);
     t.end();
 });
 
@@ -128,9 +128,9 @@ test('fixupSvgString should correct invalid mime type', t => {
     const fixed = fixupSvgString(svgString);
 
     // Make sure we replace an invalid mime type from Photoshop exported SVGs
-    t.notEqual(svgString.indexOf('img/png'), -1);
+    t.not(svgString.indexOf('img/png'), -1);
     t.equal(fixed.indexOf('img/png'), -1);
-    t.notThrow(() => {
+    t.doesNotThrow(() => {
         domParser.parseFromString(fixed, 'text/xml');
     });
     t.end();
@@ -139,6 +139,6 @@ test('fixupSvgString should correct invalid mime type', t => {
 test('fixupSvgString shouldn\'t correct non-image tags', t => {
     const dontFix = fixupSvgString('<text>data:img/png is not a mime type</text>');
 
-    t.notEqual(dontFix.indexOf('img/png'), -1);
+    t.not(dontFix.indexOf('img/png'), -1);
     t.end();
 });