From da16a66f33f063ce76af4e38857972f3e8f7f92f Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Thu, 2 Dec 2021 16:47:27 +0000
Subject: [PATCH] refactor: msg.js: use named export, remove
 declareLegacyNamespace (#5768)

---
 blocks/lists.js                |  2 +-
 blocks/logic.js                |  2 +-
 blocks/loops.js                |  2 +-
 blocks/procedures.js           |  2 +-
 blocks/text.js                 |  2 +-
 core/block_svg.js              |  2 +-
 core/blockly.js                | 18 ++++++++++++++++++
 core/contextmenu.js            |  2 +-
 core/contextmenu_items.js      |  5 +++--
 core/field_textinput.js        |  2 +-
 core/field_variable.js         |  2 +-
 core/inject.js                 |  2 +-
 core/msg.js                    | 15 ++++-----------
 core/names.js                  |  2 +-
 core/procedures.js             |  2 +-
 core/utils/parsing.js          |  2 +-
 core/variable_map.js           |  4 ++--
 core/variables.js              |  2 +-
 core/variables_dynamic.js      |  2 +-
 scripts/gulpfiles/chunks.json  |  4 ++--
 scripts/migration/renamings.js |  4 ++++
 tests/deps.js                  |  4 ++--
 22 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/blocks/lists.js b/blocks/lists.js
index 11d4c1afd..72721c211 100644
--- a/blocks/lists.js
+++ b/blocks/lists.js
@@ -12,7 +12,6 @@
 
 goog.module('Blockly.blocks.lists');
 
-const Msg = goog.require('Blockly.Msg');
 const xmlUtils = goog.require('Blockly.utils.xml');
 const {Align} = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
@@ -20,6 +19,7 @@ const {Block} = goog.requireType('Blockly.Block');
 const {Blocks} = goog.require('Blockly.blocks');
 const {ConnectionType} = goog.require('Blockly.ConnectionType');
 const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
+const {Msg} = goog.require('Blockly.Msg');
 const {Mutator} = goog.require('Blockly.Mutator');
 /* eslint-disable-next-line no-unused-vars */
 const {Workspace} = goog.requireType('Blockly.Workspace');
diff --git a/blocks/logic.js b/blocks/logic.js
index d48044777..a7afb8140 100644
--- a/blocks/logic.js
+++ b/blocks/logic.js
@@ -16,11 +16,11 @@ goog.module('Blockly.blocks.logic');
 const AbstractEvent = goog.requireType('Blockly.Events.Abstract');
 const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
-const Msg = goog.require('Blockly.Msg');
 const common = goog.require('Blockly.common');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {Msg} = goog.require('Blockly.Msg');
 const {Mutator} = goog.require('Blockly.Mutator');
 /* eslint-disable-next-line no-unused-vars */
 const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection');
diff --git a/blocks/loops.js b/blocks/loops.js
index 9a40720fa..cc3c27d37 100644
--- a/blocks/loops.js
+++ b/blocks/loops.js
@@ -17,12 +17,12 @@ const AbstractEvent = goog.requireType('Blockly.Events.Abstract');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Events = goog.require('Blockly.Events');
 const Extensions = goog.require('Blockly.Extensions');
-const Msg = goog.require('Blockly.Msg');
 const Variables = goog.require('Blockly.Variables');
 const common = goog.require('Blockly.common');
 const xmlUtils = goog.require('Blockly.utils.xml');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {Msg} = goog.require('Blockly.Msg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.FieldDropdown');
 /** @suppress {extraRequire} */
diff --git a/blocks/procedures.js b/blocks/procedures.js
index 3ed36b830..fc08337a9 100644
--- a/blocks/procedures.js
+++ b/blocks/procedures.js
@@ -16,7 +16,6 @@ goog.module('Blockly.blocks.procedures');
 const AbstractEvent = goog.requireType('Blockly.Events.Abstract');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Events = goog.require('Blockly.Events');
-const Msg = goog.require('Blockly.Msg');
 const Procedures = goog.require('Blockly.Procedures');
 const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
@@ -30,6 +29,7 @@ const {Blocks} = goog.require('Blockly.blocks');
 const {FieldCheckbox} = goog.require('Blockly.FieldCheckbox');
 const {FieldLabel} = goog.require('Blockly.FieldLabel');
 const {FieldTextInput} = goog.require('Blockly.FieldTextInput');
+const {Msg} = goog.require('Blockly.Msg');
 const {Mutator} = goog.require('Blockly.Mutator');
 const {Names} = goog.require('Blockly.Names');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/blocks/text.js b/blocks/text.js
index 755283fb6..9072c7fa1 100644
--- a/blocks/text.js
+++ b/blocks/text.js
@@ -13,7 +13,7 @@
 goog.module('Blockly.blocks.texts');
 
 const Extensions = goog.require('Blockly.Extensions');
-const Msg = goog.require('Blockly.Msg');
+const {Msg} = goog.require('Blockly.Msg');
 /* eslint-disable-next-line no-unused-vars */
 const xmlUtils = goog.require('Blockly.utils.xml');
 const {Align} = goog.require('Blockly.Input');
diff --git a/core/block_svg.js b/core/block_svg.js
index 09c6b8b33..0abd81246 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -16,7 +16,6 @@
 goog.module('Blockly.BlockSvg');
 
 const ContextMenu = goog.require('Blockly.ContextMenu');
-const Msg = goog.require('Blockly.Msg');
 const Tooltip = goog.require('Blockly.Tooltip');
 const blockAnimations = goog.require('Blockly.blockAnimations');
 const blocks = goog.require('Blockly.serialization.blocks');
@@ -58,6 +57,7 @@ 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');
diff --git a/core/blockly.js b/core/blockly.js
index 9702271ba..e59dd9254 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -129,6 +129,7 @@ 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 {Msg} = goog.require('Blockly.Msg');
 const {Names} = goog.require('Blockly.Names');
 const {Options} = goog.require('Blockly.Options');
 const {RenderedConnection} = goog.require('Blockly.RenderedConnection');
@@ -654,6 +655,7 @@ exports.Menu = Menu;
 exports.MenuItem = MenuItem;
 exports.MetricsManager = MetricsManager;
 exports.Mutator = Mutator;
+exports.Msg = Msg;
 exports.Names = Names;
 exports.Options = Options;
 exports.Procedures = Procedures;
@@ -711,6 +713,22 @@ exports.uiPosition = uiPosition;
 exports.utils = utils;
 exports.zelos = zelos;
 
+// If Blockly is compiled with ADVANCED_COMPILATION and/or loaded as a
+// CJS or ES module there will not be a Blockly global variable
+// created.  This can cause problems because a very common way of
+// loading translations is to use a <script> tag to load one of
+// msg/js/*.js, which consists of lines like:
+//
+// Blockly.Msg["ADD_COMMENT"] = "Add Comment";
+// Blockly.Msg["CLEAN_UP"] = "Clean up Blocks";
+//
+// This obviously only works if Blockly.Msg is the Msg export from the
+// Blockly.Msg module - so make sure it is, but only if there is not
+// yet a Blockly global variable.
+if (!('Blockly' in globalThis)) {
+  globalThis['Blockly'] = {Msg};
+}
+
 // Temporary hack to copy accessor properties from exports to the
 // global Blockly object as the routine to copy exports in
 // goog.exportPath_ (see closure/goog/base.js) invoked by
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 6a0697d14..6f665eb49 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.ContextMenu');
 
-const Msg = goog.require('Blockly.Msg');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const Xml = goog.require('Blockly.Xml');
 const aria = goog.require('Blockly.utils.aria');
@@ -32,6 +31,7 @@ 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 {Msg} = goog.require('Blockly.Msg');
 const {Rect} = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
 const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg');
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 7ae79c865..aa0abbf5d 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -16,7 +16,6 @@
 goog.module('Blockly.ContextMenuItems');
 
 const Events = goog.require('Blockly.Events');
-const Msg = goog.require('Blockly.Msg');
 const clipboard = goog.require('Blockly.clipboard');
 const dialog = goog.require('Blockly.dialog');
 const eventUtils = goog.require('Blockly.Events.utils');
@@ -25,6 +24,7 @@ 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');
+const {Msg} = goog.require('Blockly.Msg');
 /* eslint-disable-next-line no-unused-vars */
 const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 const {inputTypes} = goog.require('Blockly.inputTypes');
@@ -324,7 +324,8 @@ const registerDeleteAll = function() {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
         dialog.confirm(
-            Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
+            Msg['DELETE_ALL_BLOCKS'].replace(
+                '%1', String(deletableBlocks.length)),
             function(ok) {
               if (ok) {
                 deleteNext_(deletableBlocks, eventGroup);
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 13187ab3f..dfb6f055f 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.FieldTextInput');
 
-const Msg = goog.require('Blockly.Msg');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
@@ -32,6 +31,7 @@ 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');
 /* eslint-disable-next-line no-unused-vars */
 const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
 /** @suppress {extraRequire} */
diff --git a/core/field_variable.js b/core/field_variable.js
index 25c5cd2f4..af43f02a5 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.FieldVariable');
 
-const Msg = goog.require('Blockly.Msg');
 const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
@@ -29,6 +28,7 @@ const {FieldDropdown} = goog.require('Blockly.FieldDropdown');
 const {MenuItem} = goog.requireType('Blockly.MenuItem');
 /* eslint-disable-next-line no-unused-vars */
 const {Menu} = goog.requireType('Blockly.Menu');
+const {Msg} = goog.require('Blockly.Msg');
 const {Size} = goog.require('Blockly.utils.Size');
 const {VariableModel} = goog.require('Blockly.VariableModel');
 /** @suppress {extraRequire} */
diff --git a/core/inject.js b/core/inject.js
index d74c88b3d..ef6c0ed88 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -16,7 +16,6 @@
 goog.module('Blockly.inject');
 
 const Css = goog.require('Blockly.Css');
-const Msg = goog.require('Blockly.Msg');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
@@ -31,6 +30,7 @@ const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg');
 const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions');
 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 {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry');
diff --git a/core/msg.js b/core/msg.js
index d6c34068c..e7da7bb56 100644
--- a/core/msg.js
+++ b/core/msg.js
@@ -14,18 +14,11 @@
  * @namespace Blockly.Msg
  */
 goog.module('Blockly.Msg');
-goog.module.declareLegacyNamespace();
-
-const {globalThis} = goog.require('Blockly.utils.global');
 
 
 /**
- * Exported so that if Blockly is compiled with ADVANCED_COMPILATION,
- * the Blockly.Msg object exists for message files included in script tags.
+ * A dictionary of localised messages.
+ * @type {!Object<string>}
  */
-if (!globalThis['Blockly']) {
-  globalThis['Blockly'] = {};
-}
-if (!globalThis['Blockly']['Msg']) {
-  globalThis['Blockly']['Msg'] = exports;
-}
+const Msg = Object.create(null);
+exports.Msg = Msg;
diff --git a/core/names.js b/core/names.js
index 2737b1875..1fad1e00f 100644
--- a/core/names.js
+++ b/core/names.js
@@ -15,8 +15,8 @@
  */
 goog.module('Blockly.Names');
 
-const Msg = goog.require('Blockly.Msg');
 const Variables = goog.require('Blockly.Variables');
+const {Msg} = goog.require('Blockly.Msg');
 /* eslint-disable-next-line no-unused-vars */
 const {VariableMap} = goog.requireType('Blockly.VariableMap');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/procedures.js b/core/procedures.js
index be11386e7..a6c819f59 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -17,7 +17,6 @@ goog.module('Blockly.Procedures');
 
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
-const Msg = goog.require('Blockly.Msg');
 const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
 const eventUtils = goog.require('Blockly.Events.utils');
@@ -27,6 +26,7 @@ const {Blocks} = goog.require('Blockly.blocks');
 const {Block} = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const {Field} = goog.requireType('Blockly.Field');
+const {Msg} = goog.require('Blockly.Msg');
 const {Names} = goog.require('Blockly.Names');
 /* eslint-disable-next-line no-unused-vars */
 const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/utils/parsing.js b/core/utils/parsing.js
index aba0d2d78..967c68f88 100644
--- a/core/utils/parsing.js
+++ b/core/utils/parsing.js
@@ -14,10 +14,10 @@
  */
 goog.module('Blockly.utils.parsing');
 
-const Msg = goog.require('Blockly.Msg');
 const colourUtils = goog.require('Blockly.utils.colour');
 const internalConstants = goog.require('Blockly.internalConstants');
 const stringUtils = goog.require('Blockly.utils.string');
+const {Msg} = goog.require('Blockly.Msg');
 
 
 /**
diff --git a/core/variable_map.js b/core/variable_map.js
index cce3c5bf4..797d1a72f 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -15,7 +15,6 @@
  */
 goog.module('Blockly.VariableMap');
 
-const Msg = goog.require('Blockly.Msg');
 const arrayUtils = goog.require('Blockly.utils.array');
 const dialog = goog.require('Blockly.dialog');
 const eventUtils = goog.require('Blockly.Events.utils');
@@ -23,6 +22,7 @@ const idGenerator = goog.require('Blockly.utils.idGenerator');
 const object = goog.require('Blockly.utils.object');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
+const {Msg} = goog.require('Blockly.Msg');
 const {Names} = goog.require('Blockly.Names');
 const {VariableModel} = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
@@ -235,7 +235,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
     for (let i = 0, block; (block = uses[i]); i++) {
       if (block.type === 'procedures_defnoreturn' ||
           block.type === 'procedures_defreturn') {
-        const procedureName = block.getFieldValue('NAME');
+        const procedureName = String(block.getFieldValue('NAME'));
         const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE']
                                .replace('%1', variableName)
                                .replace('%2', procedureName);
diff --git a/core/variables.js b/core/variables.js
index b338cac7f..c3bb62f6f 100644
--- a/core/variables.js
+++ b/core/variables.js
@@ -15,11 +15,11 @@
  */
 goog.module('Blockly.Variables');
 
-const Msg = goog.require('Blockly.Msg');
 const Xml = goog.require('Blockly.Xml');
 const dialog = goog.require('Blockly.dialog');
 const utilsXml = goog.require('Blockly.utils.xml');
 const {Blocks} = goog.require('Blockly.blocks');
+const {Msg} = goog.require('Blockly.Msg');
 const {VariableModel} = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const {Workspace} = goog.requireType('Blockly.Workspace');
diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index aabca1551..b84f4c8c9 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -17,10 +17,10 @@
  */
 goog.module('Blockly.VariablesDynamic');
 
-const Msg = goog.require('Blockly.Msg');
 const Variables = goog.require('Blockly.Variables');
 const xml = goog.require('Blockly.utils.xml');
 const {Blocks} = goog.require('Blockly.blocks');
+const {Msg} = goog.require('Blockly.Msg');
 const {VariableModel} = goog.require('Blockly.VariableModel');
 /* eslint-disable-next-line no-unused-vars */
 const {Workspace} = goog.requireType('Blockly.Workspace');
diff --git a/scripts/gulpfiles/chunks.json b/scripts/gulpfiles/chunks.json
index 2233b278d..8b8112033 100644
--- a/scripts/gulpfiles/chunks.json
+++ b/scripts/gulpfiles/chunks.json
@@ -74,6 +74,7 @@
     "./core/menu.js",
     "./core/contextmenu.js",
     "./core/blocks.js",
+    "./core/utils/global.js",
     "./core/utils/useragent.js",
     "./core/utils/svg.js",
     "./core/utils/dom.js",
@@ -245,6 +246,7 @@
     "./core/serialization/blocks.js",
     "./core/utils/toolbox.js",
     "./core/mutator.js",
+    "./core/msg.js",
     "./core/connection_type.js",
     "./core/internal_constants.js",
     "./core/utils/colour.js",
@@ -263,8 +265,6 @@
     "./core/xml.js",
     "./core/connection.js",
     "./core/common.js",
-    "./core/utils/global.js",
-    "./core/msg.js",
     "./closure/goog/base_minimal.js",
     "./core/requires.js",
     "./blocks/variables_dynamic.js",
diff --git a/scripts/migration/renamings.js b/scripts/migration/renamings.js
index 0e01e45ec..688e8ba4a 100644
--- a/scripts/migration/renamings.js
+++ b/scripts/migration/renamings.js
@@ -910,6 +910,10 @@ const renamings = {
       export: 'MetricsManager',
       path: 'Blockly.MetricsManager',
     },
+    'Blockly.Msg': {
+      export: 'Msg',
+      path: 'Blockly.Msg',
+    },
     'Blockly.Mutator': {
       export: 'Mutator',
       path: 'Blockly.Mutator',
diff --git a/tests/deps.js b/tests/deps.js
index 15cd566b6..914827eef 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,7 +13,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgMath'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.IBlockDragger', '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.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgMath', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.svgMath', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.svgMath', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'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'});
@@ -132,7 +132,7 @@ goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], []
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.idGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/msg.js', ['Blockly.Msg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Events.utils', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.idGenerator', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});