release: v9.1.0

.eslintrc.json

@@ -160,7 +160,6 @@
             "jsdoc/check-param-names": ["off", {"checkDestructured": false}],
             // Allow any text in the license tag. Other checks are not relevant.
             "jsdoc/check-values": ["off"]
-
         }
     }]
 }

.github/CONTRIBUTING.md

@@ -29,9 +29,9 @@ All submissions, including submissions by project members, require review. We
 use Github pull requests for this purpose.
 
 ### Browser compatibility
-We care strongly about making Blockly work on all browsers.  As of 2022 we 
+We care strongly about making Blockly work on all browsers.  As of 2022 we
 support Edge, Chrome, Safari, and Firefox.  We will not accept changes that only
-work on a subset of those browsers.  You can check [caniuse.com](https://caniuse.com/) 
+work on a subset of those browsers.  You can check [caniuse.com](https://caniuse.com/)
 for compatibility information.
 
 ### The small print

.github/dependabot.yml

@@ -22,7 +22,7 @@ updates:
       - "PR: chore"
       - "PR: dependencies"
   - package-ecosystem: "github-actions" # See documentation for possible values
-    directory: "/" 
+    directory: "/"
     target-branch: "develop"
     schedule:
       interval: "weekly"

.github/workflows/appengine_deploy.yml

@@ -42,7 +42,7 @@ jobs:
           path: _deploy/
 
       - name: Deploy to App Engine
-        uses: google-github-actions/deploy-appengine@v0.8.0
+        uses: google-github-actions/deploy-appengine@v0.8.2
         # For parameters see:
         # https://github.com/google-github-actions/deploy-appengine#inputs
         with:

.github/workflows/conventional-label.yml

@@ -0,0 +1,12 @@
+on:
+  pull_request_target:
+    types: [ opened, edited ]
+name: conventional-release-labels
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: bcoe/conventional-release-labels@v1
+        with:
+          type_labels: '{"feat": "PR: feature", "fix": "PR: fix", "breaking": "breaking change", "chore": "PR: chore", "docs": "PR: docs", "refactor": "PR: refactor"}'
+          ignored_types: '[]'

.github/workflows/tag_module_cleanup.yml

@@ -5,14 +5,14 @@ name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
 # Uses pull_request_target to get write permissions so that it can write labels.
-on: 
+on:
   pull_request_target:
     branches:
       - goog_module
 
 jobs:
   tag-module-cleanup:
-  
+
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:

.github/workflows/update_metadata.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
-    runs-on: ubuntu-latest        
+    runs-on: ubuntu-latest
 
     steps:
     - name: Check Out Blockly
@@ -36,7 +36,7 @@ jobs:
       run: source ./tests/scripts/update_metadata.sh
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@171dd555b9ab6b18fa02519fdfacbb8bf671e1b4
+      uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7
       with:
         commit-message: Update build artifact sizes in check_metadata.sh
         delete-branch: true

blocks/procedures.js

@@ -150,8 +150,7 @@ const PROCEDURE_DEF_COMMON = {
           this.argumentVarModels_.push(variable);
         } else {
           console.log(
-              'Failed to create a variable with name ' + varName +
-              ', ignoring.');
+              `Failed to create a variable named "${varName}", ignoring.`);
         }
       }
     }

closure/goog/base_minimal.js

