@scratch/scratch-svg-renderer 12.1.0-localte-selection → 12.1.0-membership-program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scratch/scratch-svg-renderer",
-  "version": "12.1.0-localte-selection",
+  "version": "12.1.0-membership-program",
   "description": "SVG renderer for Scratch",
   "main": "./dist/node/scratch-svg-renderer.js",
   "browser": "./dist/web/scratch-svg-renderer.js",
@@ -12,14 +12,16 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "LICENSE",
+    "TRADEMARK"
   ],
   "scripts": {
     "build": "npm run clean && webpack",
     "clean": "rimraf dist playground",
     "start": "webpack-dev-server",
     "test": "npm run test:lint && npm run test:unit",
-    "test:lint": "eslint . --ext .js",
+    "test:lint": "eslint",
     "test:unit": "tap ./test/*.js",
     "watch": "webpack --watch"
   },
@@ -46,24 +48,22 @@
     "transformation-matrix": "1.15.3"
   },
   "devDependencies": {
-    "@babel/core": "7.28.4",
-    "@babel/eslint-parser": "7.28.4",
-    "@babel/preset-env": "7.28.3",
+    "@babel/core": "7.28.5",
+    "@babel/preset-env": "7.28.5",
     "babel-loader": "9.2.1",
     "copy-webpack-plugin": "6.4.1",
-    "eslint": "8.57.1",
-    "eslint-config-scratch": "9.0.9",
-    "eslint-plugin-import": "2.32.0",
+    "eslint": "9.39.1",
+    "eslint-config-scratch": "12.0.38",
+    "globals": "16.5.0",
     "jsdom": "13.2.0",
-    "json": "9.0.6",
     "mkdirp": "2.1.6",
     "rimraf": "3.0.2",
-    "scratch-render-fonts": "1.0.229",
-    "scratch-semantic-release-config": "3.0.0",
-    "scratch-webpack-configuration": "3.0.0",
+    "scratch-render-fonts": "1.0.252",
+    "scratch-semantic-release-config": "4.0.0",
+    "scratch-webpack-configuration": "3.1.0",
     "semantic-release": "19.0.5",
-    "tap": "21.1.0",
-    "webpack": "5.101.3",
+    "tap": "21.4.0",
+    "webpack": "5.103.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.2",
     "xmldom": "0.1.31"

package/src/bitmap-adapter.js

@@ -5,8 +5,8 @@ const base64js = require('base64-js');
  */
 class BitmapAdapter {
     /**
-     * @param {?function} makeImage HTML image constructor. Tests can provide this.
-     * @param {?function} makeCanvas HTML canvas constructor. Tests can provide this.
+     * @param {?Function} makeImage HTML image constructor. Tests can provide this.
+     * @param {?Function} makeCanvas HTML canvas constructor. Tests can provide this.
      */
     constructor (makeImage, makeCanvas) {
         this._makeImage = makeImage ? makeImage : () => new Image();
@@ -46,7 +46,7 @@ class BitmapAdapter {
      * to resolution 2 bitmaps. Therefore, converting a resolution 1 bitmap means doubling
      * it in width and height.
      * @param {!string} dataURI Base 64 encoded image data of the bitmap
-     * @param {!function} callback Node-style callback that returns updated dataURI if conversion succeeded
+     * @param {!Function} callback Node-style callback that returns updated dataURI if conversion succeeded
      */
     convertResolution1Bitmap (dataURI, callback) {
         const image = this._makeImage();
@@ -64,7 +64,7 @@ class BitmapAdapter {
      * to in Scratch 3.0
      * @param {!number} oldWidth original width
      * @param {!number} oldHeight original height
-     * @return {object} Array of new width, new height
+     * @returns {object} Array of new width, new height
      */
     getResizedWidthHeight (oldWidth, oldHeight) {
         const STAGE_WIDTH = 480;

package/src/font-converter.js

@@ -5,7 +5,7 @@
 /**
  * Given an SVG, replace Scratch 2.0 fonts with new 3.0 fonts. Add defaults where there are none.
  * @param {SVGElement} svgTag The SVG dom object
- * @return {void}
+ * @returns {void}
  */
 const convertFonts = function (svgTag) {
     // Collect all text elements into a list.

package/src/font-inliner.js

@@ -15,7 +15,7 @@ const getFonts = require('scratch-render-fonts');
  *   // Using a <link> or <style>@import</style> to link to font-family
  *   // injected into the document: no effect.
  * @param {string} svgString The string representation of the svg to modify
- * @return {string} The svg with any needed fonts inlined
+ * @returns {string} The svg with any needed fonts inlined
  */
 const inlineSvgFonts = function (svgString) {
     const FONTS = getFonts();

package/src/load-svg-string.js

@@ -6,7 +6,7 @@ const {sanitizeSvgText} = require('./sanitize-svg');
 /**
  * @param {SVGElement} svgTag the tag to search within
  * @param {string} [tagName] svg tag to search for (or collect all elements if not given)
- * @return {Array} a list of elements with the given tagname
+ * @returns {Array} a list of elements with the given tagname
  */
 const collectElements = (svgTag, tagName) => {
     const elts = [];
@@ -162,7 +162,7 @@ const transformText = svgTag => {
  * This is used to enlarge the computed bounding box, which doesn't take
  * stroke width into account.
  * @param {SVGSVGElement} rootNode The root SVG node to traverse.
- * @return {number} The largest stroke width in the SVG.
+ * @returns {number} The largest stroke width in the SVG.
  */
 const findLargestStrokeWidth = rootNode => {
     let largestStrokeWidth = 0;
@@ -300,7 +300,7 @@ const normalizeSvg = (svgTag, fromVersion2) => {
  * mimic Scratch 2.0's SVG rendering.
  * @param {!string} svgString String of SVG data to draw in quirks-mode.
  * @param {boolean} [fromVersion2] True if we should perform conversion from version 2 to version 3 svg.
- * @return {SVGSVGElement} The normalized SVG element.
+ * @returns {SVGSVGElement} The normalized SVG element.
  */
 const loadSvgString = (svgString, fromVersion2) => {
     // Parse string into SVG XML.

package/src/sanitize-svg.js

@@ -98,7 +98,7 @@ let _TextDecoder;
 let _TextEncoder;
 if (typeof TextDecoder === 'undefined' || typeof TextEncoder === 'undefined') {
     // Wait to require the text encoding polyfill until we know it's needed.
-    // eslint-disable-next-line global-require
+     
     const encoding = require('fastestsmallesttextencoderdecoder');
     _TextDecoder = encoding.TextDecoder;
     _TextEncoder = encoding.TextEncoder;
@@ -110,7 +110,7 @@ if (typeof TextDecoder === 'undefined' || typeof TextEncoder === 'undefined') {
 /**
  * Load an SVG Uint8Array of bytes and "sanitize" it
  * @param {!Uint8Array} rawData unsanitized SVG daata
- * @return {Uint8Array} sanitized SVG data
+ * @returns {Uint8Array} sanitized SVG data
  */
 sanitizeSvg.sanitizeByteStream = function (rawData) {
     const decoder = new _TextDecoder();
@@ -124,7 +124,7 @@ sanitizeSvg.sanitizeByteStream = function (rawData) {
  * fixup-svg-string.js, and thus more risky; there are known examples of SVGs that
  * it will clobber. We use DOMPurify's svg profile, which restricts many types of tag.
  * @param {!string} rawSvgText unsanitized SVG string
- * @return {string} sanitized SVG text
+ * @returns {string} sanitized SVG text
  */
 sanitizeSvg.sanitizeSvgText = function (rawSvgText) {
     let sanitizedText = DOMPurify.sanitize(rawSvgText, {

package/src/svg-renderer.js

@@ -10,7 +10,7 @@ class SvgRenderer {
      * Create a quirks-mode SVG renderer for a particular canvas.
      * @param {HTMLCanvasElement} [canvas] An optional canvas element to draw to. If this is not provided, the renderer
      * will create a new canvas.
-     * @constructor
+     * @class
      */
     constructor (canvas) {
         /**
@@ -59,14 +59,14 @@ class SvgRenderer {
     }
 
     /**
-     * @return {Array<number>} the natural size, in Scratch units, of this SVG.
+     * @returns {Array<number>} the natural size, in Scratch units, of this SVG.
      */
     get size () {
         return [this._measurements.width, this._measurements.height];
     }
 
     /**
-     * @return {Array<number>} the offset (upper left corner) of the SVG's view box.
+     * @returns {Array<number>} the offset (upper left corner) of the SVG's view box.
      */
     get viewOffset () {
         return [this._measurements.x, this._measurements.y];
@@ -143,7 +143,7 @@ class SvgRenderer {
     /**
      * Draw to the canvas from a loaded image element.
      * @param {number} [scale] - Optionally, also scale the image by this factor.
-     **/
+     */
     _drawFromImage (scale) {
         if (this._cachedImage === null) return;
 

package/src/transform-applier.js

@@ -501,14 +501,13 @@ const _parseUrl = (value, windowRef) => {
  * on groups down to the leaf level and averaging out the stroke width
  * around the shapes. Note that this doens't just change stroke widths, it
  * changes path data and attributes throughout the SVG.
- *
  * @param {SVGElement} svgTag The SVG dom object
  * @param {Window} windowRef The window to use. Need to pass in for
  *     tests to work, as they get angry at even the mention of window.
  * @param {object} bboxForTesting The bounds to use. Need to pass in for
  *     tests only, because getBBox doesn't work in Node. This should
  *     be the bounds of the svgTag without including stroke width or transforms.
- * @return {void}
+ * @returns {void}
  */
 const transformStrokeWidths = function (svgTag, windowRef, bboxForTesting) {
     const inherited = Matrix.identity();