From 73580b0ddb49255c151b0376b8d83a15f583e6f1 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Wed, 22 Sep 2021 11:25:38 -0700
Subject: [PATCH] chore: named exports for keyboard_nav* files (#5517)

---
 core/block.js                            | 2 +-
 core/block_svg.js                        | 4 ++--
 core/blockly.js                          | 6 +++---
 core/events/events_marker_move.js        | 2 +-
 core/keyboard_nav/ast_node.js            | 2 +-
 core/keyboard_nav/basic_cursor.js        | 6 +++---
 core/keyboard_nav/cursor.js              | 7 +++----
 core/keyboard_nav/marker.js              | 6 +++---
 core/keyboard_nav/tab_navigate_cursor.js | 6 +++---
 core/marker_manager.js                   | 8 ++++----
 core/registry.js                         | 4 ++--
 core/renderers/common/marker_svg.js      | 6 +++---
 core/renderers/common/renderer.js        | 4 ++--
 core/renderers/zelos/marker_svg.js       | 8 ++++----
 core/renderers/zelos/renderer.js         | 4 ++--
 core/workspace_svg.js                    | 8 ++++----
 tests/deps.js                            | 2 +-
 tests/deps.mocha.js                      | 8 ++++----
 tests/mocha/astnode_test.js              | 2 +-
 tests/mocha/cursor_test.js               | 2 +-
 tests/mocha/event_test.js                | 2 +-
 21 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/core/block.js b/core/block.js
index afbc86742..e0cb6a334 100644
--- a/core/block.js
+++ b/core/block.js
@@ -14,7 +14,6 @@ goog.module('Blockly.Block');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-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');
@@ -45,6 +44,7 @@ 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');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
diff --git a/core/block_svg.js b/core/block_svg.js
index 26166ac61..87449ed19 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.BlockSvg');
 
-const ASTNode = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
 const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug');
 /* eslint-disable-next-line no-unused-vars */
@@ -47,7 +46,6 @@ 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');
 const Tooltip = goog.require('Blockly.Tooltip');
@@ -66,7 +64,9 @@ const internalConstants = goog.require('Blockly.internalConstants');
 const object = goog.require('Blockly.utils.object');
 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');
+const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
diff --git a/core/blockly.js b/core/blockly.js
index 83c246208..fe0c3021a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,10 +17,7 @@
 goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
-const ASTNode = goog.require('Blockly.ASTNode');
-const BasicCursor = goog.require('Blockly.BasicCursor');
 const Blocks = goog.require('Blockly.Blocks');
-const Cursor = goog.require('Blockly.Cursor');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Marker = goog.require('Blockly.Marker');
@@ -45,6 +42,9 @@ const {Block} = goog.require('Blockly.Block');
 const {BlockDragger} = goog.require('Blockly.BlockDragger');
 const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
 const {BlockSvg} = goog.require('Blockly.BlockSvg');
+const {ASTNode} = goog.require('Blockly.ASTNode');
+const {BasicCursor} = goog.require('Blockly.BasicCursor');
+const {Cursor} = goog.require('Blockly.Cursor');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index d05f84de0..8a57736b5 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -13,7 +13,6 @@
 goog.module('Blockly.Events.MarkerMove');
 goog.module.declareLegacyNamespace();
 
-const ASTNode = goog.require('Blockly.ASTNode');
 const Events = goog.require('Blockly.Events');
 const UiBase = goog.require('Blockly.Events.UiBase');
 /* eslint-disable-next-line no-unused-vars */
@@ -22,6 +21,7 @@ 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 {ASTNode} = goog.require('Blockly.ASTNode');
 
 
 /**
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 550625681..330163fb4 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -706,4 +706,4 @@ ASTNode.prototype.out = function() {
   return null;
 };
 
-exports = ASTNode;
+exports.ASTNode = ASTNode;
diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index a5340bcda..6cb8165f6 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -13,10 +13,10 @@
 
 goog.module('Blockly.BasicCursor');
 
-const ASTNode = goog.require('Blockly.ASTNode');
-const Cursor = goog.require('Blockly.Cursor');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+const {ASTNode} = goog.require('Blockly.ASTNode');
+const {Cursor} = goog.require('Blockly.Cursor');
 
 
 /**
@@ -216,4 +216,4 @@ BasicCursor.prototype.getRightMostChild_ = function(node) {
 registry.register(
     registry.Type.CURSOR, BasicCursor.registrationName, BasicCursor);
 
-exports = BasicCursor;
+exports.BasicCursor = BasicCursor;
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index c307d3227..120e676ce 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -13,11 +13,10 @@
 
 goog.module('Blockly.Cursor');
 
-const ASTNode = goog.require('Blockly.ASTNode');
-const Marker = goog.require('Blockly.Marker');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-
+const {ASTNode} = goog.require('Blockly.ASTNode');
+const {Marker} = goog.require('Blockly.Marker');
 
 /**
  * Class for a cursor.
@@ -135,4 +134,4 @@ Cursor.prototype.out = function() {
 
 registry.register(registry.Type.CURSOR, registry.DEFAULT, Cursor);
 
-exports = Cursor;
+exports.Cursor = Cursor;
diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index f0f1843d1..954b22968 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -13,10 +13,10 @@
 
 goog.module('Blockly.Marker');
 
-/* eslint-disable-next-line no-unused-vars */
-const ASTNode = goog.requireType('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
 const MarkerSvg = goog.requireType('Blockly.blockRendering.MarkerSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {ASTNode} = goog.requireType('Blockly.ASTNode');
 
 
 /**
@@ -122,4 +122,4 @@ Marker.prototype.dispose = function() {
   }
 };
 
-exports = Marker;
+exports.Marker = Marker;
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 9e0e2ee86..ab49aadd5 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -13,11 +13,11 @@
 
 goog.module('Blockly.TabNavigateCursor');
 
-const ASTNode = goog.require('Blockly.ASTNode');
-const BasicCursor = goog.require('Blockly.BasicCursor');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 const object = goog.require('Blockly.utils.object');
+const {ASTNode} = goog.require('Blockly.ASTNode');
+const {BasicCursor} = goog.require('Blockly.BasicCursor');
 
 
 /**
@@ -49,4 +49,4 @@ TabNavigateCursor.prototype.validNode_ = function(node) {
   return isValid;
 };
 
-exports = TabNavigateCursor;
+exports.TabNavigateCursor = TabNavigateCursor;
diff --git a/core/marker_manager.js b/core/marker_manager.js
index 60cb3b870..0857e9260 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -13,12 +13,12 @@
 goog.module('Blockly.MarkerManager');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const Cursor = goog.requireType('Blockly.Cursor');
-/* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Cursor} = goog.requireType('Blockly.Cursor');
+/* eslint-disable-next-line no-unused-vars */
+const {Marker} = goog.requireType('Blockly.Marker');
 
 
 /**
diff --git a/core/registry.js b/core/registry.js
index 08e812f0f..1a03f715e 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -17,8 +17,6 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
 /* eslint-disable-next-line no-unused-vars */
-const Cursor = goog.requireType('Blockly.Cursor');
-/* 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');
@@ -40,6 +38,8 @@ const Theme = goog.requireType('Blockly.Theme');
 const ToolboxItem = goog.requireType('Blockly.ToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const ISerializer = goog.requireType('Blockly.serialization.ISerializer');
+/* eslint-disable-next-line no-unused-vars */
+const {Cursor} = goog.requireType('Blockly.Cursor');
 
 
 /**
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 4ce311b36..ff13b59c0 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -14,7 +14,6 @@
 goog.module('Blockly.blockRendering.MarkerSvg');
 goog.module.declareLegacyNamespace();
 
-const ASTNode = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,8 +24,6 @@ const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
-/* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
@@ -34,8 +31,11 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const dom = goog.require('Blockly.utils.dom');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
+const {ASTNode} = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Marker} = goog.requireType('Blockly.Marker');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.MarkerMove');
 
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 4f4f0a699..9afc70bed 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -23,8 +23,6 @@ const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
 const IRegistrable = goog.requireType('Blockly.IRegistrable');
 /* eslint-disable-next-line no-unused-vars */
 const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
-/* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
 const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
 const PathObject = goog.require('Blockly.blockRendering.PathObject');
 /* eslint-disable-next-line no-unused-vars */
@@ -41,6 +39,8 @@ const object = goog.require('Blockly.utils.object');
 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 {Marker} = goog.requireType('Blockly.Marker');
 
 
 /**
diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index af056a51f..88214aa2a 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -13,22 +13,22 @@
 goog.module('Blockly.zelos.MarkerSvg');
 goog.module.declareLegacyNamespace();
 
-/* eslint-disable-next-line no-unused-vars */
-const ASTNode = goog.requireType('Blockly.ASTNode');
 const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
-/* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
+const {ASTNode} = goog.requireType('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Marker} = goog.requireType('Blockly.Marker');
 
 
 /**
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index f5a866f00..ac1e26d6b 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -19,8 +19,6 @@ const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider');
 const Drawer = goog.require('Blockly.zelos.Drawer');
 const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
-/* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
 const MarkerSvg = goog.require('Blockly.zelos.MarkerSvg');
 const PathObject = goog.require('Blockly.zelos.PathObject');
 const RenderInfo = goog.require('Blockly.zelos.RenderInfo');
@@ -33,6 +31,8 @@ const connectionTypes = goog.require('Blockly.connectionTypes');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Marker} = goog.requireType('Blockly.Marker');
 
 
 /**
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index f4edf287d..591838f00 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -21,8 +21,6 @@ const ConnectionDB = goog.require('Blockly.ConnectionDB');
 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 Cursor = goog.requireType('Blockly.Cursor');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
@@ -41,8 +39,6 @@ const IFlyout = goog.requireType('Blockly.IFlyout');
 const IMetricsManager = goog.requireType('Blockly.IMetricsManager');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
-/* eslint-disable-next-line no-unused-vars */
-const Marker = goog.requireType('Blockly.Marker');
 const MarkerManager = goog.require('Blockly.MarkerManager');
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
@@ -96,6 +92,10 @@ const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg');
 const {BlockSvg} = goog.require('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const {Cursor} = goog.requireType('Blockly.Cursor');
+/* eslint-disable-next-line no-unused-vars */
+const {Marker} = goog.requireType('Blockly.Marker');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
diff --git a/tests/deps.js b/tests/deps.js
index cf7c2da1e..6e66de6c9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js
index 18a3d019d..ad84d74b0 100644
--- a/tests/deps.mocha.js
+++ b/tests/deps.mocha.js
@@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.Blocks', 'Blockly.Cursor', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Marker', 'Blockly.Procedures', 'Blockly.TabNavigateCursor', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.dialog', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
@@ -305,7 +305,7 @@ goog.addDependency('../../generators/python/text.js', ['Blockly.Python.texts'],
 goog.addDependency('../../generators/python/variables.js', ['Blockly.Python.variables'], ['Blockly.Python']);
 goog.addDependency('../../generators/python/variables_dynamic.js', ['Blockly.Python.variablesDynamic'], ['Blockly.Python', 'Blockly.Python.variables']);
 goog.addDependency('../../tests/mocha/.mocharc.js', [], []);
-goog.addDependency('../../tests/mocha/astnode_test.js', ['Blockly.test.astNode'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/astnode_test.js', ['Blockly.test.astNode'], ['Blockly.ASTNode', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/block_change_event_test.js', ['Blockly.test.blockChangeEvent'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/block_create_event_test.js', ['Blockly.test.blockCreateEvent'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/block_json_test.js', ['Blockly.test.blockJson'], [], {'lang': 'es5', 'module': 'goog'});
@@ -315,9 +315,9 @@ goog.addDependency('../../tests/mocha/connection_checker_test.js', ['Blockly.tes
 goog.addDependency('../../tests/mocha/connection_db_test.js', ['Blockly.test.connectionDb'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/connection_test.js', ['Blockly.test.connection'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/contextmenu_items_test.js', ['Blockly.test.contextMenuItem'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/cursor_test.js', ['Blockly.test.cursor'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/cursor_test.js', ['Blockly.test.cursor'], ['Blockly.ASTNode', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/dropdowndiv_test.js', ['Blockly.test.dropdown'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../tests/mocha/event_test.js', ['Blockly.test.event'], ['Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../tests/mocha/event_test.js', ['Blockly.test.event'], ['Blockly.ASTNode', 'Blockly.WorkspaceComment', 'Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/extensions_test.js', ['Blockly.test.extensions'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/field_angle_test.js', ['Blockly.test.fieldAngle'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../tests/mocha/field_checkbox_test.js', ['Blockly.test.fieldCheckbox'], ['Blockly.test.helpers'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/astnode_test.js b/tests/mocha/astnode_test.js
index de5e055bb..ea713b4c0 100644
--- a/tests/mocha/astnode_test.js
+++ b/tests/mocha/astnode_test.js
@@ -6,7 +6,7 @@
 
 goog.module('Blockly.test.astNode');
 
-const ASTNode = goog.require('Blockly.ASTNode');
+const {ASTNode} = goog.require('Blockly.ASTNode');
 const {sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
 
 
diff --git a/tests/mocha/cursor_test.js b/tests/mocha/cursor_test.js
index e34e716c6..fe6273163 100644
--- a/tests/mocha/cursor_test.js
+++ b/tests/mocha/cursor_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.cursor');
 
 const {sharedTestSetup, sharedTestTeardown} = goog.require('Blockly.test.helpers');
-const ASTNode = goog.require('Blockly.ASTNode');
+const {ASTNode} = goog.require('Blockly.ASTNode');
 
 
 suite('Cursor', function() {
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 6df2c03f3..1f0117024 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -7,7 +7,7 @@
 goog.module('Blockly.test.event');
 
 const {assertEventEquals, assertNthCallEventArgEquals, assertVariableValues, createFireChangeListenerSpy, createGenUidStubWithReturns, sharedTestSetup, sharedTestTeardown, workspaceTeardown} = goog.require('Blockly.test.helpers');
-const ASTNode = goog.require('Blockly.ASTNode');
+const {ASTNode} = goog.require('Blockly.ASTNode');
 goog.require('Blockly.WorkspaceComment');