fix: tsc errors picked up from develop

blocks/blocks.js

@@ -22,8 +22,10 @@ const procedures = goog.require('Blockly.libraryBlocks.procedures');
 const texts = goog.require('Blockly.libraryBlocks.texts');
 const variables = goog.require('Blockly.libraryBlocks.variables');
 const variablesDynamic = goog.require('Blockly.libraryBlocks.variablesDynamic');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 
 
 exports.colour = colour;

blocks/colour.js

@@ -11,8 +11,10 @@
 
 goog.module('Blockly.libraryBlocks.colour');
 
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldColour');

blocks/lists.js

@@ -17,8 +17,10 @@ const Xml = goog.require('Blockly.Xml');
 const {Align} = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
 const {Msg} = goog.require('Blockly.Msg');

blocks/logic.js

@@ -19,8 +19,10 @@ const Extensions = goog.require('Blockly.Extensions');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {Msg} = goog.require('Blockly.Msg');
 const {Mutator} = goog.require('Blockly.Mutator');
 /* eslint-disable-next-line no-unused-vars */

blocks/loops.js

@@ -21,8 +21,10 @@ const Variables = goog.require('Blockly.Variables');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {Msg} = goog.require('Blockly.Msg');
 const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */

blocks/math.js

@@ -19,8 +19,10 @@ const FieldDropdown = goog.require('Blockly.FieldDropdown');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');

blocks/procedures.js

@@ -23,8 +23,10 @@ const xmlUtils = goog.require('Blockly.utils.xml');
 const {Align} = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {config} = goog.require('Blockly.config');
 /* eslint-disable-next-line no-unused-vars */
 const {FieldCheckbox} = goog.require('Blockly.FieldCheckbox');

blocks/text.js

@@ -19,8 +19,10 @@ const xmlUtils = goog.require('Blockly.utils.xml');
 const {Align} = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
 const {FieldImage} = goog.require('Blockly.FieldImage');

blocks/variables.js

@@ -18,8 +18,10 @@ const Variables = goog.require('Blockly.Variables');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {Msg} = goog.require('Blockly.Msg');
 const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */

blocks/variables_dynamic.js

@@ -20,8 +20,10 @@ const Variables = goog.require('Blockly.Variables');
 const xml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+// const {BlockDefinition} = goog.requireType('Blockly.blocks');
+// TODO (6248): Properly import the BlockDefinition type.
 /* eslint-disable-next-line no-unused-vars */
-const {BlockDefinition} = goog.requireType('Blockly.blocks');
+const BlockDefinition = Object;
 const {Msg} = goog.require('Blockly.Msg');
 const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
 /** @suppress {extraRequire} */

core/block.ts

@@ -16,11 +16,11 @@ import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.Block');
 
 // Unused import preserved for side-effects. Remove if unneeded.
-import './events/events_block_change';
+import './events/events_block_change.js';
 // Unused import preserved for side-effects. Remove if unneeded.
-import './events/events_block_create';
+import './events/events_block_create.js';
 // Unused import preserved for side-effects. Remove if unneeded.
-import './events/events_block_delete';
+import './events/events_block_delete.js';
 
 import {Blocks} from './blocks.js';
 /* eslint-disable-next-line no-unused-vars */

core/block_animations.ts

@@ -30,7 +30,7 @@ interface CloneRect {
 }  // eslint-disable-line no-unused-vars
 
 /** PID of disconnect UI animation.  There can only be one at a time. */
-let disconnectPid = 0;
+let disconnectPid: AnyDuringMigration = 0;
 
 /** SVG group of wobbling block.  There can only be one at a time. */
 // AnyDuringMigration because:  Type 'null' is not assignable to type 'Element'.

core/block_drag_surface.ts

@@ -122,7 +122,7 @@ export class BlockDragSurfaceSvg {
     const roundY = Math.round(y);
     this.childSurfaceXY_.x = roundX;
     this.childSurfaceXY_.y = roundY;
-    this.dragGroup_.setAttribute(
+    this.dragGroup_!.setAttribute(
         'transform',
         'translate(' + roundX + ',' + roundY + ') scale(' + scale + ')');
   }
@@ -132,12 +132,12 @@ export class BlockDragSurfaceSvg {
    * @private
    */
   translateSurfaceInternal_() {
-    let x = this.surfaceXY_.x;
-    let y = this.surfaceXY_.y;
+    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';
+    this.SVG_!.style.display = 'block';
 
     // AnyDuringMigration because:  Argument of type 'SVGElement | null' is not
     // assignable to parameter of type 'Element'.

core/block_dragger.ts

@@ -16,7 +16,7 @@ import * as goog from '../closure/goog/goog.js';
 goog.declareModuleId('Blockly.BlockDragger');
 
 // Unused import preserved for side-effects. Remove if unneeded.
-import './events/events_block_drag';
+import './events/events_block_drag.js';
 
 import * as blockAnimation from './block_animations.js';
 /* eslint-disable-next-line no-unused-vars */

core/block_svg.ts

@@ -17,11 +17,11 @@ goog.declareModuleId('Blockly.BlockSvg');
 
 /* eslint-disable-next-line no-unused-vars */
 // Unused import preserved for side-effects. Remove if unneeded.
-import './theme';
+import './theme.js';
 // Unused import preserved for side-effects. Remove if unneeded.
-import './events/events_selected';
+import './events/events_selected.js';
 // Unused import preserved for side-effects. Remove if unneeded.
-import './touch';
+import './touch.js';
 
 import {Block} from './block.js';
 import * as blockAnimations from './block_animations.js';
@@ -131,7 +131,8 @@ export class BlockSvg extends Block implements IASTNodeLocationSvg,
    */
   // AnyDuringMigration because:  Type 'null' is not assignable to type '{ [key:
   // string]: number; }'.
-  private warningTextDb_: {[key: string]: number} = null as AnyDuringMigration;
+  private warningTextDb_: {[key: string]: AnyDuringMigration} =
+      null as AnyDuringMigration;
 
   /** Block's mutator icon (if any). */
   mutator: Mutator|null = null;