chore: merge rc/v11.2.0 into rc/v12.0.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/deploy-appengine@v2.1.2
+        uses: google-github-actions/deploy-appengine@v2.1.4
         # For parameters see:
         # https://github.com/google-github-actions/deploy-appengine#inputs
         with:

.github/workflows/build.yml

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

.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.
@@ -412,6 +412,24 @@ const LISTS_GETINDEX = {
     this.appendDummyInput()
       .appendField(modeMenu, 'MODE')
       .appendField('', 'SPACE');
+    const menu = fieldRegistry.fromJson({
+      type: 'field_dropdown',
+      options: this.WHERE_OPTIONS,
+    }) as FieldDropdown;
+    menu.setValidator(
+      /** @param value The input value. */
+      function (this: FieldDropdown, value: string) {
+        const oldValue: string | null = this.getValue();
+        const oldAt = oldValue === 'FROM_START' || oldValue === 'FROM_END';
+        const newAt = value === 'FROM_START' || value === 'FROM_END';
+        if (newAt !== oldAt) {
+          const block = this.getSourceBlock() as GetIndexBlock;
+          block.updateAt_(newAt);
+        }
+        return undefined;
+      },
+    );
+    this.appendDummyInput().appendField(menu, 'WHERE');
     this.appendDummyInput('AT');
     if (Msg['LISTS_GET_INDEX_TAIL']) {
       this.appendDummyInput('TAIL').appendField(Msg['LISTS_GET_INDEX_TAIL']);
@@ -577,31 +595,6 @@ const LISTS_GETINDEX = {
     } else {
       this.appendDummyInput('AT');
     }
-    const menu = fieldRegistry.fromJson({
-      type: 'field_dropdown',
-      options: this.WHERE_OPTIONS,
-    }) as FieldDropdown;
-    menu.setValidator(
-      /**
-       * @param value The input value.
-       * @returns Null if the field has been replaced; otherwise undefined.
-       */
-      function (this: FieldDropdown, value: string) {
-        const newAt = value === 'FROM_START' || value === 'FROM_END';
-        // The 'isAt' variable is available due to this function being a
-        // closure.
-        if (newAt !== isAt) {
-          const block = this.getSourceBlock() as GetIndexBlock;
-          block.updateAt_(newAt);
-          // This menu has been destroyed and replaced.  Update the
-          // replacement.
-          block.setFieldValue(value, 'WHERE');
-          return null;
-        }
-        return undefined;
-      },
-    );
-    this.getInput('AT')!.appendField(menu, 'WHERE');
     if (Msg['LISTS_GET_INDEX_TAIL']) {
       this.moveInputBefore('TAIL', null);
     }
@@ -644,6 +637,24 @@ const LISTS_SETINDEX = {
     this.appendDummyInput()
       .appendField(operationDropdown, 'MODE')
       .appendField('', 'SPACE');
+    const menu = fieldRegistry.fromJson({
+      type: 'field_dropdown',
+      options: this.WHERE_OPTIONS,
+    }) as FieldDropdown;
+    menu.setValidator(
+      /** @param value The input value. */
+      function (this: FieldDropdown, value: string) {
+        const oldValue: string | null = this.getValue();
+        const oldAt = oldValue === 'FROM_START' || oldValue === 'FROM_END';
+        const newAt = value === 'FROM_START' || value === 'FROM_END';
+        if (newAt !== oldAt) {
+          const block = this.getSourceBlock() as SetIndexBlock;
+          block.updateAt_(newAt);
+        }
+        return undefined;
+      },
+    );
+    this.appendDummyInput().appendField(menu, 'WHERE');
     this.appendDummyInput('AT');
     this.appendValueInput('TO').appendField(Msg['LISTS_SET_INDEX_INPUT_TO']);
     this.setInputsInline(true);
@@ -756,36 +767,10 @@ const LISTS_SETINDEX = {
     } else {
       this.appendDummyInput('AT');
     }
-    const menu = fieldRegistry.fromJson({
-      type: 'field_dropdown',
-      options: this.WHERE_OPTIONS,
-    }) as FieldDropdown;
-    menu.setValidator(
-      /**
-       * @param value The input value.
-       * @returns Null if the field has been replaced; otherwise undefined.
-       */
-      function (this: FieldDropdown, value: string) {
-        const newAt = value === 'FROM_START' || value === 'FROM_END';
-        // The 'isAt' variable is available due to this function being a
-        // closure.
-        if (newAt !== isAt) {
-          const block = this.getSourceBlock() as SetIndexBlock;
-          block.updateAt_(newAt);
-          // This menu has been destroyed and replaced.  Update the
-          // replacement.
-          block.setFieldValue(value, 'WHERE');
-          return null;
-        }
-        return undefined;
-      },
-    );
     this.moveInputBefore('AT', 'TO');
     if (this.getInput('ORDINAL')) {
       this.moveInputBefore('ORDINAL', 'TO');
     }
-
-    this.getInput('AT')!.appendField(menu, 'WHERE');
   },
 };
 blocks['lists_setIndex'] = LISTS_SETINDEX;
@@ -818,7 +803,30 @@ const LISTS_GETSUBLIST = {
     this.appendValueInput('LIST')
       .setCheck('Array')
       .appendField(Msg['LISTS_GET_SUBLIST_INPUT_IN_LIST']);
+    const createMenu = (n: 1 | 2): FieldDropdown => {
+      const menu = fieldRegistry.fromJson({
+        type: 'field_dropdown',
+        options:
+          this[('WHERE_OPTIONS_' + n) as 'WHERE_OPTIONS_1' | 'WHERE_OPTIONS_2'],
+      }) as FieldDropdown;
+      menu.setValidator(
+        /** @param value The input value. */
+        function (this: FieldDropdown, value: string) {
+          const oldValue: string | null = this.getValue();
+          const oldAt = oldValue === 'FROM_START' || oldValue === 'FROM_END';
+          const newAt = value === 'FROM_START' || value === 'FROM_END';
+          if (newAt !== oldAt) {
+            const block = this.getSourceBlock() as GetSublistBlock;
+            block.updateAt_(n, newAt);
+          }
+          return undefined;
+        },
+      );
+      return menu;
+    };
+    this.appendDummyInput('WHERE1_INPUT').appendField(createMenu(1), 'WHERE1');
     this.appendDummyInput('AT1');
+    this.appendDummyInput('WHERE2_INPUT').appendField(createMenu(2), 'WHERE2');
     this.appendDummyInput('AT2');
     if (Msg['LISTS_GET_SUBLIST_TAIL']) {
       this.appendDummyInput('TAIL').appendField(Msg['LISTS_GET_SUBLIST_TAIL']);
@@ -896,35 +904,10 @@ const LISTS_GETSUBLIST = {
     } else {
       this.appendDummyInput('AT' + n);
     }
-    const menu = fieldRegistry.fromJson({
-      type: 'field_dropdown',
-      options:
-        this[('WHERE_OPTIONS_' + n) as 'WHERE_OPTIONS_1' | 'WHERE_OPTIONS_2'],
-    }) as FieldDropdown;
-    menu.setValidator(
-      /**
-       * @param value The input value.
-       * @returns Null if the field has been replaced; otherwise undefined.
-       */
-      function (this: FieldDropdown, value: string) {
-        const newAt = value === 'FROM_START' || value === 'FROM_END';
-        // The 'isAt' variable is available due to this function being a
-        // closure.
-        if (newAt !== isAt) {
-          const block = this.getSourceBlock() as GetSublistBlock;
-          block.updateAt_(n, newAt);
-          // This menu has been destroyed and replaced.
-          // Update the replacement.
-          block.setFieldValue(value, 'WHERE' + n);
-          return null;
-        }
-      },
-    );
-    this.getInput('AT' + n)!.appendField(menu, 'WHERE' + n);
     if (n === 1) {
-      this.moveInputBefore('AT1', 'AT2');
+      this.moveInputBefore('AT1', 'WHERE2_INPUT');
       if (this.getInput('ORDINAL1')) {
-        this.moveInputBefore('ORDINAL1', 'AT2');
+        this.moveInputBefore('ORDINAL1', 'WHERE2_INPUT');
       }
     }
     if (Msg['LISTS_GET_SUBLIST_TAIL']) {

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.