Migrate core/blockly.js to goog.module syntax (#5494)

* Migrate core/blockly.js to ES6 const/let

* Migrate core/blockly.js to goog.module

* Migrate core/blockly.js to named requires

* clang-format core/blockly.js

* Consolidate accessors in core/blockly.js

core/blockly.js

@@ -14,14 +14,27 @@
  * The top level namespace used to access the Blockly library.
  * @namespace Blockly
  */
-goog.provide('Blockly');
+goog.module('Blockly');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.clipboard');
-goog.require('Blockly.common');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.constants');
-goog.require('Blockly.dialog');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+const Size = goog.require('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const browserEvents = goog.require('Blockly.browserEvents');
+const clipboard = goog.require('Blockly.clipboard');
+const colour = goog.require('Blockly.utils.colour');
+const common = goog.require('Blockly.common');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dialog = goog.require('Blockly.dialog');
+const inputTypes = goog.require('Blockly.inputTypes');
+const internalConstants = goog.require('Blockly.internalConstants');
+const toolbox = goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
@@ -34,25 +47,15 @@ goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.Events.VarCreate');
 /** @suppress {extraRequire} */
 goog.require('Blockly.inject');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.internalConstants');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Procedures');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Variables');
-goog.require('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Xml');
 
-goog.requireType('Blockly.ICopyable');
-goog.requireType('Blockly.Workspace');
-
 
 /**
  * Blockly core version.
@@ -63,149 +66,144 @@ goog.requireType('Blockly.Workspace');
  * compiler to override this constant.
  * @define {string}
  */
-Blockly.VERSION = 'uncompiled';
+exports.VERSION = 'uncompiled';
 
-// Add a getter and setter pair for Blockly.mainWorkspace, for legacy reasons.
-Object.defineProperty(Blockly, 'mainWorkspace', {
-  set: function(x) {
-    Blockly.utils.deprecation.warn(
-        'Blockly.mainWorkspace', 'September 2021', 'September 2022');
-    Blockly.common.setMainWorkspace(x);
+// Add a getter and setter pair for Blockly.alert, Blockly.confirm,
+// Blockly.mainWorkspace, Blockly.prompt and Blockly.selected for backwards
+// compatibility.
+Object.defineProperties(exports, {
+  alert: {
+    set: function(newAlert) {
+      deprecation.warn('Blockly.alert', 'September 2021', 'September 2022');
+      dialog.setAlert(newAlert);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.alert', 'September 2021', 'September 2022',
+          'Blockly.dialog.alert()');
+      return dialog.alert;
+    }
   },
-  get: function() {
-    Blockly.utils.deprecation.warn(
-        'Blockly.mainWorkspace', 'September 2021', 'September 2022',
-        'Blockly.getMainWorkspace()');
-    return Blockly.common.getMainWorkspace();
-  }
-});
-
-// Add a getter and setter pair for Blockly.selected, for legacy reasons.
-Object.defineProperty(Blockly, 'selected', {
-  get: function() {
-    Blockly.utils.deprecation.warn(
-      'Blockly.selected', 'September 2021', 'September 2022',
-      'Blockly.common.getSelected()');
-    return Blockly.common.getSelected();
+  confirm: {
+    set: function(newConfirm) {
+      deprecation.warn('Blockly.confirm', 'September 2021', 'September 2022');
+      dialog.setConfirm(newConfirm);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.confirm', 'September 2021', 'September 2022',
+          'Blockly.dialog.confirm()');
+      return dialog.confirm;
+    }
+  },
+  mainWorkspace: {
+    set: function(x) {
+      deprecation.warn(
+          'Blockly.mainWorkspace', 'September 2021', 'September 2022');
+      common.setMainWorkspace(x);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.mainWorkspace', 'September 2021', 'September 2022',
+          'Blockly.getMainWorkspace()');
+      return common.getMainWorkspace();
+    }
+  },
+  prompt: {
+    set: function(newPrompt) {
+      deprecation.warn('Blockly.prompt', 'September 2021', 'September 2022');
+      dialog.setPrompt(newPrompt);
+    },
+    get: function() {
+      deprecation.warn(
+          'Blockly.prompt', 'September 2021', 'September 2022',
+          'Blockly.dialog.prompt()');
+      return dialog.prompt;
+    }
+  },
+  selected: {
+    get: function() {
+      deprecation.warn(
+          'Blockly.selected', 'September 2021', 'September 2022',
+          'Blockly.common.getSelected()');
+      return common.getSelected();
+    },
+    set: function(newSelection) {
+      deprecation.warn(
+          'Blockly.selected', 'September 2021', 'September 2022',
+          'Blockly.common.setSelected()');
+      common.setSelected(newSelection);
+    }
   },
-  set: function(newSelection) {
-    Blockly.utils.deprecation.warn(
-      'Blockly.selected', 'September 2021', 'September 2022',
-      'Blockly.common.setSelected()');
-    Blockly.common.setSelected(newSelection);
-  }
 });
 
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
- * @return {!Blockly.utils.Size} Contains width and height properties.
+ * @return {!Size} Contains width and height properties.
  * @deprecated Use workspace.setCachedParentSvgSize. (2021 March 5)
  */
-Blockly.svgSize = function(svg) {
+const svgSize = function(svg) {
   // When removing this function, remove svg.cachedWidth_ and svg.cachedHeight_
   // from setCachedParentSvgSize.
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Blockly.svgSize', 'March 2021', 'March 2022',
       'workspace.getCachedParentSvgSize');
   svg = /** @type {?} */ (svg);
-  return new Blockly.utils.Size(svg.cachedWidth_, svg.cachedHeight_);
+  return new Size(svg.cachedWidth_, svg.cachedHeight_);
 };
+exports.svgSize = svgSize;
 
 /**
  * Size the workspace when the contents change.  This also updates
  * scrollbars accordingly.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to resize.
+ * @param {!WorkspaceSvg} workspace The workspace to resize.
  */
-Blockly.resizeSvgContents = function(workspace) {
+const resizeSvgContents = function(workspace) {
   workspace.resizeContents();
 };
+exports.resizeSvgContents = resizeSvgContents;
 
 /**
  * Copy a block or workspace comment onto the local clipboard.
- * @param {!Blockly.ICopyable} toCopy Block or Workspace Comment to be copied.
+ * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
  * @package
  */
-Blockly.copy = Blockly.clipboard.copy;
+exports.copy = clipboard.copy;
 
 /**
  * Paste a block or workspace comment on to the main workspace.
  * @return {boolean} True if the paste was successful, false otherwise.
  * @package
  */
-Blockly.paste = Blockly.clipboard.paste;
+exports.paste = clipboard.paste;
 
 /**
  * Duplicate this block and its children, or a workspace comment.
- * @param {!Blockly.ICopyable} toDuplicate Block or Workspace Comment to be
+ * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
  *     copied.
  * @package
  */
-Blockly.duplicate = Blockly.clipboard.duplicate;
+exports.duplicate = clipboard.duplicate;
 
 /**
  * Close tooltips, context menus, dropdown selections, etc.
  * @deprecated Use Blockly.common.getMainWorkspace().hideChaff()
  * @param {boolean=} opt_onlyClosePopups Whether only popups should be closed.
  */
-Blockly.hideChaff = function(opt_onlyClosePopups) {
-  Blockly.utils.deprecation.warn(
-      'Blockly.hideChaff', 'September 2021', 'September 2022');
-  Blockly.common.getMainWorkspace().hideChaff(opt_onlyClosePopups);
+const hideChaff = function(opt_onlyClosePopups) {
+  deprecation.warn('Blockly.hideChaff', 'September 2021', 'September 2022');
+  common.getMainWorkspace().hideChaff(opt_onlyClosePopups);
 };
+exports.hideChaff = hideChaff;
 
 /**
  * Returns the main workspace.  Returns the last used main workspace (based on
  * focus).  Try not to use this function, particularly if there are multiple
  * Blockly instances on a page.
- * @return {!Blockly.Workspace} The main workspace.
+ * @return {!Workspace} The main workspace.
  */
-Blockly.getMainWorkspace = Blockly.common.getMainWorkspace;
-
-// Add a getter and setter pair for Blockly.alert, for legacy reasons.
-Object.defineProperty(Blockly, 'alert', {
-  set: function(newAlert) {
-    Blockly.utils.deprecation.warn(
-        'Blockly.alert', 'September 2021', 'September 2022');
-    Blockly.dialog.setAlert(newAlert);
-  },
-  get: function() {
-    Blockly.utils.deprecation.warn(
-        'Blockly.alert', 'September 2021', 'September 2022',
-        'Blockly.dialog.alert()');
-    return Blockly.dialog.alert;
-  }
-});
-
-// Add a getter and setter pair for Blockly.confirm, for legacy reasons.
-Object.defineProperty(Blockly, 'confirm', {
-  set: function(newConfirm) {
-    Blockly.utils.deprecation.warn(
-        'Blockly.confirm', 'September 2021', 'September 2022');
-    Blockly.dialog.setConfirm(newConfirm);
-  },
-  get: function() {
-    Blockly.utils.deprecation.warn(
-        'Blockly.confirm', 'September 2021', 'September 2022',
-        'Blockly.dialog.confirm()');
-    return Blockly.dialog.confirm;
-  }
-});
-
-// Add a getter and setter pair for Blockly.prompt, for legacy reasons.
-Object.defineProperty(Blockly, 'prompt', {
-  set: function(newPrompt) {
-    Blockly.utils.deprecation.warn(
-        'Blockly.prompt', 'September 2021', 'September 2022');
-    Blockly.dialog.setPrompt(newPrompt);
-  },
-  get: function() {
-    Blockly.utils.deprecation.warn(
-        'Blockly.prompt', 'September 2021', 'September 2022',
-        'Blockly.dialog.prompt()');
-    return Blockly.dialog.prompt;
-  }
-});
+exports.getMainWorkspace = common.getMainWorkspace;
 
 /**
  * Helper function for defining a block from JSON.  The resulting function has
@@ -213,9 +211,8 @@ Object.defineProperty(Blockly, 'prompt', {
  * @param {!Object} jsonDef The JSON definition of a block.
  * @return {function()} A function that calls jsonInit with the correct value
  *     of jsonDef.
- * @private
  */
-Blockly.jsonInitFactory_ = function(jsonDef) {
+const jsonInitFactory = function(jsonDef) {
   return function() {
     this.jsonInit(jsonDef);
   };
@@ -226,15 +223,15 @@ Blockly.jsonInitFactory_ = function(jsonDef) {
  * by the Blockly Developer Tools.
  * @param {!Array<!Object>} jsonArray An array of JSON block definitions.
  */
-Blockly.defineBlocksWithJsonArray = function(jsonArray) {
-  for (var i = 0; i < jsonArray.length; i++) {
-    var elem = jsonArray[i];
+const defineBlocksWithJsonArray = function(jsonArray) {
+  for (let i = 0; i < jsonArray.length; i++) {
+    const elem = jsonArray[i];
     if (!elem) {
       console.warn(
           'Block definition #' + i + ' in JSON array is ' + elem + '. ' +
           'Skipping.');
     } else {
-      var typename = elem.type;
+      const typename = elem.type;
       if (typename == null || typename === '') {
         console.warn(
             'Block definition #' + i +
@@ -245,30 +242,23 @@ Blockly.defineBlocksWithJsonArray = function(jsonArray) {
               'Block definition #' + i + ' in JSON array' +
               ' overwrites prior definition of "' + typename + '".');
         }
-        Blockly.Blocks[typename] = {init: Blockly.jsonInitFactory_(elem)};
+        Blockly.Blocks[typename] = {init: jsonInitFactory(elem)};
       }
     }
   }
 };
+exports.defineBlocksWithJsonArray = defineBlocksWithJsonArray;
 
 /**
  * Is the given string a number (includes negative and decimals).
  * @param {string} str Input string.
  * @return {boolean} True if number, false otherwise.
  */
-Blockly.isNumber = function(str) {
+const isNumber = function(str) {
   return /^\s*-?\d+(\.\d+)?\s*$/.test(str);
 };
+exports.isNumber = isNumber;
 
-// Add a getter for Blockly.hueToHex, for legacy reasons.
-Object.defineProperty(Blockly, 'hueToHex', {
-  get: function() {
-    Blockly.utils.deprecation.warn(
-        'Blockly.hueToHex()', 'September 2021', 'September 2022',
-        'Blockly.utils.colour.hueToHex()');
-    return Blockly.utils.colour.hueToHex;
-  }
-});
 
 /**
  * Set the parent container.  This is the container element that the WidgetDiv,
@@ -277,130 +267,132 @@ Object.defineProperty(Blockly, 'hueToHex', {
  * This method is a NOP if called after the first ``Blockly.inject``.
  * @param {!Element} container The container element.
  */
-Blockly.setParentContainer = Blockly.common.setParentContainer;
+exports.setParentContainer = common.setParentContainer;
 
 /** Aliases. */
 
 /**
- * @see Blockly.browserEvents.bind
+ * @see colour.hueToHex
+ * @deprecated Use Blockly.utils.colour.hueToHex (September 2021).
  */
-Blockly.bindEvent_ = Blockly.browserEvents.bind;
+ exports.hueToHex = colour.hueToHex;
 
 /**
- * @see Blockly.browserEvents.unbind
+ * @see browserEvents.bind
  */
-Blockly.unbindEvent_ = Blockly.browserEvents.unbind;
+exports.bindEvent_ = browserEvents.bind;
 
 /**
- * @see Blockly.browserEvents.conditionalBind
+ * @see browserEvents.unbind
  */
-Blockly.bindEventWithChecks_ = Blockly.browserEvents.conditionalBind;
+exports.unbindEvent_ = browserEvents.unbind;
 
 /**
- * @see Blockly.constants.ALIGN.LEFT
+ * @see browserEvents.conditionalBind
  */
-Blockly.ALIGN_LEFT = Blockly.constants.ALIGN.LEFT;
+exports.bindEventWithChecks_ = browserEvents.conditionalBind;
 
 /**
- * @see Blockly.constants.ALIGN.CENTRE
+ * @see constants.ALIGN.LEFT
  */
-Blockly.ALIGN_CENTRE = Blockly.constants.ALIGN.CENTRE;
+exports.ALIGN_LEFT = constants.ALIGN.LEFT;
 
 /**
- * @see Blockly.constants.ALIGN.RIGHT
+ * @see constants.ALIGN.CENTRE
  */
-Blockly.ALIGN_RIGHT = Blockly.constants.ALIGN.RIGHT;
+exports.ALIGN_CENTRE = constants.ALIGN.CENTRE;
 
 /**
- * @see Blockly.common.svgResize
+ * @see constants.ALIGN.RIGHT
  */
-Blockly.svgResize = Blockly.common.svgResize;
+exports.ALIGN_RIGHT = constants.ALIGN.RIGHT;
 
+/**
+ * @see common.svgResize
+ */
+ exports.svgResize = common.svgResize;
 
 /**
  * Aliases for constants used for connection and input types.
  */
 
 /**
- * @see Blockly.connectionTypes.INPUT_VALUE
+ * @see connectionTypes.INPUT_VALUE
  */
-Blockly.INPUT_VALUE = Blockly.connectionTypes.INPUT_VALUE;
+exports.INPUT_VALUE = connectionTypes.INPUT_VALUE;
 
 /**
- * @see Blockly.connectionTypes.OUTPUT_VALUE
+ * @see connectionTypes.OUTPUT_VALUE
  */
-Blockly.OUTPUT_VALUE = Blockly.connectionTypes.OUTPUT_VALUE;
+exports.OUTPUT_VALUE = connectionTypes.OUTPUT_VALUE;
 
 /**
- * @see Blockly.connectionTypes.NEXT_STATEMENT
+ * @see connectionTypes.NEXT_STATEMENT
  */
-Blockly.NEXT_STATEMENT = Blockly.connectionTypes.NEXT_STATEMENT;
+exports.NEXT_STATEMENT = connectionTypes.NEXT_STATEMENT;
 
 /**
- * @see Blockly.connectionTypes.PREVIOUS_STATEMENT
+ * @see connectionTypes.PREVIOUS_STATEMENT
  */
-Blockly.PREVIOUS_STATEMENT = Blockly.connectionTypes.PREVIOUS_STATEMENT;
+exports.PREVIOUS_STATEMENT = connectionTypes.PREVIOUS_STATEMENT;
 
 /**
- * @see Blockly.inputTypes.DUMMY_INPUT
+ * @see inputTypes.DUMMY_INPUT
  */
-Blockly.DUMMY_INPUT = Blockly.inputTypes.DUMMY;
+exports.DUMMY_INPUT = inputTypes.DUMMY;
 
 /**
  * Aliases for toolbox positions.
  */
 
 /**
- * @see Blockly.utils.toolbox.Position.TOP
+ * @see toolbox.Position.TOP
  */
-Blockly.TOOLBOX_AT_TOP = Blockly.utils.toolbox.Position.TOP;
+exports.TOOLBOX_AT_TOP = toolbox.Position.TOP;
 
 /**
- * @see Blockly.utils.toolbox.Position.BOTTOM
+ * @see toolbox.Position.BOTTOM
  */
-Blockly.TOOLBOX_AT_BOTTOM = Blockly.utils.toolbox.Position.BOTTOM;
+exports.TOOLBOX_AT_BOTTOM = toolbox.Position.BOTTOM;
 
 /**
- * @see Blockly.utils.toolbox.Position.LEFT
+ * @see toolbox.Position.LEFT
  */
-Blockly.TOOLBOX_AT_LEFT = Blockly.utils.toolbox.Position.LEFT;
+exports.TOOLBOX_AT_LEFT = toolbox.Position.LEFT;
 
 /**
- * @see Blockly.utils.toolbox.Position.RIGHT
+ * @see toolbox.Position.RIGHT
  */
-Blockly.TOOLBOX_AT_RIGHT = Blockly.utils.toolbox.Position.RIGHT;
+exports.TOOLBOX_AT_RIGHT = toolbox.Position.RIGHT;
 
 // Aliases to allow external code to access these values for legacy reasons.
-Blockly.LINE_MODE_MULTIPLIER = Blockly.internalConstants.LINE_MODE_MULTIPLIER;
-Blockly.PAGE_MODE_MULTIPLIER = Blockly.internalConstants.PAGE_MODE_MULTIPLIER;
-Blockly.DRAG_RADIUS = Blockly.internalConstants.DRAG_RADIUS;
-Blockly.FLYOUT_DRAG_RADIUS = Blockly.internalConstants.FLYOUT_DRAG_RADIUS;
-Blockly.SNAP_RADIUS = Blockly.internalConstants.SNAP_RADIUS;
-Blockly.CONNECTING_SNAP_RADIUS =
-    Blockly.internalConstants.CONNECTING_SNAP_RADIUS;
-Blockly.CURRENT_CONNECTION_PREFERENCE =
-    Blockly.internalConstants.CURRENT_CONNECTION_PREFERENCE;
-Blockly.BUMP_DELAY = Blockly.internalConstants.BUMP_DELAY;
-Blockly.BUMP_RANDOMNESS = Blockly.internalConstants.BUMP_RANDOMNESS;
-Blockly.COLLAPSE_CHARS = Blockly.internalConstants.COLLAPSE_CHARS;
-Blockly.LONGPRESS = Blockly.internalConstants.LONGPRESS;
-Blockly.SOUND_LIMIT = Blockly.internalConstants.SOUND_LIMIT;
-Blockly.DRAG_STACK = Blockly.internalConstants.DRAG_STACK;
-Blockly.HSV_SATURATION = Blockly.internalConstants.HSV_SATURATION;
-Blockly.HSV_VALUE = Blockly.internalConstants.HSV_VALUE;
-Blockly.SPRITE = Blockly.internalConstants.SPRITE;
-Blockly.DRAG_NONE = Blockly.internalConstants.DRAG_NONE;
-Blockly.DRAG_STICKY = Blockly.internalConstants.DRAG_STICKY;
-Blockly.DRAG_BEGIN = Blockly.internalConstants.DRAG_BEGIN;
-Blockly.DRAG_FREE = Blockly.internalConstants.DRAG_FREE;
-Blockly.OPPOSITE_TYPE = Blockly.internalConstants.OPPOSITE_TYPE;
-Blockly.VARIABLE_CATEGORY_NAME =
-    Blockly.internalConstants.VARIABLE_CATEGORY_NAME;
-Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME =
-    Blockly.internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME;
-Blockly.PROCEDURE_CATEGORY_NAME =
-    Blockly.internalConstants.PROCEDURE_CATEGORY_NAME;
-Blockly.RENAME_VARIABLE_ID = Blockly.internalConstants.RENAME_VARIABLE_ID;
-Blockly.DELETE_VARIABLE_ID = Blockly.internalConstants.DELETE_VARIABLE_ID;
-Blockly.COLLAPSED_INPUT_NAME = Blockly.constants.COLLAPSED_INPUT_NAME;
-Blockly.COLLAPSED_FIELD_NAME = Blockly.constants.COLLAPSED_FIELD_NAME;
+exports.LINE_MODE_MULTIPLIER = internalConstants.LINE_MODE_MULTIPLIER;
+exports.PAGE_MODE_MULTIPLIER = internalConstants.PAGE_MODE_MULTIPLIER;
+exports.DRAG_RADIUS = internalConstants.DRAG_RADIUS;
+exports.FLYOUT_DRAG_RADIUS = internalConstants.FLYOUT_DRAG_RADIUS;
+exports.SNAP_RADIUS = internalConstants.SNAP_RADIUS;
+exports.CONNECTING_SNAP_RADIUS = internalConstants.CONNECTING_SNAP_RADIUS;
+exports.CURRENT_CONNECTION_PREFERENCE =
+    internalConstants.CURRENT_CONNECTION_PREFERENCE;
+exports.BUMP_DELAY = internalConstants.BUMP_DELAY;
+exports.BUMP_RANDOMNESS = internalConstants.BUMP_RANDOMNESS;
+exports.COLLAPSE_CHARS = internalConstants.COLLAPSE_CHARS;
+exports.LONGPRESS = internalConstants.LONGPRESS;
+exports.SOUND_LIMIT = internalConstants.SOUND_LIMIT;
+exports.DRAG_STACK = internalConstants.DRAG_STACK;
+exports.HSV_SATURATION = internalConstants.HSV_SATURATION;
+exports.HSV_VALUE = internalConstants.HSV_VALUE;
+exports.SPRITE = internalConstants.SPRITE;
+exports.DRAG_NONE = internalConstants.DRAG_NONE;
+exports.DRAG_STICKY = internalConstants.DRAG_STICKY;
+exports.DRAG_BEGIN = internalConstants.DRAG_BEGIN;
+exports.DRAG_FREE = internalConstants.DRAG_FREE;
+exports.OPPOSITE_TYPE = internalConstants.OPPOSITE_TYPE;
+exports.VARIABLE_CATEGORY_NAME = internalConstants.VARIABLE_CATEGORY_NAME;
+exports.VARIABLE_DYNAMIC_CATEGORY_NAME =
+    internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME;
+exports.PROCEDURE_CATEGORY_NAME = internalConstants.PROCEDURE_CATEGORY_NAME;
+exports.RENAME_VARIABLE_ID = internalConstants.RENAME_VARIABLE_ID;
+exports.DELETE_VARIABLE_ID = internalConstants.DELETE_VARIABLE_ID;
+exports.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
+exports.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;

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.Xml', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', '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']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['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_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.utils.global'], {'lang': 'es6', 'module': 'goog'});

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.Xml', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', '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']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['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_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.utils.global'], {'lang': 'es6', 'module': 'goog'});

tests/mocha/contextmenu_items_test.js

@@ -285,7 +285,7 @@ suite('Context Menu Items', function() {
       });
 
       test('No dialog for single block', function() {
-        var confirmStub = sinon.stub(Blockly, 'confirm');
+        var confirmStub = sinon.stub(Blockly.dialog, 'confirm');
         this.workspace.newBlock('text');
         this.deleteOption.callback(this.scope);
         this.clock.runAll();

tests/mocha/field_textinput_test.js

@@ -172,7 +172,7 @@ suite('Text Input Fields', function() {
             FIELD_TEXT_FONTFAMILY: 'sans-serif'
           };
           field.clickTarget_ = document.createElement('div');
-          Blockly.mainWorkspace = workspace;
+          Blockly.common.setMainWorkspace(workspace);
           Blockly.WidgetDiv.createDom();
           this.stub = sinon.stub(field, 'resizeEditor_');
         };

tests/mocha/workspace_helpers.js

@@ -93,7 +93,7 @@ function testAWorkspace() {
     test('deleteVariableById(id2) one usage', function() {
       // Deleting variable one usage should not trigger confirm dialog.
       var stub =
-          sinon.stub(Blockly, "confirm").callsArgWith(1, true);
+          sinon.stub(Blockly.dialog, "confirm").callsArgWith(1, true);
       this.workspace.deleteVariableById('id2');
 
       sinon.assert.notCalled(stub);