release: Merge branch 'develop' into rc/v11.2.0

.eslintrc.js

@@ -101,6 +101,8 @@ function buildTSOverride({files, tsconfig}) {
       '@typescript-eslint/no-empty-function': ['off'],
       // Temporarily disable. 3 problems.
       '@typescript-eslint/no-empty-interface': ['off'],
+      // We use this pattern extensively for block (e.g. controls_if) interfaces.
+      '@typescript-eslint/no-empty-object-type': ['off'],
 
       // TsDoc rules (using JsDoc plugin)
       // Disable built-in jsdoc verifier.

.github/workflows/appengine_deploy.yml

@@ -42,7 +42,7 @@ jobs:
           path: _deploy/
 
       - name: Deploy to App Engine
-        uses: google-github-actions/[email protected].0
+        uses: google-github-actions/[email protected].3
         # For parameters see:
         # https://github.com/google-github-actions/deploy-appengine#inputs
         with:

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
         # TODO (#2114): re-enable osx build.
         # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         # See supported Node.js release schedule at
         # https://nodejs.org/en/about/releases/
 
@@ -37,8 +37,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Npm Install
-        run: npm install
+      - name: Npm Clean Install
+        run: npm ci
 
       - name: Linux Test Setup
         if: runner.os == 'Linux'

.npmrc

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

.prettierrc.js

@@ -10,4 +10,6 @@ module.exports = {
   bracketSpacing: false,
   // Put HTML tag closing brackets on same line as last attribute.
   bracketSameLine: true,
+  // Organise imports using a plugin.
+  'plugins': ['prettier-plugin-organize-imports'],
 };

appengine/blockly_compressed.js

@@ -6,6 +6,6 @@ var msg = 'Compiled Blockly files should be loaded from https://unpkg.com/blockl
 console.log(msg);
 try {
   alert(msg);
-} catch (_e) {
+} catch {
   // Can't alert?  Probably node.js.
 }

blocks/blocks.ts

@@ -6,6 +6,7 @@
 
 // Former goog.module ID: Blockly.libraryBlocks
 
+import type {BlockDefinition} from '../core/blocks.js';
 import * as lists from './lists.js';
 import * as logic from './logic.js';
 import * as loops from './loops.js';
@@ -14,7 +15,6 @@ import * as procedures from './procedures.js';
 import * as texts from './text.js';
 import * as variables from './variables.js';
 import * as variablesDynamic from './variables_dynamic.js';
-import type {BlockDefinition} from '../core/blocks.js';
 
 export {
   lists,

blocks/lists.ts

@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.lists
 
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
-import type {Connection} from '../core/connection.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {FieldDropdown} from '../core/field_dropdown.js';
-import {Msg} from '../core/msg.js';
-import {MutatorIcon} from '../core/icons/mutator_icon.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import type {Connection} from '../core/connection.js';
 import '../core/field_dropdown.js';
+import type {FieldDropdown} from '../core/field_dropdown.js';
+import * as fieldRegistry from '../core/field_registry.js';
+import {MutatorIcon} from '../core/icons/mutator_icon.js';
+import {Align} from '../core/inputs/align.js';
 import {ValueInput} from '../core/inputs/value_input.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

blocks/logic.ts

@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.logic
 
-import * as Events from '../core/events/events.js';
-import * as Extensions from '../core/extensions.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {Connection} from '../core/connection.js';
-import {Msg} from '../core/msg.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import type {Connection} from '../core/connection.js';
+import * as Events from '../core/events/events.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/icons/mutator_icon.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

blocks/loops.ts

@@ -6,27 +6,27 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.loops
 
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import type {Block} from '../core/block.js';
+import {
+  createBlockDefinitionsFromJsonArray,
+  defineBlocks,
+} from '../core/common.js';
 import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
 import * as Events from '../core/events/events.js';
-import * as Extensions from '../core/extensions.js';
-import {Msg} from '../core/msg.js';
-import {
-  createBlockDefinitionsFromJsonArray,
-  defineBlocks,
-} from '../core/common.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import * as eventUtils from '../core/events/utils.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
 import '../core/field_variable.js';
-import '../core/icons/warning_icon.js';
 import {FieldVariable} from '../core/field_variable.js';
+import '../core/icons/warning_icon.js';
+import {Msg} from '../core/msg.js';
 import {WorkspaceSvg} from '../core/workspace_svg.js';
 
 /**

blocks/math.ts

@@ -6,18 +6,18 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.math
 
-import * as Extensions from '../core/extensions.js';
-import type {FieldDropdown} from '../core/field_dropdown.js';
-import * as xmlUtils from '../core/utils/xml.js';
 import type {Block} from '../core/block.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
+import type {FieldDropdown} from '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
 import '../core/field_variable.js';
+import * as xmlUtils from '../core/utils/xml.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

blocks/procedures.ts

@@ -6,40 +6,40 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.procedures
 
-import * as ContextMenu from '../core/contextmenu.js';
-import * as Events from '../core/events/events.js';
-import * as Procedures from '../core/procedures.js';
-import * as Variables from '../core/variables.js';
-import * as Xml from '../core/xml.js';
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {BlockCreate} from '../core/events/events_block_create.js';
-import type {BlockChange} from '../core/events/events_block_change.js';
 import type {BlockDefinition} from '../core/blocks.js';
+import * as common from '../core/common.js';
+import {defineBlocks} from '../core/common.js';
+import {config} from '../core/config.js';
 import type {Connection} from '../core/connection.js';
+import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as Events from '../core/events/events.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
+import type {BlockChange} from '../core/events/events_block_change.js';
+import type {BlockCreate} from '../core/events/events_block_create.js';
 import * as eventUtils from '../core/events/utils.js';
 import {FieldCheckbox} from '../core/field_checkbox.js';
 import {FieldLabel} from '../core/field_label.js';
+import * as fieldRegistry from '../core/field_registry.js';
 import {FieldTextInput} from '../core/field_textinput.js';
-import {Msg} from '../core/msg.js';
+import '../core/icons/comment_icon.js';
 import {MutatorIcon as Mutator} from '../core/icons/mutator_icon.js';
+import '../core/icons/warning_icon.js';
+import {Align} from '../core/inputs/align.js';
+import {Msg} from '../core/msg.js';
 import {Names} from '../core/names.js';
+import * as Procedures from '../core/procedures.js';
+import * as xmlUtils from '../core/utils/xml.js';
 import type {VariableModel} from '../core/variable_model.js';
+import * as Variables from '../core/variables.js';
 import type {Workspace} from '../core/workspace.js';
 import type {WorkspaceSvg} from '../core/workspace_svg.js';
-import {config} from '../core/config.js';
-import {defineBlocks} from '../core/common.js';
-import '../core/icons/comment_icon.js';
-import '../core/icons/warning_icon.js';
-import * as common from '../core/common.js';
+import * as Xml from '../core/xml.js';
 
 /** A dictionary of the block definitions provided by this module. */
 export const blocks: {[key: string]: BlockDefinition} = {};
@@ -1206,7 +1206,7 @@ blocks['procedures_callreturn'] = {
     this.appendDummyInput('TOPROW').appendField('', 'NAME');
     this.setOutput(true);
     this.setStyle('procedure_blocks');
-    // Tooltip is set in domToMutation.
+    // Tooltip is set in renameProcedure.
     this.setHelpUrl(Msg['PROCEDURES_CALLRETURN_HELPURL']);
     this.arguments_ = [];
     this.argumentVarModels_ = [];

blocks/text.ts

@@ -6,25 +6,25 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.texts
 
-import * as Extensions from '../core/extensions.js';
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import {Connection} from '../core/connection.js';
-import {FieldImage} from '../core/field_image.js';
-import {FieldDropdown} from '../core/field_dropdown.js';
-import {FieldTextInput} from '../core/field_textinput.js';
-import {Msg} from '../core/msg.js';
-import {MutatorIcon} from '../core/icons/mutator_icon.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import {Connection} from '../core/connection.js';
+import * as Extensions from '../core/extensions.js';
+import {FieldDropdown} from '../core/field_dropdown.js';
+import {FieldImage} from '../core/field_image.js';
+import * as fieldRegistry from '../core/field_registry.js';
+import {FieldTextInput} from '../core/field_textinput.js';
 import '../core/field_variable.js';
+import {MutatorIcon} from '../core/icons/mutator_icon.js';
+import {Align} from '../core/inputs/align.js';
 import {ValueInput} from '../core/inputs/value_input.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.
@@ -438,6 +438,11 @@ const PROMPT_COMMON = {
   domToMutation: function (this: PromptCommonBlock, xmlElement: Element) {
     this.updateType_(xmlElement.getAttribute('type')!);
   },
+
+  // These blocks do not need JSO serialization hooks (saveExtraState
+  // and loadExtraState) because the state of this object is already
+  // encoded in the dropdown values.
+  // XML hooks are kept for backwards compatibility.
 };
 
 blocks['text_prompt_ext'] = {
@@ -468,16 +473,11 @@ blocks['text_prompt_ext'] = {
         : Msg['TEXT_PROMPT_TOOLTIP_NUMBER'];
     });
   },
-
-  // This block does not need JSO serialization hooks (saveExtraState and
-  // loadExtraState) because the state of this object is already encoded in the
-  // dropdown values.
-  // XML hooks are kept for backwards compatibility.
 };
 
 type PromptBlock = Block & PromptCommonMixin & QuoteImageMixin;
 
-const TEXT_PROMPT_BLOCK = {
+blocks['text_prompt'] = {
   ...PROMPT_COMMON,
   /**
    * Block for prompt function (internal message).
@@ -520,8 +520,6 @@ const TEXT_PROMPT_BLOCK = {
   },
 };
 
-blocks['text_prompt'] = TEXT_PROMPT_BLOCK;
-
 blocks['text_count'] = {
   /**
    * Block for counting how many times one string appears within another string.
@@ -666,7 +664,7 @@ const QUOTE_IMAGE_MIXIN = {
    * closing double quote. The selected quote will be adapted for RTL blocks.
    *
    * @param open If the image should be open quote (“ in LTR).
-   *                       Otherwise, a closing quote is used (” in LTR).
+   *     Otherwise, a closing quote is used (” in LTR).
    * @returns The new field.
    */
   newQuote_: function (this: QuoteImageBlock, open: boolean): FieldImage {

blocks/variables.ts

@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.variables
 
-import * as ContextMenu from '../core/contextmenu.js';
-import * as Extensions from '../core/extensions.js';
-import * as Variables from '../core/variables.js';
 import type {Block} from '../core/block.js';
+import {
+  createBlockDefinitionsFromJsonArray,
+  defineBlocks,
+} from '../core/common.js';
+import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as Extensions from '../core/extensions.js';
+import '../core/field_label.js';
 import {FieldVariable} from '../core/field_variable.js';
 import {Msg} from '../core/msg.js';
+import * as Variables from '../core/variables.js';
 import type {WorkspaceSvg} from '../core/workspace_svg.js';
-import {
-  createBlockDefinitionsFromJsonArray,
-  defineBlocks,
-} from '../core/common.js';
-import '../core/field_label.js';
 
 /**
  * A dictionary of the block definitions provided by this module.