refactor: Migrate to named exports (#5623)

* refactor: Migrate to named exports

* fix: Sort requires

* fix: Remove duplicate deps

core/block.js

@@ -17,37 +17,37 @@ goog.module('Blockly.Block');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const Comment = goog.requireType('Blockly.Comment');
-const Connection = goog.require('Blockly.Connection');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Extensions = goog.require('Blockly.Extensions');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
-/* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
-const Input = goog.require('Blockly.Input');
-/* eslint-disable-next-line no-unused-vars */
-const Mutator = goog.requireType('Blockly.Mutator');
-const Size = goog.require('Blockly.utils.Size');
 const Tooltip = goog.require('Blockly.Tooltip');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const common = goog.require('Blockly.common');
 const constants = goog.require('Blockly.constants');
 const eventUtils = goog.require('Blockly.Events.utils');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
-const inputTypes = goog.require('Blockly.inputTypes');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 const {Blocks} = goog.require('Blockly.blocks');
+/* eslint-disable-next-line no-unused-vars */
+const {Comment} = goog.requireType('Blockly.Comment');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+const {Connection} = goog.require('Blockly.Connection');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeletable} = goog.require('Blockly.IDeletable');
+const {Input} = goog.require('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const {Mutator} = goog.requireType('Blockly.Mutator');
+const {Size} = goog.require('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
+const {inputTypes} = goog.require('Blockly.inputTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -73,7 +73,7 @@ goog.require('Blockly.Events.BlockMove');
  * @alias Blockly.Block
  */
 const Block = function(workspace, prototypeName, opt_id) {
-  const Generator = goog.module.get('Blockly.Generator');
+  const {Generator} = goog.module.get('Blockly.Generator');
   if (Generator && typeof Generator.prototype[prototypeName] !== 'undefined') {
     // Occluding Generator class members is not allowed.
     throw Error(

core/block_animations.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.blockAnimations');
 
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**

core/block_drag_surface.js

@@ -26,10 +26,10 @@
  */
 goog.module('Blockly.BlockDragSurfaceSvg');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 const utils = goog.require('Blockly.utils');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**

core/block_dragger.js

@@ -15,14 +15,6 @@
  */
 goog.module('Blockly.BlockDragger');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IBlockDragger = goog.require('Blockly.IBlockDragger');
-/* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimation = goog.require('Blockly.blockAnimations');
 const bumpObjects = goog.require('Blockly.bumpObjects');
 const common = goog.require('Blockly.common');
@@ -31,6 +23,14 @@ const eventUtils = goog.require('Blockly.Events.utils');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IBlockDragger} = goog.require('Blockly.IBlockDragger');
+/* eslint-disable-next-line no-unused-vars */
+const {IDragTarget} = goog.requireType('Blockly.IDragTarget');
+const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockDrag');
 /** @suppress {extraRequire} */

core/block_svg.js

@@ -15,46 +15,9 @@
  */
 goog.module('Blockly.BlockSvg');
 
-/* eslint-disable-next-line no-unused-vars */
-const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug');
-/* eslint-disable-next-line no-unused-vars */
-const Comment = goog.requireType('Blockly.Comment');
-/* eslint-disable-next-line no-unused-vars */
-const Connection = goog.requireType('Blockly.Connection');
 const ContextMenu = goog.require('Blockly.ContextMenu');
-const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-const FieldLabel = goog.require('Blockly.FieldLabel');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
-/* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
-/* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
-/* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
-/* eslint-disable-next-line no-unused-vars */
-const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
-/* eslint-disable-next-line no-unused-vars */
-const Icon = goog.requireType('Blockly.Icon');
-/* eslint-disable-next-line no-unused-vars */
-const Input = goog.requireType('Blockly.Input');
-const MarkerManager = goog.require('Blockly.MarkerManager');
 const Msg = goog.require('Blockly.Msg');
-/* eslint-disable-next-line no-unused-vars */
-const Mutator = goog.requireType('Blockly.Mutator');
-const Rect = goog.require('Blockly.utils.Rect');
-const RenderedConnection = goog.require('Blockly.RenderedConnection');
-const Svg = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const Theme = goog.requireType('Blockly.Theme');
 const Tooltip = goog.require('Blockly.Tooltip');
-/* eslint-disable-next-line no-unused-vars */
-const Warning = goog.requireType('Blockly.Warning');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -68,8 +31,45 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 const {Block} = goog.require('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {Comment} = goog.requireType('Blockly.Comment');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+/* eslint-disable-next-line no-unused-vars */
+const {Connection} = goog.requireType('Blockly.Connection');
+const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {Debug: BlockRenderingDebug} = goog.requireType('Blockly.blockRendering.Debug');
+const {FieldLabel} = goog.require('Blockly.FieldLabel');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {IBoundedElement} = goog.require('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const {ICopyable} = goog.require('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const {IDraggable} = goog.require('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const {IPathObject} = goog.requireType('Blockly.blockRendering.IPathObject');
+/* eslint-disable-next-line no-unused-vars */
+const {Icon} = goog.requireType('Blockly.Icon');
+/* eslint-disable-next-line no-unused-vars */
+const {Input} = goog.requireType('Blockly.Input');
+const {MarkerManager} = goog.require('Blockly.MarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const {Mutator} = goog.requireType('Blockly.Mutator');
+const {Rect} = goog.require('Blockly.utils.Rect');
+const {RenderedConnection} = goog.require('Blockly.RenderedConnection');
+const {Svg} = goog.require('Blockly.utils.Svg');
 const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
+/* eslint-disable-next-line no-unused-vars */
+const {Theme} = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const {Warning} = goog.requireType('Blockly.Warning');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
@@ -1028,7 +1028,7 @@ BlockSvg.prototype.getCommentIcon = function() {
  * @param {?string} text The text, or null to delete.
  */
 BlockSvg.prototype.setCommentText = function(text) {
-  const Comment = goog.module.get('Blockly.Comment');
+  const {Comment} = goog.module.get('Blockly.Comment');
   if (!Comment) {
     throw Error('Missing require for Blockly.Comment');
   }
@@ -1066,7 +1066,7 @@ BlockSvg.prototype.setCommentText = function(text) {
  *     maintain multiple warnings.
  */
 BlockSvg.prototype.setWarningText = function(text, opt_id) {
-  const Warning = goog.module.get('Blockly.Warning');
+  const {Warning} = goog.module.get('Blockly.Warning');
   if (!Warning) {
     throw Error('Missing require for Blockly.Warning');
   }

core/blockly.js

@@ -16,117 +16,22 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
-const BlocklyOptions = goog.require('Blockly.BlocklyOptions');
-const Bubble = goog.require('Blockly.Bubble');
-const BubbleDragger = goog.require('Blockly.BubbleDragger');
-const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
-const Comment = goog.require('Blockly.Comment');
-const ComponentManager = goog.require('Blockly.ComponentManager');
-const ConnectionChecker = goog.require('Blockly.ConnectionChecker');
-const ConnectionDB = goog.require('Blockly.ConnectionDB');
-const Connection = goog.require('Blockly.Connection');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const ContextMenuItems = goog.require('Blockly.ContextMenuItems');
-const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
 const Css = goog.require('Blockly.Css');
-const DeleteArea = goog.require('Blockly.DeleteArea');
-const DragTarget = goog.require('Blockly.DragTarget');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
 const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
-const Field = goog.require('Blockly.Field');
-const FieldAngle = goog.require('Blockly.FieldAngle');
-const FieldCheckbox = goog.require('Blockly.FieldCheckbox');
-const FieldColour = goog.require('Blockly.FieldColour');
-const FieldDropdown = goog.require('Blockly.FieldDropdown');
-const FieldImage = goog.require('Blockly.FieldImage');
-const FieldLabel = goog.require('Blockly.FieldLabel');
-const FieldLabelSerializable = goog.require('Blockly.FieldLabelSerializable');
-const FieldMultilineInput = goog.require('Blockly.FieldMultilineInput');
-const FieldNumber = goog.require('Blockly.FieldNumber');
-const FieldTextInput = goog.require('Blockly.FieldTextInput');
-const FieldVariable = goog.require('Blockly.FieldVariable');
-const Flyout = goog.require('Blockly.Flyout');
-const FlyoutButton = goog.require('Blockly.FlyoutButton');
-const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager');
-const Generator = goog.require('Blockly.Generator');
-const Gesture = goog.require('Blockly.Gesture');
-const Grid = goog.require('Blockly.Grid');
-const HorizontalFlyout = goog.require('Blockly.HorizontalFlyout');
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
-const IAutoHideable = goog.require('Blockly.IAutoHideable');
-const IBlockDragger = goog.require('Blockly.IBlockDragger');
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
-const IBubble = goog.require('Blockly.IBubble');
-const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
-const IComponent = goog.require('Blockly.IComponent');
-const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
-const IContextMenu = goog.require('Blockly.IContextMenu');
-const Icon = goog.require('Blockly.Icon');
-const ICopyable = goog.require('Blockly.ICopyable');
-const IDeletable = goog.require('Blockly.IDeletable');
-const IDeleteArea = goog.require('Blockly.IDeleteArea');
-const IDragTarget = goog.require('Blockly.IDragTarget');
-const IDraggable = goog.require('Blockly.IDraggable');
-const IFlyout = goog.require('Blockly.IFlyout');
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
-const IMetricsManager = goog.require('Blockly.IMetricsManager');
-const IMovable = goog.require('Blockly.IMovable');
-const Input = goog.require('Blockly.Input');
-const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
-const IPositionable = goog.require('Blockly.IPositionable');
-const IRegistrable = goog.require('Blockly.IRegistrable');
-const IRegistrableField = goog.require('Blockly.IRegistrableField');
-const ISelectable = goog.require('Blockly.ISelectable');
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
-const IStyleable = goog.require('Blockly.IStyleable');
-const IToolbox = goog.require('Blockly.IToolbox');
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
 const Marker = goog.require('Blockly.Marker');
-const MarkerManager = goog.require('Blockly.MarkerManager');
-const Menu = goog.require('Blockly.Menu');
-const MenuItem = goog.require('Blockly.MenuItem');
-const MetricsManager = goog.require('Blockly.MetricsManager');
-const Mutator = goog.require('Blockly.Mutator');
-const Names = goog.require('Blockly.Names');
-const Options = goog.require('Blockly.Options');
 const Procedures = goog.require('Blockly.Procedures');
-const RenderedConnection = goog.require('Blockly.RenderedConnection');
-const Scrollbar = goog.require('Blockly.Scrollbar');
-const ScrollbarPair = goog.require('Blockly.ScrollbarPair');
 const ShortcutItems = goog.require('Blockly.ShortcutItems');
-const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
-const Size = goog.require('Blockly.utils.Size');
 const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor');
-const Theme = goog.require('Blockly.Theme');
 const Themes = goog.require('Blockly.Themes');
-const ThemeManager = goog.require('Blockly.ThemeManager');
-const Toolbox = goog.require('Blockly.Toolbox');
-const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
-const ToolboxItem = goog.require('Blockly.ToolboxItem');
-const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
-const TouchGesture = goog.require('Blockly.TouchGesture');
-const Trashcan = goog.require('Blockly.Trashcan');
-const VariableMap = goog.require('Blockly.VariableMap');
-const VariableModel = goog.require('Blockly.VariableModel');
 const Variables = goog.require('Blockly.Variables');
 const VariablesDynamic = goog.require('Blockly.VariablesDynamic');
-const VerticalFlyout = goog.require('Blockly.VerticalFlyout');
-const Warning = goog.require('Blockly.Warning');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
-const Workspace = goog.require('Blockly.Workspace');
-const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio');
-const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
-const WorkspaceCommentSvg = goog.require('Blockly.WorkspaceCommentSvg');
-const WorkspaceDragSurfaceSvg = goog.require('Blockly.WorkspaceDragSurfaceSvg');
-const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger');
-const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
-const ZoomControls = goog.require('Blockly.ZoomControls');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const blockRendering = goog.require('Blockly.blockRendering');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -139,8 +44,6 @@ const deprecation = goog.require('Blockly.utils.deprecation');
 const dialog = goog.require('Blockly.dialog');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const geras = goog.require('Blockly.geras');
-const inject = goog.require('Blockly.inject');
-const inputTypes = goog.require('Blockly.inputTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
 const minimalist = goog.require('Blockly.minimalist');
 const registry = goog.require('Blockly.registry');
@@ -151,14 +54,111 @@ const utils = goog.require('Blockly.utils');
 const zelos = goog.require('Blockly.zelos');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 const {BasicCursor} = goog.require('Blockly.BasicCursor');
-const {Block} = goog.require('Blockly.Block');
-const {BlockDragger} = goog.require('Blockly.BlockDragger');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
+const {BlockDragger} = goog.require('Blockly.BlockDragger');
 const {BlockSvg} = goog.require('Blockly.BlockSvg');
+const {BlocklyOptions} = goog.require('Blockly.BlocklyOptions');
 const {Blocks} = goog.require('Blockly.blocks');
+const {Block} = goog.require('Blockly.Block');
+const {BubbleDragger} = goog.require('Blockly.BubbleDragger');
+const {Bubble} = goog.require('Blockly.Bubble');
+const {CollapsibleToolboxCategory} = goog.require('Blockly.CollapsibleToolboxCategory');
+const {Comment} = goog.require('Blockly.Comment');
+const {ComponentManager} = goog.require('Blockly.ComponentManager');
+const {ConnectionChecker} = goog.require('Blockly.ConnectionChecker');
+const {ConnectionDB} = goog.require('Blockly.ConnectionDB');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+const {Connection} = goog.require('Blockly.Connection');
+const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry');
 const {Cursor} = goog.require('Blockly.Cursor');
+const {DeleteArea} = goog.require('Blockly.DeleteArea');
+const {DragTarget} = goog.require('Blockly.DragTarget');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {FieldAngle} = goog.require('Blockly.FieldAngle');
+const {FieldCheckbox} = goog.require('Blockly.FieldCheckbox');
+const {FieldColour} = goog.require('Blockly.FieldColour');
+const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
+const {FieldImage} = goog.require('Blockly.FieldImage');
+const {FieldLabelSerializable} = goog.require('Blockly.FieldLabelSerializable');
+const {FieldLabel} = goog.require('Blockly.FieldLabel');
+const {FieldMultilineInput} = goog.require('Blockly.FieldMultilineInput');
+const {FieldNumber} = goog.require('Blockly.FieldNumber');
+const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
+const {FieldVariable} = goog.require('Blockly.FieldVariable');
+const {Field} = goog.require('Blockly.Field');
+const {FlyoutButton} = goog.require('Blockly.FlyoutButton');
+const {FlyoutMetricsManager} = goog.require('Blockly.FlyoutMetricsManager');
+const {Flyout} = goog.require('Blockly.Flyout');
+const {Generator} = goog.require('Blockly.Generator');
+const {Gesture} = goog.require('Blockly.Gesture');
+const {Grid} = goog.require('Blockly.Grid');
+const {HorizontalFlyout} = goog.require('Blockly.HorizontalFlyout');
+const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg');
+const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock');
+const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
+const {IAutoHideable} = goog.require('Blockly.IAutoHideable');
+const {IBlockDragger} = goog.require('Blockly.IBlockDragger');
+const {IBoundedElement} = goog.require('Blockly.IBoundedElement');
+const {IBubble} = goog.require('Blockly.IBubble');
+const {ICollapsibleToolboxItem} = goog.require('Blockly.ICollapsibleToolboxItem');
+const {IComponent} = goog.require('Blockly.IComponent');
+const {IConnectionChecker} = goog.require('Blockly.IConnectionChecker');
+const {IContextMenu} = goog.require('Blockly.IContextMenu');
+const {ICopyable} = goog.require('Blockly.ICopyable');
+const {IDeletable} = goog.require('Blockly.IDeletable');
+const {IDeleteArea} = goog.require('Blockly.IDeleteArea');
+const {IDragTarget} = goog.require('Blockly.IDragTarget');
+const {IDraggable} = goog.require('Blockly.IDraggable');
+const {IFlyout} = goog.require('Blockly.IFlyout');
+const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible');
+const {IMetricsManager} = goog.require('Blockly.IMetricsManager');
+const {IMovable} = goog.require('Blockly.IMovable');
+const {IPositionable} = goog.require('Blockly.IPositionable');
+const {IRegistrableField} = goog.require('Blockly.IRegistrableField');
+const {IRegistrable} = goog.require('Blockly.IRegistrable');
+const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem');
+const {ISelectable} = goog.require('Blockly.ISelectable');
+const {IStyleable} = goog.require('Blockly.IStyleable');
+const {IToolboxItem} = goog.require('Blockly.IToolboxItem');
+const {IToolbox} = goog.require('Blockly.IToolbox');
+const {Icon} = goog.require('Blockly.Icon');
+const {Input} = goog.require('Blockly.Input');
+const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager');
+const {MarkerManager} = goog.require('Blockly.MarkerManager');
+const {MenuItem} = goog.require('Blockly.MenuItem');
+const {Menu} = goog.require('Blockly.Menu');
+const {MetricsManager} = goog.require('Blockly.MetricsManager');
+const {Mutator} = goog.require('Blockly.Mutator');
+const {Names} = goog.require('Blockly.Names');
+const {Options} = goog.require('Blockly.Options');
+const {RenderedConnection} = goog.require('Blockly.RenderedConnection');
+const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair');
+const {Scrollbar} = goog.require('Blockly.Scrollbar');
+const {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry');
+const {Size} = goog.require('Blockly.utils.Size');
+const {ThemeManager} = goog.require('Blockly.ThemeManager');
+const {Theme} = goog.require('Blockly.Theme');
+const {ToolboxCategory} = goog.require('Blockly.ToolboxCategory');
+const {ToolboxItem} = goog.require('Blockly.ToolboxItem');
+const {ToolboxSeparator} = goog.require('Blockly.ToolboxSeparator');
+const {Toolbox} = goog.require('Blockly.Toolbox');
+const {TouchGesture} = goog.require('Blockly.TouchGesture');
+const {Trashcan} = goog.require('Blockly.Trashcan');
+const {VariableMap} = goog.require('Blockly.VariableMap');
+const {VariableModel} = goog.require('Blockly.VariableModel');
+const {VerticalFlyout} = goog.require('Blockly.VerticalFlyout');
+const {Warning} = goog.require('Blockly.Warning');
+const {WorkspaceAudio} = goog.require('Blockly.WorkspaceAudio');
+const {WorkspaceCommentSvg} = goog.require('Blockly.WorkspaceCommentSvg');
+const {WorkspaceComment} = goog.require('Blockly.WorkspaceComment');
+const {WorkspaceDragSurfaceSvg} = goog.require('Blockly.WorkspaceDragSurfaceSvg');
+const {WorkspaceDragger} = goog.require('Blockly.WorkspaceDragger');
+const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg');
+const {Workspace} = goog.require('Blockly.Workspace');
+const {ZoomControls} = goog.require('Blockly.ZoomControls');
 const {globalThis} = goog.require('Blockly.utils.global');
+const {inject} = goog.require('Blockly.inject');
+const {inputTypes} = goog.require('Blockly.inputTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -169,16 +169,6 @@ goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Events.UiBase');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
-/** @suppress {extraRequire} */
-goog.require('Blockly.inject');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Procedures');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Touch');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Variables');
-/** @suppress {extraRequire} */
-goog.require('Blockly.Xml');
 
 
 /**

core/blockly_options.js

@@ -25,4 +25,4 @@ goog.module('Blockly.BlocklyOptions');
  */
 const BlocklyOptions = function() {};
 
-exports = BlocklyOptions;
+exports.BlocklyOptions = BlocklyOptions;

core/browser_events.js

@@ -16,9 +16,9 @@
 goog.module('Blockly.browserEvents');
 
 const Touch = goog.require('Blockly.Touch');
-const {globalThis} = goog.require('Blockly.utils.global');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
+const {globalThis} = goog.require('Blockly.utils.global');
 
 
 /**

core/bubble.js

@@ -15,17 +15,7 @@
  */
 goog.module('Blockly.Bubble');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IBubble = goog.require('Blockly.IBubble');
-/* eslint-disable-next-line no-unused-vars */
-const MetricsManager = goog.requireType('Blockly.MetricsManager');
-const Scrollbar = goog.require('Blockly.Scrollbar');
-const Size = goog.require('Blockly.utils.Size');
-const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const math = goog.require('Blockly.utils.math');
@@ -34,6 +24,16 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IBubble} = goog.require('Blockly.IBubble');
+/* eslint-disable-next-line no-unused-vars */
+const {MetricsManager} = goog.requireType('Blockly.MetricsManager');
+const {Scrollbar} = goog.require('Blockly.Scrollbar');
+const {Size} = goog.require('Blockly.utils.Size');
+const {Svg} = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Workspace');
 
@@ -938,4 +938,4 @@ Bubble.createNonEditableBubble = function(paragraphElement, block, iconXY) {
   return bubble;
 };
 
-exports = Bubble;
+exports.Bubble = Bubble;

core/bubble_dragger.js

@@ -15,22 +15,22 @@
  */
 goog.module('Blockly.BubbleDragger');
 
-const ComponentManager = goog.require('Blockly.ComponentManager');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IBubble = goog.requireType('Blockly.IBubble');
-/* eslint-disable-next-line no-unused-vars */
-const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
-/* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const eventUtils = goog.require('Blockly.Events.utils');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const {ComponentManager} = goog.require('Blockly.ComponentManager');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IBubble} = goog.requireType('Blockly.IBubble');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const {IDragTarget} = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Bubble');
 /** @suppress {extraRequire} */
@@ -288,4 +288,4 @@ BubbleDragger.prototype.moveToDragSurface_ = function() {
   this.dragSurface_.setBlocksAndShow(this.draggingBubble_.getSvgRoot());
 };
 
-exports = BubbleDragger;
+exports.BubbleDragger = BubbleDragger;

core/bump_objects.js

@@ -17,20 +17,20 @@ goog.module('Blockly.bumpObjects');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
-/* eslint-disable-next-line no-unused-vars */
-const MetricsManager = goog.requireType('Blockly.MetricsManager');
-/* eslint-disable-next-line no-unused-vars */
-const ViewportChange = goog.requireType('Blockly.Events.ViewportChange');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const eventUtils = goog.require('Blockly.Events.utils');
 const mathUtils = goog.require('Blockly.utils.math');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {IBoundedElement} = goog.requireType('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const {MetricsManager} = goog.requireType('Blockly.MetricsManager');
+/* eslint-disable-next-line no-unused-vars */
+const {ViewportChange} = goog.requireType('Blockly.Events.ViewportChange');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**

core/clipboard.js

@@ -15,9 +15,9 @@
  */
 goog.module('Blockly.clipboard');
 
-/* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.requireType('Blockly.ICopyable');
 const eventUtils = goog.require('Blockly.Events.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {ICopyable} = goog.requireType('Blockly.ICopyable');
 
 
 /**

core/comment.js

@@ -15,25 +15,25 @@
  */
 goog.module('Blockly.Comment');
 
-const Bubble = goog.require('Blockly.Bubble');
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
-const Icon = goog.require('Blockly.Icon');
-/* eslint-disable-next-line no-unused-vars */
-const Size = goog.requireType('Blockly.utils.Size');
-const Svg = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
 /* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
+const {Bubble} = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+const {Icon} = goog.require('Blockly.Icon');
+/* eslint-disable-next-line no-unused-vars */
+const {Size} = goog.requireType('Blockly.utils.Size');
+const {Svg} = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -414,4 +414,4 @@ Css.register(`
   }
 `);
 
-exports = Comment;
+exports.Comment = Comment;

core/common.js

@@ -18,13 +18,13 @@
 goog.module('Blockly.common');
 
 /* eslint-disable-next-line no-unused-vars */
-const Connection = goog.requireType('Blockly.Connection');
+const {Connection} = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.requireType('Blockly.ICopyable');
+const {ICopyable} = goog.requireType('Blockly.ICopyable');
 /* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**

core/component_manager.js

@@ -16,17 +16,17 @@
  */
 goog.module('Blockly.ComponentManager');
 
-/* eslint-disable-next-line no-unused-vars */
-const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
-/* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.requireType('Blockly.IComponent');
-/* eslint-disable-next-line no-unused-vars */
-const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
-/* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-/* eslint-disable-next-line no-unused-vars */
-const IPositionable = goog.requireType('Blockly.IPositionable');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const {IAutoHideable} = goog.requireType('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
+const {IComponent} = goog.requireType('Blockly.IComponent');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const {IDragTarget} = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const {IPositionable} = goog.requireType('Blockly.IPositionable');
 
 
 /**
@@ -253,4 +253,4 @@ ComponentManager.Capability.DELETE_AREA =
 ComponentManager.Capability.AUTOHIDEABLE =
     new ComponentManager.Capability('autohideable');
 
-exports = ComponentManager;
+exports.ComponentManager = ComponentManager;

core/connection.js

@@ -15,12 +15,6 @@
  */
 goog.module('Blockly.Connection');
 
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
-/* eslint-disable-next-line no-unused-vars */
-const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
-/* eslint-disable-next-line no-unused-vars */
-const Input = goog.requireType('Blockly.Input');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const deprecation = goog.require('Blockly.utils.deprecation');
@@ -28,10 +22,16 @@ const eventUtils = goog.require('Blockly.Events.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock');
+/* eslint-disable-next-line no-unused-vars */
+const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker');
+/* eslint-disable-next-line no-unused-vars */
+const {Input} = goog.requireType('Blockly.Input');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
+/** @suppress {extraRequire} */
+goog.require('Blockly.constants');
 
 
 /**
@@ -808,4 +808,4 @@ Connection.prototype.serializeShadow_ = function(shadow) {
   this.shadowState_ = blocks.save(shadow);
 };
 
-exports = Connection;
+exports.Connection = Connection;

core/connection_checker.js

@@ -17,15 +17,15 @@
  */
 goog.module('Blockly.ConnectionChecker');
 
-const Connection = goog.require('Blockly.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
-/* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const common = goog.require('Blockly.common');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+const {Connection} = goog.require('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const {IConnectionChecker} = goog.require('Blockly.IConnectionChecker');
+/* eslint-disable-next-line no-unused-vars */
+const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
 
 
 /**
@@ -290,4 +290,4 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
 registry.register(
     registry.Type.CONNECTION_CHECKER, registry.DEFAULT, ConnectionChecker);
 
-exports = ConnectionChecker;
+exports.ConnectionChecker = ConnectionChecker;

core/connection_db.js

@@ -19,13 +19,13 @@
  */
 goog.module('Blockly.ConnectionDB');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
-/* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker');
+/* eslint-disable-next-line no-unused-vars */
+const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 
@@ -306,4 +306,4 @@ ConnectionDB.init = function(checker) {
   return dbList;
 };
 
-exports = ConnectionDB;
+exports.ConnectionDB = ConnectionDB;

core/contextmenu.js

@@ -15,13 +15,7 @@
  */
 goog.module('Blockly.ContextMenu');
 
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Menu = goog.require('Blockly.Menu');
-const MenuItem = goog.require('Blockly.MenuItem');
 const Msg = goog.require('Blockly.Msg');
-const Rect = goog.require('Blockly.utils.Rect');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const Xml = goog.require('Blockly.Xml');
 const aria = goog.require('Blockly.utils.aria');
@@ -35,8 +29,14 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {MenuItem} = goog.require('Blockly.MenuItem');
+const {Menu} = goog.require('Blockly.Menu');
+const {Rect} = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
-const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
+const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 

core/contextmenu_items.js

@@ -15,19 +15,19 @@
  */
 goog.module('Blockly.ContextMenuItems');
 
-const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
 const Events = goog.require('Blockly.Events');
 const Msg = goog.require('Blockly.Msg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const clipboard = goog.require('Blockly.clipboard');
 const dialog = goog.require('Blockly.dialog');
 const eventUtils = goog.require('Blockly.Events.utils');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
-const inputTypes = goog.require('Blockly.inputTypes');
 const userAgent = goog.require('Blockly.utils.userAgent');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
+const {inputTypes} = goog.require('Blockly.inputTypes');
 
 
 /**

core/contextmenu_registry.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.ContextMenuRegistry');
 
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -171,4 +171,4 @@ ContextMenuRegistry.prototype.getContextMenuOptions = function(
 // Creates and assigns the singleton instance.
 new ContextMenuRegistry();
 
-exports = ContextMenuRegistry;
+exports.ContextMenuRegistry = ContextMenuRegistry;

core/delete_area.js

@@ -18,13 +18,13 @@
  */
 goog.module('Blockly.DeleteArea');
 
-const DragTarget = goog.require('Blockly.DragTarget');
-/* eslint-disable-next-line no-unused-vars */
-const IDeleteArea = goog.require('Blockly.IDeleteArea');
-/* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.requireType('Blockly.IDraggable');
 const object = goog.require('Blockly.utils.object');
 const {BlockSvg} = goog.require('Blockly.BlockSvg');
+const {DragTarget} = goog.require('Blockly.DragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeleteArea} = goog.require('Blockly.IDeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const {IDraggable} = goog.requireType('Blockly.IDraggable');
 
 
 /**
@@ -81,4 +81,4 @@ DeleteArea.prototype.updateWouldDelete_ = function(wouldDelete) {
   this.wouldDelete_ = wouldDelete;
 };
 
-exports = DeleteArea;
+exports.DeleteArea = DeleteArea;

core/drag_target.js

@@ -19,11 +19,11 @@
 goog.module('Blockly.DragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const {IDragTarget} = goog.require('Blockly.IDragTarget');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.requireType('Blockly.IDraggable');
+const {IDraggable} = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const Rect = goog.requireType('Blockly.utils.Rect');
+const {Rect} = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -94,4 +94,4 @@ DragTarget.prototype.shouldPreventMove = function(_dragElement) {
   return false;
 };
 
-exports = DragTarget;
+exports.DragTarget = DragTarget;

core/dropdowndiv.js

@@ -18,19 +18,19 @@
  */
 goog.module('Blockly.DropDownDiv');
 
-const Rect = goog.require('Blockly.utils.Rect');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const Size = goog.requireType('Blockly.utils.Size');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const math = goog.require('Blockly.utils.math');
 const style = goog.require('Blockly.utils.style');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+const {Rect} = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const {Size} = goog.requireType('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -759,6 +759,7 @@ DropDownDiv.repositionForWindowResize = function() {
     DropDownDiv.hide();
   }
 };
-exports = DropDownDiv;
 
-exports.TEST_ONLY = internal;
+DropDownDiv.TEST_ONLY = internal;
+
+exports.DropDownDiv = DropDownDiv;

core/events/events.js

@@ -16,34 +16,34 @@
 goog.module('Blockly.Events');
 
 const Abstract = goog.require('Blockly.Events.Abstract');
-const BlockBase = goog.require('Blockly.Events.BlockBase');
-const BlockChange = goog.require('Blockly.Events.BlockChange');
-const BlockCreate = goog.require('Blockly.Events.BlockCreate');
-const BlockDelete = goog.require('Blockly.Events.BlockDelete');
-const BlockDrag = goog.require('Blockly.Events.BlockDrag');
-const BlockMove = goog.require('Blockly.Events.BlockMove');
-const BubbleOpen = goog.require('Blockly.Events.BubbleOpen');
-const Click = goog.require('Blockly.Events.Click');
-const CommentBase = goog.require('Blockly.Events.CommentBase');
-const CommentChange = goog.require('Blockly.Events.CommentChange');
-const CommentCreate = goog.require('Blockly.Events.CommentCreate');
-const CommentDelete = goog.require('Blockly.Events.CommentDelete');
-const CommentMove = goog.require('Blockly.Events.CommentMove');
-const FinishedLoading = goog.require('Blockly.Events.FinishedLoading');
-const MarkerMove = goog.require('Blockly.Events.MarkerMove');
-const Selected = goog.require('Blockly.Events.Selected');
-const ThemeChange = goog.require('Blockly.Events.ThemeChange');
-const ToolboxItemSelect = goog.require('Blockly.Events.ToolboxItemSelect');
-const TrashcanOpen = goog.require('Blockly.Events.TrashcanOpen');
-const Ui = goog.require('Blockly.Events.Ui');
-const UiBase = goog.require('Blockly.Events.UiBase');
-const VarBase = goog.require('Blockly.Events.VarBase');
-const VarCreate = goog.require('Blockly.Events.VarCreate');
-const VarDelete = goog.require('Blockly.Events.VarDelete');
-const VarRename = goog.require('Blockly.Events.VarRename');
-const ViewportChange = goog.require('Blockly.Events.ViewportChange');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const eventUtils = goog.require('Blockly.Events.utils');
+const {BlockBase} = goog.require('Blockly.Events.BlockBase');
+const {BlockChange} = goog.require('Blockly.Events.BlockChange');
+const {BlockCreate} = goog.require('Blockly.Events.BlockCreate');
+const {BlockDelete} = goog.require('Blockly.Events.BlockDelete');
+const {BlockDrag} = goog.require('Blockly.Events.BlockDrag');
+const {BlockMove} = goog.require('Blockly.Events.BlockMove');
+const {BubbleOpen} = goog.require('Blockly.Events.BubbleOpen');
+const {Click} = goog.require('Blockly.Events.Click');
+const {CommentBase} = goog.require('Blockly.Events.CommentBase');
+const {CommentChange} = goog.require('Blockly.Events.CommentChange');
+const {CommentCreate} = goog.require('Blockly.Events.CommentCreate');
+const {CommentDelete} = goog.require('Blockly.Events.CommentDelete');
+const {CommentMove} = goog.require('Blockly.Events.CommentMove');
+const {FinishedLoading} = goog.require('Blockly.Events.FinishedLoading');
+const {MarkerMove} = goog.require('Blockly.Events.MarkerMove');
+const {Selected} = goog.require('Blockly.Events.Selected');
+const {ThemeChange} = goog.require('Blockly.Events.ThemeChange');
+const {ToolboxItemSelect} = goog.require('Blockly.Events.ToolboxItemSelect');
+const {TrashcanOpen} = goog.require('Blockly.Events.TrashcanOpen');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
+const {Ui} = goog.require('Blockly.Events.Ui');
+const {VarBase} = goog.require('Blockly.Events.VarBase');
+const {VarCreate} = goog.require('Blockly.Events.VarCreate');
+const {VarDelete} = goog.require('Blockly.Events.VarDelete');
+const {VarRename} = goog.require('Blockly.Events.VarRename');
+const {ViewportChange} = goog.require('Blockly.Events.ViewportChange');
 
 
 // Events.

core/events/events_abstract.js

@@ -19,7 +19,7 @@ goog.module('Blockly.Events.Abstract');
 
 const eventUtils = goog.require('Blockly.Events.utils');
 /* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -107,7 +107,8 @@ Abstract.prototype.run = function(_forward) {
 Abstract.prototype.getEventWorkspace_ = function() {
   let workspace;
   if (this.workspaceId) {
-    workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId);
+    const {Workspace} = goog.module.get('Blockly.Workspace');
+    workspace = Workspace.getById(this.workspaceId);
   }
   if (!workspace) {
     throw Error(

core/events/events_block_base.js

@@ -66,4 +66,4 @@ BlockBase.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-exports = BlockBase;
+exports.BlockBase = BlockBase;

core/events/events_block_change.js

@@ -15,15 +15,15 @@
  */
 goog.module('Blockly.Events.BlockChange');
 
-const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Xml = goog.require('Blockly.Xml');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-/* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
+const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
 
 
 /**
@@ -169,4 +169,4 @@ BlockChange.getExtraBlockState_ = function(block) {
 
 registry.register(registry.Type.EVENT, eventUtils.CHANGE, BlockChange);
 
-exports = BlockChange;
+exports.BlockChange = BlockChange;

core/events/events_block_create.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.BlockCreate');
 
-const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 
@@ -114,4 +114,4 @@ BlockCreate.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.CREATE, BlockCreate);
 
-exports = BlockCreate;
+exports.BlockCreate = BlockCreate;

core/events/events_block_delete.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.BlockDelete');
 
-const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 
@@ -126,4 +126,4 @@ BlockDelete.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.DELETE, BlockDelete);
 
-exports = BlockDelete;
+exports.BlockDelete = BlockDelete;

core/events/events_block_drag.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.BlockDrag');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -85,4 +85,4 @@ BlockDrag.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.BLOCK_DRAG, BlockDrag);
 
-exports = BlockDrag;
+exports.BlockDrag = BlockDrag;

core/events/events_block_move.js

@@ -15,14 +15,14 @@
  */
 goog.module('Blockly.Events.BlockMove');
 
-const BlockBase = goog.require('Blockly.Events.BlockBase');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
 
 
 /**
@@ -188,4 +188,4 @@ BlockMove.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.MOVE, BlockMove);
 
-exports = BlockMove;
+exports.BlockMove = BlockMove;

core/events/events_bubble_open.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.BubbleOpen');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -86,4 +86,4 @@ BubbleOpen.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.BUBBLE_OPEN, BubbleOpen);
 
-exports = BubbleOpen;
+exports.BubbleOpen = BubbleOpen;

core/events/events_click.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.Click');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -80,4 +80,4 @@ Click.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.CLICK, Click);
 
-exports = Click;
+exports.Click = Click;

core/events/events_comment_base.js

@@ -16,16 +16,16 @@
 goog.module('Blockly.Events.CommentBase');
 
 const AbstractEvents = goog.require('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const CommentCreate = goog.requireType('Blockly.Events.CommentCreate');
-/* eslint-disable-next-line no-unused-vars */
-const CommentDelete = goog.requireType('Blockly.Events.CommentDelete');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const Xml = goog.require('Blockly.Xml');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const utilsXml = goog.require('Blockly.utils.xml');
+/* eslint-disable-next-line no-unused-vars */
+const {CommentCreate} = goog.requireType('Blockly.Events.CommentCreate');
+/* eslint-disable-next-line no-unused-vars */
+const {CommentDelete} = goog.requireType('Blockly.Events.CommentDelete');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -115,4 +115,4 @@ CommentBase.CommentCreateDeleteHelper = function(event, create) {
   }
 };
 
-exports = CommentBase;
+exports.CommentBase = CommentBase;

core/events/events_comment_change.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.CommentChange');
 
-const CommentBase = goog.require('Blockly.Events.CommentBase');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {CommentBase} = goog.require('Blockly.Events.CommentBase');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -99,4 +99,4 @@ CommentChange.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.COMMENT_CHANGE, CommentChange);
 
-exports = CommentChange;
+exports.CommentChange = CommentChange;

core/events/events_comment_create.js

@@ -15,13 +15,13 @@
  */
 goog.module('Blockly.Events.CommentCreate');
 
-const CommentBase = goog.require('Blockly.Events.CommentBase');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const Xml = goog.require('Blockly.Xml');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {CommentBase} = goog.require('Blockly.Events.CommentBase');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -78,4 +78,4 @@ CommentCreate.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.COMMENT_CREATE, CommentCreate);
 
-exports = CommentCreate;
+exports.CommentCreate = CommentCreate;

core/events/events_comment_delete.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.CommentDelete');
 
-const CommentBase = goog.require('Blockly.Events.CommentBase');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {CommentBase} = goog.require('Blockly.Events.CommentBase');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -75,4 +75,4 @@ CommentDelete.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.COMMENT_DELETE, CommentDelete);
 
-exports = CommentDelete;
+exports.CommentDelete = CommentDelete;

core/events/events_comment_move.js

@@ -15,13 +15,13 @@
  */
 goog.module('Blockly.Events.CommentMove');
 
-const CommentBase = goog.require('Blockly.Events.CommentBase');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {CommentBase} = goog.require('Blockly.Events.CommentBase');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -152,4 +152,4 @@ CommentMove.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.COMMENT_MOVE, CommentMove);
 
-exports = CommentMove;
+exports.CommentMove = CommentMove;

core/events/events_marker_move.js

@@ -15,15 +15,15 @@
  */
 goog.module('Blockly.Events.MarkerMove');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -106,4 +106,4 @@ MarkerMove.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.MARKER_MOVE, MarkerMove);
 
-exports = MarkerMove;
+exports.MarkerMove = MarkerMove;

core/events/events_selected.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.Events.Selected');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
-const object = goog.require('Blockly.utils.object');
 const eventUtils = goog.require('Blockly.Events.utils');
+const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -79,4 +79,4 @@ Selected.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.SELECTED, Selected);
 
-exports = Selected;
+exports.Selected = Selected;

core/events/events_theme_change.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.Events.ThemeChange');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -68,4 +68,4 @@ ThemeChange.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.THEME_CHANGE, ThemeChange);
 
-exports = ThemeChange;
+exports.ThemeChange = ThemeChange;

core/events/events_toolbox_item_select.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.Events.ToolboxItemSelect');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -80,4 +80,4 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
 registry.register(
     registry.Type.EVENT, eventUtils.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
-exports = ToolboxItemSelect;
+exports.ToolboxItemSelect = ToolboxItemSelect;

core/events/events_trashcan_open.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.Events.TrashcanOpen');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -69,4 +69,4 @@ TrashcanOpen.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.TRASHCAN_OPEN, TrashcanOpen);
 
-exports = TrashcanOpen;
+exports.TrashcanOpen = TrashcanOpen;

core/events/events_ui.js

@@ -17,12 +17,12 @@
  */
 goog.module('Blockly.Events.Ui');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -84,4 +84,4 @@ Ui.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.UI, Ui);
 
-exports = Ui;
+exports.Ui = Ui;

core/events/events_ui_base.js

@@ -59,4 +59,4 @@ object.inherits(UiBase, Abstract);
  */
 UiBase.prototype.isUiEvent = true;
 
-exports = UiBase;
+exports.UiBase = UiBase;

core/events/events_var_base.js

@@ -16,9 +16,9 @@
 goog.module('Blockly.Events.VarBase');
 
 const Abstract = goog.require('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 
 /**
@@ -66,4 +66,4 @@ VarBase.prototype.fromJson = function(json) {
   this.varId = json['varId'];
 };
 
-exports = VarBase;
+exports.VarBase = VarBase;

core/events/events_var_create.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.VarCreate');
 
-const VarBase = goog.require('Blockly.Events.VarBase');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {VarBase} = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 
 /**
@@ -84,4 +84,4 @@ VarCreate.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.VAR_CREATE, VarCreate);
 
-exports = VarCreate;
+exports.VarCreate = VarCreate;

core/events/events_var_delete.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.VarDelete');
 
-const VarBase = goog.require('Blockly.Events.VarBase');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {VarBase} = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 
 /**
@@ -84,4 +84,4 @@ VarDelete.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.VAR_DELETE, VarDelete);
 
-exports = VarDelete;
+exports.VarDelete = VarDelete;

core/events/events_var_rename.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.Events.VarRename');
 
-const VarBase = goog.require('Blockly.Events.VarBase');
-/* eslint-disable-next-line no-unused-vars */
-const VariableModel = goog.requireType('Blockly.VariableModel');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {VarBase} = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 
 /**
@@ -85,4 +85,4 @@ VarRename.prototype.run = function(forward) {
 
 registry.register(registry.Type.EVENT, eventUtils.VAR_RENAME, VarRename);
 
-exports = VarRename;
+exports.VarRename = VarRename;

core/events/events_viewport.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.Events.ViewportChange');
 
-const UiBase = goog.require('Blockly.Events.UiBase');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
@@ -102,4 +102,4 @@ ViewportChange.prototype.fromJson = function(json) {
 
 registry.register(registry.Type.EVENT, eventUtils.VIEWPORT_CHANGE, ViewportChange);
 
-exports = ViewportChange;
+exports.ViewportChange = ViewportChange;

core/events/utils.js

@@ -19,20 +19,20 @@ goog.module('Blockly.Events.utils');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const BlockMove = goog.requireType('Blockly.Events.BlockMove');
-/* eslint-disable-next-line no-unused-vars */
-const BlockCreate = goog.requireType('Blockly.Events.BlockMove');
-/* eslint-disable-next-line no-unused-vars */
-const CommentCreate = goog.requireType('Blockly.Events.CommentCreate');
-/* eslint-disable-next-line no-unused-vars */
-const CommentMove = goog.requireType('Blockly.Events.CommentMove');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
+const {BlockCreate} = goog.requireType('Blockly.Events.BlockCreate');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockMove} = goog.requireType('Blockly.Events.BlockMove');
+/* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {CommentCreate} = goog.requireType('Blockly.Events.CommentCreate');
+/* eslint-disable-next-line no-unused-vars */
+const {CommentMove} = goog.requireType('Blockly.Events.CommentMove');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -337,7 +337,7 @@ const fireNow = function() {
     if (!event.workspaceId) {
       continue;
     }
-    const Workspace = goog.module.get('Blockly.Workspace');
+    const {Workspace} = goog.module.get('Blockly.Workspace');
     const eventWorkspace = Workspace.getById(event.workspaceId);
     if (eventWorkspace) {
       eventWorkspace.fireChangeListener(event);
@@ -549,7 +549,7 @@ const disableOrphans = function(event) {
     if (!event.workspaceId) {
       return;
     }
-    const Workspace = goog.module.get('Blockly.Workspace');
+    const {Workspace} = goog.module.get('Blockly.Workspace');
     const eventWorkspace = Workspace.getById(event.workspaceId);
     let block = eventWorkspace.getBlockById(event.blockId);
     if (block) {

core/events/workspace_events.js

@@ -16,11 +16,11 @@
 goog.module('Blockly.Events.FinishedLoading');
 
 const Abstract = goog.require('Blockly.Events.Abstract');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const eventUtils = goog.require('Blockly.Events.utils');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -96,4 +96,4 @@ FinishedLoading.prototype.fromJson = function(json) {
 registry.register(
     registry.Type.EVENT, eventUtils.FINISHED_LOADING, FinishedLoading);
 
-exports = FinishedLoading;
+exports.FinishedLoading = FinishedLoading;

core/extensions.js

@@ -104,7 +104,7 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   // Sanity checks passed.
   register(name, function() {
     if (hasMutatorDialog) {
-      const Mutator = goog.module.get('Blockly.Mutator');
+      const {Mutator} = goog.module.get('Blockly.Mutator');
       if (!Mutator) {
         throw Error(errorPrefix + 'Missing require for Blockly.Mutator');
       }

core/field.js

@@ -19,43 +19,43 @@
  */
 goog.module('Blockly.Field');
 
-/* eslint-disable-next-line no-unused-vars */
-const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
-/* eslint-disable-next-line no-unused-vars */
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
-/* eslint-disable-next-line no-unused-vars */
-const Input = goog.requireType('Blockly.Input');
-/* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
-const MarkerManager = goog.require('Blockly.MarkerManager');
-const Rect = goog.require('Blockly.utils.Rect');
-/* eslint-disable-next-line no-unused-vars */
-const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
-const Size = goog.require('Blockly.utils.Size');
-const Svg = goog.require('Blockly.utils.Svg');
 const Tooltip = goog.require('Blockly.Tooltip');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
+const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const eventUtils = goog.require('Blockly.Events.utils');
-const browserEvents = goog.require('Blockly.browserEvents');
 const style = goog.require('Blockly.utils.style');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 const utilsXml = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock');
+/* eslint-disable-next-line no-unused-vars */
+const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible');
+/* eslint-disable-next-line no-unused-vars */
+const {IRegistrable} = goog.require('Blockly.IRegistrable');
+/* eslint-disable-next-line no-unused-vars */
+const {Input} = goog.requireType('Blockly.Input');
+const {MarkerManager} = goog.require('Blockly.MarkerManager');
+const {Rect} = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const {ShortcutRegistry} = goog.requireType('Blockly.ShortcutRegistry');
+const {Size} = goog.require('Blockly.utils.Size');
+const {Svg} = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -1213,4 +1213,4 @@ Field.prototype.updateMarkers_ = function() {
   }
 };
 
-exports = Field;
+exports.Field = Field;

core/field_angle.js

@@ -16,10 +16,6 @@
 goog.module('Blockly.FieldAngle');
 
 const Css = goog.require('Blockly.Css');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const FieldTextInput = goog.require('Blockly.FieldTextInput');
-const KeyCodes = goog.require('Blockly.utils.KeyCodes');
-const Svg = goog.require('Blockly.utils.Svg');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
@@ -27,6 +23,10 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const math = goog.require('Blockly.utils.math');
 const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
+const {KeyCodes} = goog.require('Blockly.utils.KeyCodes');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -568,4 +568,4 @@ Css.register(`
 
 fieldRegistry.register('field_angle', FieldAngle);
 
-exports = FieldAngle;
+exports.FieldAngle = FieldAngle;

core/field_checkbox.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.FieldCheckbox');
 
-const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
+const {Field} = goog.require('Blockly.Field');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -240,4 +240,4 @@ FieldCheckbox.prototype.convertValueToBool_ = function(value) {
 
 fieldRegistry.register('field_checkbox', FieldCheckbox);
 
-exports = FieldCheckbox;
+exports.FieldCheckbox = FieldCheckbox;

core/field_colour.js

@@ -16,10 +16,6 @@
 goog.module('Blockly.FieldColour');
 
 const Css = goog.require('Blockly.Css');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Field = goog.require('Blockly.Field');
-const KeyCodes = goog.require('Blockly.utils.KeyCodes');
-const Size = goog.require('Blockly.utils.Size');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const colour = goog.require('Blockly.utils.colour');
@@ -27,6 +23,10 @@ const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Field} = goog.require('Blockly.Field');
+const {KeyCodes} = goog.require('Blockly.utils.KeyCodes');
+const {Size} = goog.require('Blockly.utils.Size');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -640,4 +640,4 @@ Css.register(`
 
 fieldRegistry.register('field_colour', FieldColour);
 
-exports = FieldColour;
+exports.FieldColour = FieldColour;

core/field_dropdown.js

@@ -19,12 +19,6 @@
  */
 goog.module('Blockly.FieldDropdown');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Field = goog.require('Blockly.Field');
-const Menu = goog.require('Blockly.Menu');
-const MenuItem = goog.require('Blockly.MenuItem');
-const Svg = goog.require('Blockly.utils.Svg');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
@@ -32,6 +26,12 @@ const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 const utilsString = goog.require('Blockly.utils.string');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Field} = goog.require('Blockly.Field');
+const {MenuItem} = goog.require('Blockly.MenuItem');
+const {Menu} = goog.require('Blockly.Menu');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -773,4 +773,4 @@ const validateOptions = function(options) {
 
 fieldRegistry.register('field_dropdown', FieldDropdown);
 
-exports = FieldDropdown;
+exports.FieldDropdown = FieldDropdown;

core/field_image.js

@@ -15,13 +15,13 @@
  */
 goog.module('Blockly.FieldImage');
 
-const Field = goog.require('Blockly.Field');
-const Size = goog.require('Blockly.utils.Size');
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
+const {Field} = goog.require('Blockly.Field');
+const {Size} = goog.require('Blockly.utils.Size');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -292,4 +292,4 @@ FieldImage.prototype.getText_ = function() {
 
 fieldRegistry.register('field_image', FieldImage);
 
-exports = FieldImage;
+exports.FieldImage = FieldImage;

core/field_label.js

@@ -17,11 +17,11 @@
  */
 goog.module('Blockly.FieldLabel');
 
-const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
+const {Field} = goog.require('Blockly.Field');
 
 
 /**
@@ -135,4 +135,4 @@ FieldLabel.prototype.setClass = function(cssClass) {
 
 fieldRegistry.register('field_label', FieldLabel);
 
-exports = FieldLabel;
+exports.FieldLabel = FieldLabel;

core/field_label_serializable.js

@@ -19,10 +19,10 @@
  */
 goog.module('Blockly.FieldLabelSerializable');
 
-const FieldLabel = goog.require('Blockly.FieldLabel');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
+const {FieldLabel} = goog.require('Blockly.FieldLabel');
 
 
 /**
@@ -76,4 +76,4 @@ FieldLabelSerializable.prototype.SERIALIZABLE = true;
 
 fieldRegistry.register('field_label_serializable', FieldLabelSerializable);
 
-exports = FieldLabelSerializable;
+exports.FieldLabelSerializable = FieldLabelSerializable;

core/field_multilineinput.js

@@ -16,10 +16,6 @@
 goog.module('Blockly.FieldMultilineInput');
 
 const Css = goog.require('Blockly.Css');
-const Field = goog.require('Blockly.Field');
-const FieldTextInput = goog.require('Blockly.FieldTextInput');
-const KeyCodes = goog.require('Blockly.utils.KeyCodes');
-const Svg = goog.require('Blockly.utils.Svg');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
@@ -27,6 +23,10 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
+const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
+const {Field} = goog.require('Blockly.Field');
+const {KeyCodes} = goog.require('Blockly.utils.KeyCodes');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -446,4 +446,4 @@ Css.register(`
 
 fieldRegistry.register('field_multilinetext', FieldMultilineInput);
 
-exports = FieldMultilineInput;
+exports.FieldMultilineInput = FieldMultilineInput;

core/field_number.js

@@ -15,10 +15,10 @@
  */
 goog.module('Blockly.FieldNumber');
 
-const FieldTextInput = goog.require('Blockly.FieldTextInput');
 const aria = goog.require('Blockly.utils.aria');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const object = goog.require('Blockly.utils.object');
+const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
 
 
 /**
@@ -318,4 +318,4 @@ FieldNumber.prototype.widgetCreate_ = function() {
 
 fieldRegistry.register('field_number', FieldNumber);
 
-exports = FieldNumber;
+exports.FieldNumber = FieldNumber;

core/field_registry.js

@@ -19,11 +19,11 @@
  */
 goog.module('Blockly.fieldRegistry');
 
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const IRegistrableField = goog.requireType('Blockly.IRegistrableField');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IRegistrableField} = goog.requireType('Blockly.IRegistrableField');
 
 
 /**

core/field_textinput.js

@@ -15,14 +15,8 @@
  */
 goog.module('Blockly.FieldTextInput');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Field = goog.require('Blockly.Field');
-const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Msg = goog.require('Blockly.Msg');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dialog = goog.require('Blockly.dialog');
@@ -34,6 +28,12 @@ const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Field} = goog.require('Blockly.Field');
+const {KeyCodes} = goog.require('Blockly.utils.KeyCodes');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -581,4 +581,4 @@ FieldTextInput.prototype.getValueFromEditorText_ = function(text) {
 
 fieldRegistry.register('field_input', FieldTextInput);
 
-exports = FieldTextInput;
+exports.FieldTextInput = FieldTextInput;

core/field_variable.js

@@ -15,14 +15,7 @@
  */
 goog.module('Blockly.FieldVariable');
 
-const FieldDropdown = goog.require('Blockly.FieldDropdown');
-/* eslint-disable-next-line no-unused-vars */
-const Menu = goog.requireType('Blockly.Menu');
-/* eslint-disable-next-line no-unused-vars */
-const MenuItem = goog.requireType('Blockly.MenuItem');
 const Msg = goog.require('Blockly.Msg');
-const Size = goog.require('Blockly.utils.Size');
-const VariableModel = goog.require('Blockly.VariableModel');
 const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
@@ -31,6 +24,13 @@ const object = goog.require('Blockly.utils.object');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
+/* eslint-disable-next-line no-unused-vars */
+const {MenuItem} = goog.requireType('Blockly.MenuItem');
+/* eslint-disable-next-line no-unused-vars */
+const {Menu} = goog.requireType('Blockly.Menu');
+const {Size} = goog.require('Blockly.utils.Size');
+const {VariableModel} = goog.require('Blockly.VariableModel');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -517,4 +517,4 @@ FieldVariable.prototype.referencesVariables = function() {
 
 fieldRegistry.register('field_variable', FieldVariable);
 
-exports = FieldVariable;
+exports.FieldVariable = FieldVariable;

core/flyout_base.js

@@ -15,21 +15,8 @@
  */
 goog.module('Blockly.Flyout');
 
-const ComponentManager = goog.require('Blockly.ComponentManager');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const DeleteArea = goog.require('Blockly.DeleteArea');
-/* eslint-disable-next-line no-unused-vars */
-const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
-const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager');
-/* eslint-disable-next-line no-unused-vars */
-const IFlyout = goog.require('Blockly.IFlyout');
-/* eslint-disable-next-line no-unused-vars */
-const Options = goog.requireType('Blockly.Options');
-const ScrollbarPair = goog.require('Blockly.ScrollbarPair');
-const Svg = goog.require('Blockly.utils.Svg');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Variables = goog.require('Blockly.Variables');
-const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -40,11 +27,22 @@ const object = goog.require('Blockly.utils.object');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
-const {Block} = goog.requireType('Blockly.Block');
-/* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
-/** @suppress {extraRequire} */
-goog.require('Blockly.blockRendering');
+/* eslint-disable-next-line no-unused-vars */
+const {Block} = goog.requireType('Blockly.Block');
+const {ComponentManager} = goog.require('Blockly.ComponentManager');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {DeleteArea} = goog.require('Blockly.DeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const {FlyoutButton} = goog.requireType('Blockly.FlyoutButton');
+const {FlyoutMetricsManager} = goog.require('Blockly.FlyoutMetricsManager');
+/* eslint-disable-next-line no-unused-vars */
+const {IFlyout} = goog.require('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+const {Options} = goog.requireType('Blockly.Options');
+const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair');
+const {Svg} = goog.require('Blockly.utils.Svg');
+const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -53,6 +51,8 @@ goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.Gesture');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
+/** @suppress {extraRequire} */
+goog.require('Blockly.blockRendering');
 
 
 /**
@@ -663,7 +663,7 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
  * @private
  */
 Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
-  const FlyoutButton = goog.module.get('Blockly.FlyoutButton');
+  const {FlyoutButton} = goog.module.get('Blockly.FlyoutButton');
   if (!FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
@@ -1193,4 +1193,4 @@ Flyout.prototype.getX;
  */
 Flyout.prototype.getY;
 
-exports = Flyout;
+exports.Flyout = Flyout;

core/flyout_button.js

@@ -15,17 +15,17 @@
  */
 goog.module('Blockly.FlyoutButton');
 
-const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
-const Svg = goog.require('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const style = goog.require('Blockly.utils.style');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {Svg} = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -336,4 +336,4 @@ Css.register(`
   }
 `);
 
-exports = FlyoutButton;
+exports.FlyoutButton = FlyoutButton;

core/flyout_horizontal.js

@@ -15,19 +15,19 @@
  */
 goog.module('Blockly.HorizontalFlyout');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Flyout = goog.require('Blockly.Flyout');
-/* eslint-disable-next-line no-unused-vars */
-const Options = goog.requireType('Blockly.Options');
-const Rect = goog.require('Blockly.utils.Rect');
-const Scrollbar = goog.require('Blockly.Scrollbar');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const browserEvents = goog.require('Blockly.browserEvents');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Flyout} = goog.require('Blockly.Flyout');
+/* eslint-disable-next-line no-unused-vars */
+const {Options} = goog.requireType('Blockly.Options');
+const {Rect} = goog.require('Blockly.utils.Rect');
+const {Scrollbar} = goog.require('Blockly.Scrollbar');
 
 
 /**
@@ -386,4 +386,4 @@ registry.register(
     registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, registry.DEFAULT,
     HorizontalFlyout);
 
-exports = HorizontalFlyout;
+exports.HorizontalFlyout = HorizontalFlyout;

core/flyout_metrics_manager.js

@@ -15,12 +15,12 @@
  */
 goog.module('Blockly.FlyoutMetricsManager');
 
-/* eslint-disable-next-line no-unused-vars */
-const IFlyout = goog.requireType('Blockly.IFlyout');
-const MetricsManager = goog.require('Blockly.MetricsManager');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const object = goog.require('Blockly.utils.object');
+/* eslint-disable-next-line no-unused-vars */
+const {IFlyout} = goog.requireType('Blockly.IFlyout');
+const {MetricsManager} = goog.require('Blockly.MetricsManager');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -103,4 +103,4 @@ FlyoutMetricsManager.prototype.getScrollMetrics = function(
   };
 };
 
-exports = FlyoutMetricsManager;
+exports.FlyoutMetricsManager = FlyoutMetricsManager;

core/flyout_vertical.js

@@ -15,19 +15,19 @@
  */
 goog.module('Blockly.VerticalFlyout');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Flyout = goog.require('Blockly.Flyout');
-/* eslint-disable-next-line no-unused-vars */
-const Options = goog.requireType('Blockly.Options');
-const Rect = goog.require('Blockly.utils.Rect');
-const Scrollbar = goog.require('Blockly.Scrollbar');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const browserEvents = goog.require('Blockly.browserEvents');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const toolbox = goog.require('Blockly.utils.toolbox');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Flyout} = goog.require('Blockly.Flyout');
+/* eslint-disable-next-line no-unused-vars */
+const {Options} = goog.requireType('Blockly.Options');
+const {Rect} = goog.require('Blockly.utils.Rect');
+const {Scrollbar} = goog.require('Blockly.Scrollbar');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
@@ -386,4 +386,4 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
 registry.register(
     registry.Type.FLYOUTS_VERTICAL_TOOLBOX, registry.DEFAULT, VerticalFlyout);
 
-exports = VerticalFlyout;
+exports.VerticalFlyout = VerticalFlyout;

core/generator.js

@@ -17,15 +17,15 @@
  */
 goog.module('Blockly.Generator');
 
-/* eslint-disable-next-line no-unused-vars */
-const Names = goog.requireType('Blockly.Names');
-/* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
 const common = goog.require('Blockly.common');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const internalConstants = goog.require('Blockly.internalConstants');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {Names} = goog.requireType('Blockly.Names');
+/* eslint-disable-next-line no-unused-vars */
+const {Workspace} = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -549,4 +549,4 @@ Generator.prototype.scrubNakedValue = function(line) {
   return line;
 };
 
-exports = Generator;
+exports.Generator = Generator;

core/gesture.js

@@ -17,22 +17,8 @@
  */
 goog.module('Blockly.Gesture');
 
-const BubbleDragger = goog.require('Blockly.BubbleDragger');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const IBlockDragger = goog.requireType('Blockly.IBlockDragger');
-/* eslint-disable-next-line no-unused-vars */
-const IBubble = goog.requireType('Blockly.IBubble');
-/* eslint-disable-next-line no-unused-vars */
-const IFlyout = goog.requireType('Blockly.IFlyout');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
-const Workspace = goog.require('Blockly.Workspace');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const browserEvents = goog.require('Blockly.browserEvents');
 const common = goog.require('Blockly.common');
@@ -41,6 +27,20 @@ const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {BubbleDragger} = goog.require('Blockly.BubbleDragger');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {IBlockDragger} = goog.requireType('Blockly.IBlockDragger');
+/* eslint-disable-next-line no-unused-vars */
+const {IBubble} = goog.requireType('Blockly.IBubble');
+/* eslint-disable-next-line no-unused-vars */
+const {IFlyout} = goog.requireType('Blockly.IFlyout');
+const {WorkspaceDragger} = goog.require('Blockly.WorkspaceDragger');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
+const {Workspace} = goog.require('Blockly.Workspace');
 /** @suppress {extraRequire} */
 goog.require('Blockly.BlockDragger');
 /** @suppress {extraRequire} */
@@ -1007,4 +1007,4 @@ Gesture.inProgress = function() {
   return false;
 };
 
-exports = Gesture;
+exports.Gesture = Gesture;

core/grid.js

@@ -17,9 +17,9 @@
  */
 goog.module('Blockly.Grid');
 
-const Svg = goog.require('Blockly.utils.Svg');
 const dom = goog.require('Blockly.utils.dom');
 const userAgent = goog.require('Blockly.utils.userAgent');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -220,4 +220,4 @@ Grid.createDom = function(rnd, gridOptions, defs) {
   return gridPattern;
 };
 
-exports = Grid;
+exports.Grid = Grid;

core/icon.js

@@ -15,16 +15,16 @@
  */
 goog.module('Blockly.Icon');
 
-/* eslint-disable-next-line no-unused-vars */
-const Bubble = goog.requireType('Blockly.Bubble');
-const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Size = goog.require('Blockly.utils.Size');
-const Svg = goog.require('Blockly.utils.Svg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const utils = goog.require('Blockly.utils');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Bubble} = goog.requireType('Blockly.Bubble');
+const {Coordinate} = goog.require('Blockly.utils.Coordinate');
+const {Size} = goog.require('Blockly.utils.Size');
+const {Svg} = goog.require('Blockly.utils.Svg');
 
 
 /**
@@ -213,4 +213,4 @@ Icon.prototype.drawIcon_;
  */
 Icon.prototype.setVisible;
 
-exports = Icon;
+exports.Icon = Icon;

core/inject.js

@@ -15,21 +15,10 @@
  */
 goog.module('Blockly.inject');
 
-/* eslint-disable-next-line no-unused-vars */
-const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const Css = goog.require('Blockly.Css');
-const DropDownDiv = goog.require('Blockly.DropDownDiv');
-const Grid = goog.require('Blockly.Grid');
 const Msg = goog.require('Blockly.Msg');
-const Options = goog.require('Blockly.Options');
-const ScrollbarPair = goog.require('Blockly.ScrollbarPair');
-const Touch = goog.require('Blockly.Touch');
 const Tooltip = goog.require('Blockly.Tooltip');
-const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
-const Svg = goog.require('Blockly.utils.Svg');
-const Workspace = goog.require('Blockly.Workspace');
-const WorkspaceDragSurfaceSvg = goog.require('Blockly.WorkspaceDragSurfaceSvg');
-const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
+const Touch = goog.require('Blockly.Touch');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -38,6 +27,17 @@ const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions');
+const {DropDownDiv} = goog.require('Blockly.DropDownDiv');
+const {Grid} = goog.require('Blockly.Grid');
+const {Options} = goog.require('Blockly.Options');
+const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair');
+const {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry');
+const {Svg} = goog.require('Blockly.utils.Svg');
+const {WorkspaceDragSurfaceSvg} = goog.require('Blockly.WorkspaceDragSurfaceSvg');
+const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg');
+const {Workspace} = goog.require('Blockly.Workspace');
 
 
 /**
@@ -381,4 +381,4 @@ const loadSounds = function(pathToMedia, workspace) {
       document, 'touchstart', null, unbindSounds, true));
 };
 
-exports = inject;
+exports.inject = inject;

core/input.js

@@ -15,19 +15,19 @@
  */
 goog.module('Blockly.Input');
 
-/* eslint-disable-next-line no-unused-vars */
-const Connection = goog.requireType('Blockly.Connection');
-/* eslint-disable-next-line no-unused-vars */
-const Field = goog.requireType('Blockly.Field');
-/* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const constants = goog.require('Blockly.constants');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const inputTypes = goog.require('Blockly.inputTypes');
+/* eslint-disable-next-line no-unused-vars */
+const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
-const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {Connection} = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const {Field} = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
+const {inputTypes} = goog.require('Blockly.inputTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldLabel');
 
@@ -312,4 +312,4 @@ Input.prototype.dispose = function() {
   this.sourceBlock_ = null;
 };
 
-exports = Input;
+exports.Input = Input;

core/input_types.js

@@ -33,4 +33,4 @@ const inputTypes = {
   DUMMY: 5
 };
 
-exports = inputTypes;
+exports.inputTypes = inputTypes;

core/insertion_marker_manager.js

@@ -15,17 +15,6 @@
  */
 goog.module('Blockly.InsertionMarkerManager');
 
-const ComponentManager = goog.require('Blockly.ComponentManager');
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
-/* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.requireType('Blockly.IDragTarget');
-/* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const common = goog.require('Blockly.common');
 const constants = goog.require('Blockly.constants');
@@ -33,7 +22,18 @@ const eventUtils = goog.require('Blockly.Events.utils');
 const internalConstants = goog.require('Blockly.internalConstants');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+const {ComponentManager} = goog.require('Blockly.ComponentManager');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const {IDragTarget} = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -757,4 +757,4 @@ InsertionMarkerManager.prototype.getInsertionMarkers = function() {
   return result;
 };
 
-exports = InsertionMarkerManager;
+exports.InsertionMarkerManager = InsertionMarkerManager;

core/interfaces/i_ast_node_location.js

@@ -23,4 +23,4 @@ goog.module('Blockly.IASTNodeLocation');
  */
 const IASTNodeLocation = function() {};
 
-exports = IASTNodeLocation;
+exports.IASTNodeLocation = IASTNodeLocation;

core/interfaces/i_ast_node_location_svg.js

@@ -17,7 +17,7 @@
 goog.module('Blockly.IASTNodeLocationSvg');
 
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
 
 
 /**
@@ -42,4 +42,4 @@ IASTNodeLocationSvg.prototype.setMarkerSvg;
  */
 IASTNodeLocationSvg.prototype.setCursorSvg;
 
-exports = IASTNodeLocationSvg;
+exports.IASTNodeLocationSvg = IASTNodeLocationSvg;

core/interfaces/i_ast_node_location_with_block.js

@@ -18,10 +18,10 @@
  */
 goog.module('Blockly.IASTNodeLocationWithBlock');
 
-/* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation');
 
 
 /**
@@ -38,4 +38,4 @@ const IASTNodeLocationWithBlock = function() {};
  */
 IASTNodeLocationWithBlock.prototype.getSourceBlock;
 
-exports = IASTNodeLocationWithBlock;
+exports.IASTNodeLocationWithBlock = IASTNodeLocationWithBlock;

core/interfaces/i_autohideable.js

@@ -19,7 +19,7 @@
 goog.module('Blockly.IAutoHideable');
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const {IComponent} = goog.require('Blockly.IComponent');
 
 
 /**
@@ -37,4 +37,4 @@ const IAutoHideable = function() {};
  */
 IAutoHideable.prototype.autoHide;
 
-exports = IAutoHideable;
+exports.IAutoHideable = IAutoHideable;

core/interfaces/i_block_dragger.js

@@ -16,10 +16,10 @@
  */
 goog.module('Blockly.IBlockDragger');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
@@ -63,4 +63,4 @@ IBlockDragger.prototype.endDrag;
  */
 IBlockDragger.prototype.getInsertionMarkers;
 
-exports = IBlockDragger;
+exports.IBlockDragger = IBlockDragger;

core/interfaces/i_bounded_element.js

@@ -17,7 +17,7 @@
 goog.module('Blockly.IBoundedElement');
 
 /* eslint-disable-next-line no-unused-vars */
-const Rect = goog.requireType('Blockly.utils.Rect');
+const {Rect} = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -42,4 +42,4 @@ IBoundedElement.prototype.getBoundingRectangle;
  */
 IBoundedElement.prototype.moveBy;
 
-exports = IBoundedElement;
+exports.IBoundedElement = IBoundedElement;

core/interfaces/i_bubble.js

@@ -16,14 +16,14 @@
  */
 goog.module('Blockly.IBubble');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IContextMenu = goog.require('Blockly.IContextMenu');
-/* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IContextMenu} = goog.require('Blockly.IContextMenu');
+/* eslint-disable-next-line no-unused-vars */
+const {IDraggable} = goog.require('Blockly.IDraggable');
 
 
 /**
@@ -92,4 +92,4 @@ IBubble.prototype.setDeleteStyle;
  */
 IBubble.prototype.dispose;
 
-exports = IBubble;
+exports.IBubble = IBubble;

core/interfaces/i_collapsible_toolbox_item.js

@@ -17,9 +17,9 @@
 goog.module('Blockly.ICollapsibleToolboxItem');
 
 /* eslint-disable-next-line no-unused-vars */
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
-const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const {IToolboxItem} = goog.requireType('Blockly.IToolboxItem');
 
 
 /**
@@ -50,4 +50,4 @@ ICollapsibleToolboxItem.prototype.isExpanded;
  */
 ICollapsibleToolboxItem.prototype.toggleExpanded;
 
-exports = ICollapsibleToolboxItem;
+exports.ICollapsibleToolboxItem = ICollapsibleToolboxItem;

core/interfaces/i_component.js

@@ -34,4 +34,4 @@ const IComponent = function() {};
  */
 IComponent.id;
 
-exports = IComponent;
+exports.IComponent = IComponent;

core/interfaces/i_connection_checker.js

@@ -18,9 +18,9 @@
 goog.module('Blockly.IConnectionChecker');
 
 /* eslint-disable-next-line no-unused-vars */
-const Connection = goog.requireType('Blockly.Connection');
+const {Connection} = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
 
 
 /**
@@ -101,4 +101,4 @@ IConnectionChecker.prototype.doTypeChecks;
  */
 IConnectionChecker.prototype.doDragChecks;
 
-exports = IConnectionChecker;
+exports.IConnectionChecker = IConnectionChecker;

core/interfaces/i_contextmenu.js

@@ -29,4 +29,4 @@ const IContextMenu = function() {};
  */
 IContextMenu.prototype.showContextMenu;
 
-exports = IContextMenu;
+exports.IContextMenu = IContextMenu;

core/interfaces/i_copyable.js

@@ -17,9 +17,9 @@
 goog.module('Blockly.ICopyable');
 
 /* eslint-disable-next-line no-unused-vars */
-const ISelectable = goog.require('Blockly.ISelectable');
+const {ISelectable} = goog.require('Blockly.ISelectable');
 /* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -46,4 +46,4 @@ ICopyable.prototype.toCopyData;
  */
 ICopyable.CopyData;
 
-exports = ICopyable;
+exports.ICopyable = ICopyable;

core/interfaces/i_deletable.js

@@ -30,4 +30,4 @@ const IDeletable = function() {};
  */
 IDeletable.prototype.isDeletable;
 
-exports = IDeletable;
+exports.IDeletable = IDeletable;

core/interfaces/i_delete_area.js

@@ -19,9 +19,9 @@
 goog.module('Blockly.IDeleteArea');
 
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.requireType('Blockly.IDraggable');
+const {IDragTarget} = goog.require('Blockly.IDragTarget');
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const {IDraggable} = goog.requireType('Blockly.IDraggable');
 
 
 /**
@@ -47,4 +47,4 @@ const IDeleteArea = function() {};
  */
 IDeleteArea.prototype.wouldDelete;
 
-exports = IDeleteArea;
+exports.IDeleteArea = IDeleteArea;

core/interfaces/i_drag_target.js

@@ -19,11 +19,11 @@
 goog.module('Blockly.IDragTarget');
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const {IComponent} = goog.require('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.requireType('Blockly.IDraggable');
+const {IDraggable} = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const Rect = goog.requireType('Blockly.utils.Rect');
+const {Rect} = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -85,4 +85,4 @@ IDragTarget.prototype.onDrop;
  */
 IDragTarget.prototype.shouldPreventMove;
 
-exports = IDragTarget;
+exports.IDragTarget = IDragTarget;

core/interfaces/i_draggable.js

@@ -17,7 +17,7 @@
 goog.module('Blockly.IDraggable');
 
 /* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
+const {IDeletable} = goog.require('Blockly.IDeletable');
 
 
 /**
@@ -28,4 +28,4 @@ const IDeletable = goog.require('Blockly.IDeletable');
  */
 const IDraggable = function() {};
 
-exports = IDraggable;
+exports.IDraggable = IDraggable;

core/interfaces/i_flyout.js

@@ -16,18 +16,18 @@
  */
 goog.module('Blockly.IFlyout');
 
-/* eslint-disable-next-line no-unused-vars */
-const Coordinate = goog.requireType('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
-/* eslint-disable-next-line no-unused-vars */
-const Svg = goog.requireType('Blockly.utils.Svg');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Coordinate} = goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const {IRegistrable} = goog.require('Blockly.IRegistrable');
+/* eslint-disable-next-line no-unused-vars */
+const {Svg} = goog.requireType('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -198,4 +198,4 @@ IFlyout.prototype.position;
  */
 IFlyout.prototype.isDragTowardWorkspace;
 
-exports = IFlyout;
+exports.IFlyout = IFlyout;

core/interfaces/i_keyboard_accessible.js

@@ -17,7 +17,7 @@
 goog.module('Blockly.IKeyboardAccessible');
 
 /* eslint-disable-next-line no-unused-vars */
-const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
+const {ShortcutRegistry} = goog.requireType('Blockly.ShortcutRegistry');
 
 
 /**
@@ -35,4 +35,4 @@ const IKeyboardAccessible = function() {};
  */
 IKeyboardAccessible.prototype.onShortcut;
 
-exports = IKeyboardAccessible;
+exports.IKeyboardAccessible = IKeyboardAccessible;

core/interfaces/i_metrics_manager.js

@@ -17,11 +17,11 @@
 goog.module('Blockly.IMetricsManager');
 
 /* eslint-disable-next-line no-unused-vars */
-const Metrics = goog.requireType('Blockly.utils.Metrics');
+const {MetricsManager} = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const MetricsManager = goog.requireType('Blockly.MetricsManager');
+const {Metrics} = goog.requireType('Blockly.utils.Metrics');
 /* eslint-disable-next-line no-unused-vars */
-const Size = goog.requireType('Blockly.utils.Size');
+const {Size} = goog.requireType('Blockly.utils.Size');
 
 
 /**
@@ -151,4 +151,4 @@ IMetricsManager.prototype.getContentMetrics;
  */
 IMetricsManager.prototype.getMetrics;
 
-exports = IMetricsManager;
+exports.IMetricsManager = IMetricsManager;

core/interfaces/i_movable.js

@@ -30,4 +30,4 @@ const IMovable = function() {};
  */
 IMovable.prototype.isMovable;
 
-exports = IMovable;
+exports.IMovable = IMovable;