Merge pull request #8394 from google/develop

chore: develop into V12 to pin node version

Author: BeksOmega

.github/workflows/build.yml

@@ -18,7 +18,8 @@ jobs:
         # TODO (#2114): re-enable osx build.
         # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        node-version: [18.x, 20.x, 22.x]
+        # TODO(#8392): unpin v22 once npm issue fixed.
+        node-version: [18.x, 20.x, 22.4.1]
         # See supported Node.js release schedule at
         # https://nodejs.org/en/about/releases/
 

.npmrc

@@ -1 +1,2 @@
 registry=https://registry.npmjs.org/
+legacy-peer-deps=true

core/block_svg.ts

@@ -457,7 +457,7 @@ export class BlockSvg
   getBoundingRectangleWithoutChildren(): Rect {
     return this.getBoundingRectangleWithDimensions({
       height: this.height,
-      width: this.width,
+      width: this.childlessWidth,
     });
   }
 

core/comments/comment_view.ts

@@ -104,7 +104,7 @@ export class CommentView implements IRenderedElement {
 
   constructor(private readonly workspace: WorkspaceSvg) {
     this.svgRoot = dom.createSvgElement(Svg.G, {
-      'class': 'blocklyComment blocklyEditable',
+      'class': 'blocklyComment blocklyEditable blocklyDraggable',
     });
 
     this.highlightRect = this.createHighlightRect(this.svgRoot);

core/comments/rendered_workspace_comment.ts

@@ -57,6 +57,7 @@ export class RenderedWorkspaceComment
     // Set the size to the default size as defined in the superclass.
     this.view.setSize(this.getSize());
     this.view.setEditable(this.isEditable());
+    this.view.getSvgRoot().setAttribute('data-id', this.id);
 
     this.addModelUpdateBindings();
 

core/workspace.ts

@@ -748,7 +748,6 @@ export class Workspace implements IASTNodeLocation {
    *
    * @param id ID of comment to find.
    * @returns The sought after comment, or null if not found.
-   * @internal
    */
   getCommentById(id: string): WorkspaceComment | null {
     return this.commentDB.get(id) ?? null;

package-lock.json

@@ -100,13 +100,14 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@blockly/block-test": "^5.0.0",
-    "@blockly/dev-tools": "^7.0.2",
-    "@blockly/theme-modern": "^5.0.0",
+    "@blockly/block-test": "^6.0.4",
+    "@blockly/dev-tools": "^8.0.4",
+    "@blockly/theme-modern": "^6.0.3",
     "@hyperjump/json-schema": "^1.5.0",
     "@microsoft/api-documenter": "^7.22.4",
     "@microsoft/api-extractor": "^7.29.5",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.16.1",
     "async-done": "^2.0.0",
     "chai": "^5.1.1",
     "concurrently": "^8.0.1",