@@ -23,7 +23,7 @@ var goog = goog || {};
 /**
  * Reference to the global object.  This is provided as 'root' by the
  * UMD wrapper, but prefer globalThis if it is defined.
- * 
+ *
  * https://www.ecma-international.org/ecma-262/9.0/index.html#sec-global-object
  *
  * @const

core/block_drag_surface.ts

@@ -31,39 +31,40 @@ import * as svgMath from './utils/svg_math.js';
  * @alias Blockly.BlockDragSurfaceSvg
  */
 export class BlockDragSurfaceSvg {
-  /** The SVG drag surface. Set once by BlockDragSurfaceSvg.createDom. */
-  private svg_: SVGElement;
+  /**
+   * The root element of the drag surface.
+   */
+  private svg: SVGElement;
 
   /**
    * This is where blocks live while they are being dragged if the drag
    * surface is enabled.
    */
-  private dragGroup_: SVGElement;
+  private dragGroup: SVGElement;
 
   /**
    * Cached value for the scale of the drag surface.
    * Used to set/get the correct translation during and after a drag.
    */
-  private scale_ = 1;
+  private scale = 1;
 
   /**
    * Cached value for the translation of the drag surface.
    * This translation is in pixel units, because the scale is applied to the
    * drag group rather than the top-level SVG.
    */
-  private surfaceXY_: Coordinate = new Coordinate(0, 0);
-  private readonly childSurfaceXY_: Coordinate;
+  private surfaceXY = new Coordinate(0, 0);
+
+  /**
+   * Cached value for the translation of the child drag surface in pixel
+   * units. Since the child drag surface tracks the translation of the
+   * workspace this is ultimately the translation of the workspace.
+   */
+  private readonly childSurfaceXY = new Coordinate(0, 0);
 
   /** @param container Containing element. */
   constructor(private readonly container: Element) {
-    /**
-     * Cached value for the translation of the child drag surface in pixel
-     * units. Since the child drag surface tracks the translation of the
-     * workspace this is ultimately the translation of the workspace.
-     */
-    this.childSurfaceXY_ = new Coordinate(0, 0);
-
-    this.svg_ = dom.createSvgElement(
+    this.svg = dom.createSvgElement(
         Svg.SVG, {
           'xmlns': dom.SVG_NS,
           'xmlns:html': dom.HTML_NS,
@@ -72,7 +73,8 @@ export class BlockDragSurfaceSvg {
           'class': 'blocklyBlockDragSurface',
         },
         this.container);
-    this.dragGroup_ = dom.createSvgElement(Svg.G, {}, this.svg_ as SVGElement);
+
+    this.dragGroup = dom.createSvgElement(Svg.G, {}, this.svg);
   }
 
   /**
@@ -93,13 +95,13 @@ export class BlockDragSurfaceSvg {
    * @param blocks Block or group of blocks to place on the drag surface.
    */
   setBlocksAndShow(blocks: SVGElement) {
-    if (this.dragGroup_.childNodes.length) {
+    if (this.dragGroup.childNodes.length) {
       throw Error('Already dragging a block.');
     }
     // appendChild removes the blocks from the previous parent
-    this.dragGroup_.appendChild(blocks);
-    this.svg_.style.display = 'block';
-    this.surfaceXY_ = new Coordinate(0, 0);
+    this.dragGroup.appendChild(blocks);
+    this.svg.style.display = 'block';
+    this.surfaceXY = new Coordinate(0, 0);
   }
 
   /**
@@ -111,13 +113,13 @@ export class BlockDragSurfaceSvg {
    * @param scale Scale of the group.
    */
   translateAndScaleGroup(x: number, y: number, scale: number) {
-    this.scale_ = scale;
+    this.scale = scale;
     // Make sure the svg exists on a pixel boundary so that it is not fuzzy.
     const roundX = Math.round(x);
     const roundY = Math.round(y);
-    this.childSurfaceXY_.x = roundX;
-    this.childSurfaceXY_.y = roundY;
-    this.dragGroup_!.setAttribute(
+    this.childSurfaceXY.x = roundX;
+    this.childSurfaceXY.y = roundY;
+    this.dragGroup.setAttribute(
         'transform',
         'translate(' + roundX + ',' + roundY + ') scale(' + scale + ')');
   }
@@ -128,13 +130,11 @@ export class BlockDragSurfaceSvg {
    * @internal
    */
   translateSurfaceInternal_() {
-    let x = this.surfaceXY_!.x;
-    let y = this.surfaceXY_!.y;
     // Make sure the svg exists on a pixel boundary so that it is not fuzzy.
-    x = Math.round(x);
-    y = Math.round(y);
-    this.svg_.style.display = 'block';
-    dom.setCssTransform(this.svg_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
+    const x = Math.round(this.surfaceXY.x);
+    const y = Math.round(this.surfaceXY.y);
+    this.svg.style.display = 'block';
+    dom.setCssTransform(this.svg, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
   }
 
   /**
@@ -144,9 +144,9 @@ export class BlockDragSurfaceSvg {
    * @param deltaY Vertical offset in pixel units.
    */
   translateBy(deltaX: number, deltaY: number) {
-    const x = this.surfaceXY_.x + deltaX;
-    const y = this.surfaceXY_.y + deltaY;
-    this.surfaceXY_ = new Coordinate(x, y);
+    const x = this.surfaceXY.x + deltaX;
+    const y = this.surfaceXY.y + deltaY;
+    this.surfaceXY = new Coordinate(x, y);
     this.translateSurfaceInternal_();
   }
 
@@ -160,7 +160,7 @@ export class BlockDragSurfaceSvg {
    * @param y Y translation for the entire surface.
    */
   translateSurface(x: number, y: number) {
-    this.surfaceXY_ = new Coordinate(x * this.scale_, y * this.scale_);
+    this.surfaceXY = new Coordinate(x * this.scale, y * this.scale);
     this.translateSurfaceInternal_();
   }
 
@@ -171,8 +171,8 @@ export class BlockDragSurfaceSvg {
    * @returns Current translation of the surface.
    */
   getSurfaceTranslation(): Coordinate {
-    const xy = svgMath.getRelativeXY(this.svg_ as SVGElement);
-    return new Coordinate(xy.x / this.scale_, xy.y / this.scale_);
+    const xy = svgMath.getRelativeXY(this.svg);
+    return new Coordinate(xy.x / this.scale, xy.y / this.scale);
   }
 
   /**
@@ -181,17 +181,17 @@ export class BlockDragSurfaceSvg {
    *
    * @returns Drag surface group element.
    */
-  getGroup(): SVGElement|null {
-    return this.dragGroup_;
+  getGroup(): SVGElement {
+    return this.dragGroup;
   }
 
   /**
    * Returns the SVG drag surface.
    *
    * @returns The SVG drag surface.
    */
-  getSvgRoot(): SVGElement|null {
-    return this.svg_;
+  getSvgRoot(): SVGElement {
+    return this.svg;
   }
 
   /**
@@ -201,7 +201,7 @@ export class BlockDragSurfaceSvg {
    * @returns Drag surface block DOM element, or null if no blocks exist.
    */
   getCurrentBlock(): Element|null {
-    return this.dragGroup_.firstChild as Element;
+    return this.dragGroup.firstChild as Element;
   }
 
   /**
@@ -213,7 +213,7 @@ export class BlockDragSurfaceSvg {
    */
   getWsTranslation(): Coordinate {
     // Returning a copy so the coordinate can not be changed outside this class.
-    return this.childSurfaceXY_.clone();
+    return this.childSurfaceXY.clone();
   }
 
   /**
@@ -230,16 +230,16 @@ export class BlockDragSurfaceSvg {
     const currentBlockElement = this.getCurrentBlock();
     if (currentBlockElement) {
       if (opt_newSurface) {
-        // appendChild removes the node from this.dragGroup_
+        // appendChild removes the node from this.dragGroup
         opt_newSurface.appendChild(currentBlockElement);
       } else {
-        this.dragGroup_.removeChild(currentBlockElement);
+        this.dragGroup.removeChild(currentBlockElement);
       }
     }
-    this.svg_.style.display = 'none';
-    if (this.dragGroup_.childNodes.length) {
+    this.svg.style.display = 'none';
+    if (this.dragGroup.childNodes.length) {
       throw Error('Drag group was not cleared.');
     }
-    this.surfaceXY_ = new Coordinate(0, 0);
+    this.surfaceXY = new Coordinate(0, 0);
   }
 }